beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename integration/util to integration/internal

Browse source 
Both names have no real sense, but one allows to make sure these packages
aren't used outside of `integration`.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Vincent Demeester 2018-02-09 19:13:26 +01:00
parent ab3ea81376
commit af306d149e
No known key found for this signature in database
GPG key ID: 083CC6FD6EB699A3
32 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hack/make/.integration-test-helpers
View file

@ -17,7 +17,7 @@ source "$MAKEDIR/.go-autogen"
integration_api_dirs=${TEST_INTEGRATION_DIR:-"$( integration_api_dirs=${TEST_INTEGRATION_DIR:-"$(
find ./integration -type d | find ./integration -type d |
grep -vE '(^./integration($|/util)|/testdata)')"} grep -vE '(^./integration($|/internal)|/testdata)')"}
run_test_integration() { run_test_integration() {
[[ "$TESTFLAGS" != *-check.f* ]] && run_test_integration_suites [[ "$TESTFLAGS" != *-check.f* ]] && run_test_integration_suites

2
integration/build/build_test.go
View file

@ -13,7 +13,7 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
"github.com/docker/docker/integration-cli/cli/build/fakecontext" "github.com/docker/docker/integration-cli/cli/build/fakecontext"
"github.com/docker/docker/integration/util/request" "github.com/docker/docker/integration/internal/request"
"github.com/docker/docker/pkg/jsonmessage" "github.com/docker/docker/pkg/jsonmessage"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

2
integration/container/create_test.go
View file

@ -7,7 +7,7 @@ import (
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
"github.com/docker/docker/integration/util/request" "github.com/docker/docker/integration/internal/request"
"github.com/docker/docker/internal/testutil" "github.com/docker/docker/internal/testutil"
"github.com/gotestyourself/gotestyourself/skip" "github.com/gotestyourself/gotestyourself/skip"
) )

2
integration/container/exec_test.go
View file

@ -9,7 +9,7 @@ import (
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
"github.com/docker/docker/api/types/strslice" "github.com/docker/docker/api/types/strslice"
"github.com/docker/docker/integration/util/request" "github.com/docker/docker/integration/internal/request"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

2
integration/container/health_test.go
View file

@ -10,7 +10,7 @@ import (
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
"github.com/docker/docker/api/types/strslice" "github.com/docker/docker/api/types/strslice"
"github.com/docker/docker/client" "github.com/docker/docker/client"
"github.com/docker/docker/integration/util/request" "github.com/docker/docker/integration/internal/request"
"github.com/gotestyourself/gotestyourself/poll" "github.com/gotestyourself/gotestyourself/poll"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

2
integration/container/inspect_test.go
View file

@ -9,7 +9,7 @@ import (
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
"github.com/docker/docker/client" "github.com/docker/docker/client"
"github.com/docker/docker/integration/util/request" "github.com/docker/docker/integration/internal/request"
"github.com/gotestyourself/gotestyourself/poll" "github.com/gotestyourself/gotestyourself/poll"
"github.com/gotestyourself/gotestyourself/skip" "github.com/gotestyourself/gotestyourself/skip"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

2
integration/container/kill_test.go
View file

@ -10,7 +10,7 @@ import (
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
"github.com/docker/docker/api/types/strslice" "github.com/docker/docker/api/types/strslice"
"github.com/docker/docker/client" "github.com/docker/docker/client"
"github.com/docker/docker/integration/util/request" "github.com/docker/docker/integration/internal/request"
"github.com/gotestyourself/gotestyourself/poll" "github.com/gotestyourself/gotestyourself/poll"
"github.com/gotestyourself/gotestyourself/skip" "github.com/gotestyourself/gotestyourself/skip"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

2
integration/container/links_linux_test.go
View file

@ -10,7 +10,7 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/integration/util/request" "github.com/docker/docker/integration/internal/request"
"github.com/docker/docker/pkg/stdcopy" "github.com/docker/docker/pkg/stdcopy"
"github.com/gotestyourself/gotestyourself/poll" "github.com/gotestyourself/gotestyourself/poll"
"github.com/gotestyourself/gotestyourself/skip" "github.com/gotestyourself/gotestyourself/skip"

2
integration/container/nat_test.go
View file

@ -14,7 +14,7 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
"github.com/docker/docker/integration/util/request" "github.com/docker/docker/integration/internal/request"
"github.com/docker/go-connections/nat" "github.com/docker/go-connections/nat"
"github.com/gotestyourself/gotestyourself/poll" "github.com/gotestyourself/gotestyourself/poll"
"github.com/gotestyourself/gotestyourself/skip" "github.com/gotestyourself/gotestyourself/skip"

2
integration/container/ps_test.go
View file

@ -8,7 +8,7 @@ import (
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
"github.com/docker/docker/integration/util/request" "github.com/docker/docker/integration/internal/request"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

2
integration/container/rename_test.go
View file

@ -8,7 +8,7 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
"github.com/docker/docker/integration/util/request" "github.com/docker/docker/integration/internal/request"
"github.com/docker/docker/internal/testutil" "github.com/docker/docker/internal/testutil"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"github.com/gotestyourself/gotestyourself/poll" "github.com/gotestyourself/gotestyourself/poll"

2
integration/container/resize_test.go
View file

@ -10,7 +10,7 @@ import (
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
req "github.com/docker/docker/integration-cli/request" req "github.com/docker/docker/integration-cli/request"
"github.com/docker/docker/integration/util/request" "github.com/docker/docker/integration/internal/request"
"github.com/docker/docker/internal/testutil" "github.com/docker/docker/internal/testutil"
"github.com/gotestyourself/gotestyourself/poll" "github.com/gotestyourself/gotestyourself/poll"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

2
integration/container/stats_test.go
View file

@ -10,7 +10,7 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
"github.com/docker/docker/integration/util/request" "github.com/docker/docker/integration/internal/request"
"github.com/gotestyourself/gotestyourself/poll" "github.com/gotestyourself/gotestyourself/poll"
"github.com/gotestyourself/gotestyourself/skip" "github.com/gotestyourself/gotestyourself/skip"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

2
integration/container/stop_test.go
View file

@ -11,7 +11,7 @@ import (
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
"github.com/docker/docker/client" "github.com/docker/docker/client"
"github.com/docker/docker/integration/util/request" "github.com/docker/docker/integration/internal/request"
"github.com/gotestyourself/gotestyourself/icmd" "github.com/gotestyourself/gotestyourself/icmd"
"github.com/gotestyourself/gotestyourself/poll" "github.com/gotestyourself/gotestyourself/poll"
"github.com/gotestyourself/gotestyourself/skip" "github.com/gotestyourself/gotestyourself/skip"

2
integration/container/update_linux_test.go
View file

@ -14,7 +14,7 @@ import (
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/strslice" "github.com/docker/docker/api/types/strslice"
"github.com/docker/docker/client" "github.com/docker/docker/client"
"github.com/docker/docker/integration/util/request" "github.com/docker/docker/integration/internal/request"
"github.com/docker/docker/pkg/stdcopy" "github.com/docker/docker/pkg/stdcopy"
"github.com/gotestyourself/gotestyourself/poll" "github.com/gotestyourself/gotestyourself/poll"
"github.com/gotestyourself/gotestyourself/skip" "github.com/gotestyourself/gotestyourself/skip"

2
integration/image/commit_test.go
View file

@ -6,7 +6,7 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/integration/util/request" "github.com/docker/docker/integration/internal/request"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

2
integration/image/import_test.go
View file

@ -9,7 +9,7 @@ import (
"testing" "testing"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/integration/util/request" "github.com/docker/docker/integration/internal/request"
"github.com/docker/docker/internal/testutil" "github.com/docker/docker/internal/testutil"
) )

2
integration/util/request/client.go → integration/internal/request/client.go
View file

@ -1,4 +1,4 @@
package request // import "github.com/docker/docker/integration/util/request" package request // import "github.com/docker/docker/integration/internal/request"
import ( import (
"net" "net"

2
integration/util/requirement/requirement.go → integration/internal/requirement/requirement.go
View file

@ -1,4 +1,4 @@
package requirement // import "github.com/docker/docker/integration/util/requirement" package requirement // import "github.com/docker/docker/integration/internal/requirement"
import ( import (
"net/http" "net/http"

0
integration/util/swarm/service.go → integration/internal/swarm/service.go
View file

2
integration/network/delete_test.go
View file

@ -5,7 +5,7 @@ import (
"testing" "testing"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/integration/util/request" "github.com/docker/docker/integration/internal/request"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

2
integration/plugin/authz/authz_plugin_test.go
View file

@ -23,7 +23,7 @@ import (
eventtypes "github.com/docker/docker/api/types/events" eventtypes "github.com/docker/docker/api/types/events"
networktypes "github.com/docker/docker/api/types/network" networktypes "github.com/docker/docker/api/types/network"
"github.com/docker/docker/client" "github.com/docker/docker/client"
"github.com/docker/docker/integration/util/request" "github.com/docker/docker/integration/internal/request"
"github.com/docker/docker/internal/test/environment" "github.com/docker/docker/internal/test/environment"
"github.com/docker/docker/pkg/authorization" "github.com/docker/docker/pkg/authorization"
"github.com/gotestyourself/gotestyourself/skip" "github.com/gotestyourself/gotestyourself/skip"

2
integration/plugin/authz/authz_plugin_v2_test.go
View file

@ -16,7 +16,7 @@ import (
networktypes "github.com/docker/docker/api/types/network" networktypes "github.com/docker/docker/api/types/network"
volumetypes "github.com/docker/docker/api/types/volume" volumetypes "github.com/docker/docker/api/types/volume"
"github.com/docker/docker/client" "github.com/docker/docker/client"
"github.com/docker/docker/integration/util/requirement" "github.com/docker/docker/integration/internal/requirement"
"github.com/gotestyourself/gotestyourself/skip" "github.com/gotestyourself/gotestyourself/skip"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

2
integration/secret/secret_test.go
View file

@ -8,7 +8,7 @@ import (
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
swarmtypes "github.com/docker/docker/api/types/swarm" swarmtypes "github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/client" "github.com/docker/docker/client"
"github.com/docker/docker/integration/util/swarm" "github.com/docker/docker/integration/internal/swarm"
"github.com/gotestyourself/gotestyourself/skip" "github.com/gotestyourself/gotestyourself/skip"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

2
integration/service/create_test.go
View file

@ -10,7 +10,7 @@ import (
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
swarmtypes "github.com/docker/docker/api/types/swarm" swarmtypes "github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/client" "github.com/docker/docker/client"
"github.com/docker/docker/integration/util/swarm" "github.com/docker/docker/integration/internal/swarm"
"github.com/gotestyourself/gotestyourself/poll" "github.com/gotestyourself/gotestyourself/poll"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

2
integration/service/inspect_test.go
View file

@ -9,7 +9,7 @@ import (
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
swarmtypes "github.com/docker/docker/api/types/swarm" swarmtypes "github.com/docker/docker/api/types/swarm"
"github.com/docker/docker/client" "github.com/docker/docker/client"
"github.com/docker/docker/integration/util/swarm" "github.com/docker/docker/integration/internal/swarm"
"github.com/gotestyourself/gotestyourself/poll" "github.com/gotestyourself/gotestyourself/poll"
"github.com/gotestyourself/gotestyourself/skip" "github.com/gotestyourself/gotestyourself/skip"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

2
integration/service/network_test.go
View file

@ -8,7 +8,7 @@ import (
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
"github.com/docker/docker/client" "github.com/docker/docker/client"
"github.com/docker/docker/integration/util/swarm" "github.com/docker/docker/integration/internal/swarm"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

2
integration/system/event_test.go
View file

@ -11,7 +11,7 @@ import (
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/network" "github.com/docker/docker/api/types/network"
"github.com/docker/docker/api/types/strslice" "github.com/docker/docker/api/types/strslice"
"github.com/docker/docker/integration/util/request" "github.com/docker/docker/integration/internal/request"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

2
integration/system/info_linux_test.go
View file

@ -7,7 +7,7 @@ import (
"testing" "testing"
req "github.com/docker/docker/integration-cli/request" req "github.com/docker/docker/integration-cli/request"
"github.com/docker/docker/integration/util/request" "github.com/docker/docker/integration/internal/request"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"golang.org/x/net/context" "golang.org/x/net/context"

2
integration/system/info_test.go
View file

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"testing" "testing"
"github.com/docker/docker/integration/util/request" "github.com/docker/docker/integration/internal/request"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"golang.org/x/net/context" "golang.org/x/net/context"

4
integration/system/login_test.go
View file

@ -4,8 +4,8 @@ import (
"testing" "testing"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/integration/util/request" "github.com/docker/docker/integration/internal/request"
"github.com/docker/docker/integration/util/requirement" "github.com/docker/docker/integration/internal/requirement"
"github.com/gotestyourself/gotestyourself/skip" "github.com/gotestyourself/gotestyourself/skip"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"golang.org/x/net/context" "golang.org/x/net/context"

2
integration/system/version_test.go
View file

@ -3,7 +3,7 @@ package system // import "github.com/docker/docker/integration/system"
import ( import (
"testing" "testing"
"github.com/docker/docker/integration/util/request" "github.com/docker/docker/integration/internal/request"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"golang.org/x/net/context" "golang.org/x/net/context"