diff options
| author | Sam Whited <sam@samwhited.com> | 2019-08-29 15:52:40 -0500 |
|---|---|---|
| committer | Sam Whited <sam@samwhited.com> | 2019-09-11 07:47:23 -0500 |
| commit | b37c214e3c8c4ff5450bd5fc1225d53827d240e7 (patch) | |
| tree | 5687180effbed0fef2b57743bbf210fd7fd71af2 /integration/system | |
| parent | cd9e4ec24002fcf3238c1f1e8629e08966c2b7fb (diff) | |
| download | docker-b37c214e3c8c4ff5450bd5fc1225d53827d240e7.tar.gz | |
testutil: make testing packages public
This was done with something along the lines of:
```
mv internal/test testutil
pushd testutil/; grep -IRl "package test" | xargs -I '{}' sed -i -e 's|package test|package testutil|g' {}; popd
mv internal/testutil/*.go testutil/ && rm -rf internal/
grep -IRl "github.com\/docker\/docker\/internal\/test" | xargs -I '{}' sed -i -e 's|github.com/docker/docker/internal/test|github.com/docker/docker/test|g' {}
goimports .
```
I also modified the basic plugin path in testutil/fixtures/plugin.
Signed-off-by: Sam Whited <sam@samwhited.com>
Diffstat (limited to 'integration/system')
| -rw-r--r-- | integration/system/cgroupdriver_systemd_test.go | 2 | ||||
| -rw-r--r-- | integration/system/event_test.go | 4 | ||||
| -rw-r--r-- | integration/system/info_linux_test.go | 2 | ||||
| -rw-r--r-- | integration/system/info_test.go | 2 | ||||
| -rw-r--r-- | integration/system/main_test.go | 2 | ||||
| -rw-r--r-- | integration/system/ping_test.go | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/integration/system/cgroupdriver_systemd_test.go b/integration/system/cgroupdriver_systemd_test.go index b277ccaa08..1019532397 100644 --- a/integration/system/cgroupdriver_systemd_test.go +++ b/integration/system/cgroupdriver_systemd_test.go @@ -7,7 +7,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/integration/internal/container" - "github.com/docker/docker/internal/test/daemon" + "github.com/docker/docker/testutil/daemon" "gotest.tools/assert" "gotest.tools/skip" diff --git a/integration/system/event_test.go b/integration/system/event_test.go index 61adeedc4b..162dd80e13 100644 --- a/integration/system/event_test.go +++ b/integration/system/event_test.go @@ -15,9 +15,9 @@ import ( "github.com/docker/docker/api/types/strslice" "github.com/docker/docker/api/types/versions" "github.com/docker/docker/integration/internal/container" - "github.com/docker/docker/internal/test/request" - req "github.com/docker/docker/internal/test/request" "github.com/docker/docker/pkg/jsonmessage" + "github.com/docker/docker/testutil/request" + req "github.com/docker/docker/testutil/request" "gotest.tools/assert" is "gotest.tools/assert/cmp" "gotest.tools/skip" diff --git a/integration/system/info_linux_test.go b/integration/system/info_linux_test.go index cb0448e558..434373b369 100644 --- a/integration/system/info_linux_test.go +++ b/integration/system/info_linux_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - req "github.com/docker/docker/internal/test/request" + req "github.com/docker/docker/testutil/request" "gotest.tools/assert" is "gotest.tools/assert/cmp" ) diff --git a/integration/system/info_test.go b/integration/system/info_test.go index 8130361988..56a735714e 100644 --- a/integration/system/info_test.go +++ b/integration/system/info_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/docker/docker/internal/test/daemon" + "github.com/docker/docker/testutil/daemon" "gotest.tools/assert" is "gotest.tools/assert/cmp" "gotest.tools/skip" diff --git a/integration/system/main_test.go b/integration/system/main_test.go index f19a3157aa..6dd4761cd5 100644 --- a/integration/system/main_test.go +++ b/integration/system/main_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/docker/docker/internal/test/environment" + "github.com/docker/docker/testutil/environment" ) var testEnv *environment.Execution diff --git a/integration/system/ping_test.go b/integration/system/ping_test.go index 9858bfd9da..2bbd7d2ad9 100644 --- a/integration/system/ping_test.go +++ b/integration/system/ping_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/docker/docker/api/types/versions" - "github.com/docker/docker/internal/test/request" + "github.com/docker/docker/testutil/request" "gotest.tools/assert" "gotest.tools/skip" ) |