Browse code
Update tests to use gotest.tools 👼
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Vincent Demeester authored on 2018/06/11 22:32:11Showing 262 changed files
- TESTING.md
- api/server/middleware/debug_test.go
- api/server/middleware/version_test.go
- api/types/filters/parse_test.go
- builder/dockerfile/buildargs_test.go
- builder/dockerfile/copy_test.go
- builder/dockerfile/dispatchers_test.go
- builder/dockerfile/evaluator_test.go
- builder/dockerfile/internals_linux_test.go
- builder/dockerfile/internals_test.go
- builder/dockerfile/internals_windows_test.go
- builder/fscache/fscache_test.go
- builder/remotecontext/git/gitutils_test.go
- builder/remotecontext/mimetype_test.go
- builder/remotecontext/remote_test.go
- builder/remotecontext/tarsum_test.go
- client/client_test.go
- client/config_create_test.go
- client/config_inspect_test.go
- client/config_list_test.go
- client/config_remove_test.go
- client/config_update_test.go
- client/container_logs_test.go
- client/container_prune_test.go
- client/container_remove_test.go
- client/distribution_inspect_test.go
- client/hijack_test.go
- client/image_prune_test.go
- client/image_remove_test.go
- client/network_inspect_test.go
- client/network_prune_test.go
- client/ping_test.go
- client/request_test.go
- client/secret_create_test.go
- client/secret_inspect_test.go
- client/secret_list_test.go
- client/secret_remove_test.go
- client/secret_update_test.go
- client/service_create_test.go
- client/service_logs_test.go
- client/service_remove_test.go
- client/swarm_get_unlock_key_test.go
- client/volume_inspect_test.go
- cmd/dockerd/config_unix_test.go
- cmd/dockerd/daemon_test.go
- cmd/dockerd/daemon_unix_test.go
- cmd/dockerd/options_test.go
- container/container_unit_test.go
- container/view_test.go
- daemon/cluster/convert/service_test.go
- daemon/cluster/executor/container/container_test.go
- daemon/config/config_test.go
- daemon/config/config_unix_test.go
- daemon/config/config_windows_test.go
- daemon/container_unix_test.go
- daemon/create_test.go
- daemon/daemon_linux_test.go
- daemon/daemon_test.go
- daemon/delete_test.go
- daemon/discovery/discovery_test.go
- daemon/exec_linux_test.go
- daemon/graphdriver/aufs/aufs_test.go
- daemon/graphdriver/copy/copy_test.go
- daemon/graphdriver/driver_test.go
- daemon/graphdriver/graphtest/graphbench_unix.go
- daemon/graphdriver/graphtest/graphtest_unix.go
- daemon/graphdriver/graphtest/testutil_unix.go
- daemon/graphdriver/quota/projectquota_test.go
- daemon/info_unix_test.go
- daemon/inspect_test.go
- daemon/list_test.go
- daemon/logger/adapter_test.go
- daemon/logger/awslogs/cloudwatchlogs_test.go
- daemon/logger/jsonfilelog/jsonfilelog_test.go
- daemon/logger/jsonfilelog/jsonlog/jsonlogbytes_test.go
- daemon/logger/jsonfilelog/jsonlog/time_marshalling_test.go
- daemon/logger/jsonfilelog/read_test.go
- daemon/logger/splunk/splunk_test.go
- daemon/logger/templates/templates_test.go
- daemon/oci_linux_test.go
- daemon/reload_test.go
- daemon/resize_test.go
- daemon/trustkey_test.go
- distribution/metadata/v1_id_service_test.go
- distribution/pull_v2_test.go
- image/fs_test.go
- image/image_test.go
- image/store_test.go
- integration-cli/cli/build/build.go
- integration-cli/cli/cli.go
- integration-cli/daemon/daemon.go
- integration-cli/daemon/daemon_swarm.go
- integration-cli/docker_api_build_test.go
- integration-cli/docker_api_build_windows_test.go
- integration-cli/docker_api_containers_test.go
- integration-cli/docker_api_containers_windows_test.go
- integration-cli/docker_api_inspect_test.go
- integration-cli/docker_api_swarm_service_test.go
- integration-cli/docker_api_swarm_test.go
- integration-cli/docker_cli_attach_test.go
- integration-cli/docker_cli_build_test.go
- integration-cli/docker_cli_build_unix_test.go
- integration-cli/docker_cli_by_digest_test.go
- integration-cli/docker_cli_cp_test.go
- integration-cli/docker_cli_daemon_plugins_test.go
- integration-cli/docker_cli_daemon_test.go
- integration-cli/docker_cli_events_test.go
- integration-cli/docker_cli_exec_test.go
- integration-cli/docker_cli_export_import_test.go
- integration-cli/docker_cli_images_test.go
- integration-cli/docker_cli_import_test.go
- integration-cli/docker_cli_inspect_test.go
- integration-cli/docker_cli_logs_test.go
- integration-cli/docker_cli_network_unix_test.go
- integration-cli/docker_cli_proxy_test.go
- integration-cli/docker_cli_prune_unix_test.go
- integration-cli/docker_cli_ps_test.go
- integration-cli/docker_cli_pull_local_test.go
- integration-cli/docker_cli_push_test.go
- integration-cli/docker_cli_rmi_test.go
- integration-cli/docker_cli_run_test.go
- integration-cli/docker_cli_run_unix_test.go
- integration-cli/docker_cli_save_load_test.go
- integration-cli/docker_cli_save_load_unix_test.go
- integration-cli/docker_cli_service_health_test.go
- integration-cli/docker_cli_service_logs_test.go
- integration-cli/docker_cli_start_test.go
- integration-cli/docker_cli_swarm_test.go
- integration-cli/docker_cli_top_test.go
- integration-cli/docker_cli_volume_test.go
- integration-cli/docker_cli_wait_test.go
- integration-cli/docker_utils_test.go
- integration-cli/requirements_test.go
- integration-cli/utils_test.go
- integration/build/build_session_test.go
- integration/build/build_squash_test.go
- integration/build/build_test.go
- integration/config/config_test.go
- integration/container/copy_test.go
- integration/container/create_test.go
- integration/container/daemon_linux_test.go
- integration/container/diff_test.go
- integration/container/exec_test.go
- integration/container/export_test.go
- integration/container/health_test.go
- integration/container/inspect_test.go
- integration/container/kill_test.go
- integration/container/links_linux_test.go
- integration/container/logs_test.go
- integration/container/mounts_linux_test.go
- integration/container/nat_test.go
- integration/container/pause_test.go
- integration/container/ps_test.go
- integration/container/remove_test.go
- integration/container/rename_test.go
- integration/container/resize_test.go
- integration/container/restart_test.go
- integration/container/stats_test.go
- integration/container/stop_test.go
- integration/container/update_linux_test.go
- integration/container/update_test.go
- integration/image/commit_test.go
- integration/image/remove_test.go
- integration/image/tag_test.go
- integration/internal/container/container.go
- integration/internal/container/states.go
- integration/internal/network/network.go
- integration/internal/requirement/requirement.go
- integration/internal/swarm/service.go
- integration/network/delete_test.go
- integration/network/helpers.go
- integration/network/inspect_test.go
- integration/network/ipvlan/ipvlan_test.go
- integration/network/macvlan/macvlan_test.go
- integration/network/service_test.go
- integration/plugin/authz/authz_plugin_test.go
- integration/plugin/authz/authz_plugin_v2_test.go
- integration/plugin/authz/main_test.go
- integration/plugin/graphdriver/external_test.go
- integration/plugin/logging/logging_test.go
- integration/plugin/logging/validation_test.go
- integration/plugin/volumes/mounts_test.go
- integration/secret/secret_test.go
- integration/service/create_test.go
- integration/service/inspect_test.go
- integration/service/network_test.go
- integration/service/plugin_test.go
- integration/session/session_test.go
- integration/system/cgroupdriver_systemd_test.go
- integration/system/event_test.go
- integration/system/info_linux_test.go
- integration/system/info_test.go
- integration/system/login_test.go
- integration/system/version_test.go
- integration/volume/volume_test.go
- internal/test/daemon/config.go
- internal/test/daemon/container.go
- internal/test/daemon/daemon.go
- internal/test/daemon/node.go
- internal/test/daemon/plugin.go
- internal/test/daemon/secret.go
- internal/test/daemon/service.go
- internal/test/daemon/swarm.go
- internal/test/environment/clean.go
- internal/test/environment/protect.go
- internal/test/fakegit/fakegit.go
- internal/test/fakestorage/fixtures.go
- internal/test/fakestorage/storage.go
- internal/test/registry/registry.go
- internal/test/request/request.go
- internal/testutil/stringutils_test.go
- libcontainerd/queue_test.go
- opts/quotedstring_test.go
- pkg/archive/archive_linux_test.go
- pkg/archive/archive_test.go
- pkg/archive/archive_unix_test.go
- pkg/archive/changes_test.go
- pkg/archive/copy_unix_test.go
- pkg/archive/wrap_test.go
- pkg/authorization/api_test.go
- pkg/authorization/middleware_test.go
- pkg/authorization/middleware_unix_test.go
- pkg/chrootarchive/archive_test.go
- pkg/fileutils/fileutils_test.go
- pkg/idtools/idtools_unix_test.go
- pkg/ioutils/readers_test.go
- pkg/jsonmessage/jsonmessage_test.go
- pkg/mount/mountinfo_linux_test.go
- pkg/plugins/client_test.go
- pkg/plugins/discovery_unix_test.go
- pkg/plugins/plugin_test.go
- pkg/plugins/transport/http_test.go
- pkg/pools/pools_test.go
- pkg/reexec/reexec_test.go
- pkg/signal/signal_linux_test.go
- pkg/signal/signal_test.go
- pkg/signal/trap_linux_test.go
- pkg/streamformatter/streamformatter_test.go
- pkg/streamformatter/streamwriter_test.go
- pkg/sysinfo/sysinfo_linux_test.go
- pkg/system/rm_test.go
- pkg/system/stat_unix_test.go
- pkg/tarsum/tarsum_test.go
- pkg/term/ascii_test.go
- pkg/term/proxy_test.go
- pkg/term/term_linux_test.go
- plugin/executor/containerd/containerd_test.go
- plugin/manager_linux_test.go
- reference/store_test.go
- registry/config_test.go
- registry/registry_test.go
- registry/resumable/resumablerequestreader_test.go
- registry/service_v1_test.go
- runconfig/config_test.go
- runconfig/hostconfig_test.go
- vendor.conf
- volume/local/local_test.go
- volume/service/db_test.go
- volume/service/restore_test.go
- volume/service/service_linux_test.go
- volume/service/service_test.go
- volume/service/store_test.go
| ... | ... |
@@ -8,11 +8,11 @@ questions you may have as an aspiring Moby contributor. |
| 8 | 8 |
Moby has two test suites (and one legacy test suite): |
| 9 | 9 |
|
| 10 | 10 |
* Unit tests - use standard `go test` and |
| 11 |
- [gotestyourself/assert](https://godoc.org/github.com/gotestyourself/gotestyourself/assert) assertions. They are located in |
|
| 11 |
+ [gotest.tools/assert](https://godoc.org/gotest.tools/assert) assertions. They are located in |
|
| 12 | 12 |
the package they test. Unit tests should be fast and test only their own |
| 13 | 13 |
package. |
| 14 | 14 |
* API integration tests - use standard `go test` and |
| 15 |
- [gotestyourself/assert](https://godoc.org/github.com/gotestyourself/gotestyourself/assert) assertions. They are located in |
|
| 15 |
+ [gotest.tools/assert](https://godoc.org/gotest.tools/assert) assertions. They are located in |
|
| 16 | 16 |
`./integration/<component>` directories, where `component` is: container, |
| 17 | 17 |
image, volume, etc. These tests perform HTTP requests to an API endpoint and |
| 18 | 18 |
check the HTTP response and daemon state after the call. |
| ... | ... |
@@ -3,8 +3,8 @@ package middleware // import "github.com/docker/docker/api/server/middleware" |
| 3 | 3 |
import ( |
| 4 | 4 |
"testing" |
| 5 | 5 |
|
| 6 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 7 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 6 |
+ "gotest.tools/assert" |
|
| 7 |
+ is "gotest.tools/assert/cmp" |
|
| 8 | 8 |
) |
| 9 | 9 |
|
| 10 | 10 |
func TestMaskSecretKeys(t *testing.T) {
|
| ... | ... |
@@ -8,8 +8,8 @@ import ( |
| 8 | 8 |
"testing" |
| 9 | 9 |
|
| 10 | 10 |
"github.com/docker/docker/api/server/httputils" |
| 11 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 12 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 11 |
+ "gotest.tools/assert" |
|
| 12 |
+ is "gotest.tools/assert/cmp" |
|
| 13 | 13 |
) |
| 14 | 14 |
|
| 15 | 15 |
func TestVersionMiddlewareVersion(t *testing.T) {
|
| ... | ... |
@@ -5,9 +5,9 @@ import ( |
| 5 | 5 |
"testing" |
| 6 | 6 |
|
| 7 | 7 |
"github.com/docker/docker/pkg/containerfs" |
| 8 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 9 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 10 |
- "github.com/gotestyourself/gotestyourself/fs" |
|
| 8 |
+ "gotest.tools/assert" |
|
| 9 |
+ is "gotest.tools/assert/cmp" |
|
| 10 |
+ "gotest.tools/fs" |
|
| 11 | 11 |
) |
| 12 | 12 |
|
| 13 | 13 |
func TestIsExistingDirectory(t *testing.T) {
|
| ... | ... |
@@ -14,10 +14,10 @@ import ( |
| 14 | 14 |
"github.com/docker/docker/image" |
| 15 | 15 |
"github.com/docker/docker/pkg/system" |
| 16 | 16 |
"github.com/docker/go-connections/nat" |
| 17 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 18 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 19 | 17 |
"github.com/moby/buildkit/frontend/dockerfile/instructions" |
| 20 | 18 |
"github.com/moby/buildkit/frontend/dockerfile/shell" |
| 19 |
+ "gotest.tools/assert" |
|
| 20 |
+ is "gotest.tools/assert/cmp" |
|
| 21 | 21 |
) |
| 22 | 22 |
|
| 23 | 23 |
func newBuilderWithMockBackend() *Builder {
|
| ... | ... |
@@ -7,10 +7,10 @@ import ( |
| 7 | 7 |
"github.com/docker/docker/builder/remotecontext" |
| 8 | 8 |
"github.com/docker/docker/pkg/archive" |
| 9 | 9 |
"github.com/docker/docker/pkg/reexec" |
| 10 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 11 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 12 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 13 | 10 |
"github.com/moby/buildkit/frontend/dockerfile/instructions" |
| 11 |
+ "gotest.tools/assert" |
|
| 12 |
+ is "gotest.tools/assert/cmp" |
|
| 13 |
+ "gotest.tools/skip" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
type dispatchTestCase struct {
|
| ... | ... |
@@ -97,7 +97,7 @@ func initDispatchTestCases() []dispatchTestCase {
|
| 97 | 97 |
} |
| 98 | 98 |
|
| 99 | 99 |
func TestDispatch(t *testing.T) {
|
| 100 |
- skip.IfCondition(t, os.Getuid() != 0, "skipping test that requires root") |
|
| 100 |
+ skip.If(t, os.Getuid() != 0, "skipping test that requires root") |
|
| 101 | 101 |
testCases := initDispatchTestCases() |
| 102 | 102 |
|
| 103 | 103 |
for _, testCase := range testCases {
|
| ... | ... |
@@ -6,8 +6,8 @@ import ( |
| 6 | 6 |
"testing" |
| 7 | 7 |
|
| 8 | 8 |
"github.com/docker/docker/pkg/idtools" |
| 9 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 10 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 9 |
+ "gotest.tools/assert" |
|
| 10 |
+ is "gotest.tools/assert/cmp" |
|
| 11 | 11 |
) |
| 12 | 12 |
|
| 13 | 13 |
func TestChownFlagParsing(t *testing.T) {
|
| ... | ... |
@@ -13,9 +13,9 @@ import ( |
| 13 | 13 |
"github.com/docker/docker/builder/remotecontext" |
| 14 | 14 |
"github.com/docker/docker/pkg/archive" |
| 15 | 15 |
"github.com/docker/go-connections/nat" |
| 16 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 17 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 18 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 16 |
+ "gotest.tools/assert" |
|
| 17 |
+ is "gotest.tools/assert/cmp" |
|
| 18 |
+ "gotest.tools/skip" |
|
| 19 | 19 |
) |
| 20 | 20 |
|
| 21 | 21 |
func TestEmptyDockerfile(t *testing.T) {
|
| ... | ... |
@@ -61,7 +61,7 @@ func TestNonExistingDockerfile(t *testing.T) {
|
| 61 | 61 |
} |
| 62 | 62 |
|
| 63 | 63 |
func readAndCheckDockerfile(t *testing.T, testName, contextDir, dockerfilePath, expectedError string) {
|
| 64 |
- skip.IfCondition(t, os.Getuid() != 0, "skipping test that requires root") |
|
| 64 |
+ skip.If(t, os.Getuid() != 0, "skipping test that requires root") |
|
| 65 | 65 |
tarStream, err := archive.Tar(contextDir, archive.Uncompressed) |
| 66 | 66 |
assert.NilError(t, err) |
| 67 | 67 |
|
| ... | ... |
@@ -8,9 +8,9 @@ import ( |
| 8 | 8 |
"testing" |
| 9 | 9 |
"time" |
| 10 | 10 |
|
| 11 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 12 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 13 | 11 |
"github.com/moby/buildkit/session/filesync" |
| 12 |
+ "gotest.tools/assert" |
|
| 13 |
+ is "gotest.tools/assert/cmp" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
func TestFSCache(t *testing.T) {
|
| ... | ... |
@@ -14,8 +14,8 @@ import ( |
| 14 | 14 |
"testing" |
| 15 | 15 |
|
| 16 | 16 |
"github.com/google/go-cmp/cmp" |
| 17 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 18 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 17 |
+ "gotest.tools/assert" |
|
| 18 |
+ is "gotest.tools/assert/cmp" |
|
| 19 | 19 |
) |
| 20 | 20 |
|
| 21 | 21 |
func TestParseRemoteURL(t *testing.T) {
|
| ... | ... |
@@ -3,8 +3,8 @@ package remotecontext // import "github.com/docker/docker/builder/remotecontext" |
| 3 | 3 |
import ( |
| 4 | 4 |
"testing" |
| 5 | 5 |
|
| 6 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 7 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 6 |
+ "gotest.tools/assert" |
|
| 7 |
+ is "gotest.tools/assert/cmp" |
|
| 8 | 8 |
) |
| 9 | 9 |
|
| 10 | 10 |
func TestDetectContentType(t *testing.T) {
|
| ... | ... |
@@ -10,9 +10,9 @@ import ( |
| 10 | 10 |
"testing" |
| 11 | 11 |
|
| 12 | 12 |
"github.com/docker/docker/builder" |
| 13 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 15 |
- "github.com/gotestyourself/gotestyourself/fs" |
|
| 13 |
+ "gotest.tools/assert" |
|
| 14 |
+ is "gotest.tools/assert/cmp" |
|
| 15 |
+ "gotest.tools/fs" |
|
| 16 | 16 |
) |
| 17 | 17 |
|
| 18 | 18 |
var binaryContext = []byte{0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00} //xz magic
|
| ... | ... |
@@ -9,8 +9,8 @@ import ( |
| 9 | 9 |
"github.com/docker/docker/builder" |
| 10 | 10 |
"github.com/docker/docker/pkg/archive" |
| 11 | 11 |
"github.com/docker/docker/pkg/reexec" |
| 12 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 13 | 12 |
"github.com/pkg/errors" |
| 13 |
+ "gotest.tools/skip" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
const ( |
| ... | ... |
@@ -137,7 +137,7 @@ func TestRemoveDirectory(t *testing.T) {
|
| 137 | 137 |
} |
| 138 | 138 |
|
| 139 | 139 |
func makeTestArchiveContext(t *testing.T, dir string) builder.Source {
|
| 140 |
- skip.IfCondition(t, os.Getuid() != 0, "skipping test that requires root") |
|
| 140 |
+ skip.If(t, os.Getuid() != 0, "skipping test that requires root") |
|
| 141 | 141 |
tarStream, err := archive.Tar(dir, archive.Uncompressed) |
| 142 | 142 |
if err != nil {
|
| 143 | 143 |
t.Fatalf("error: %s", err)
|
| ... | ... |
@@ -10,10 +10,10 @@ import ( |
| 10 | 10 |
|
| 11 | 11 |
"github.com/docker/docker/api" |
| 12 | 12 |
"github.com/docker/docker/api/types" |
| 13 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 15 |
- "github.com/gotestyourself/gotestyourself/env" |
|
| 16 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 13 |
+ "gotest.tools/assert" |
|
| 14 |
+ is "gotest.tools/assert/cmp" |
|
| 15 |
+ "gotest.tools/env" |
|
| 16 |
+ "gotest.tools/skip" |
|
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 | 19 |
func TestNewEnvClient(t *testing.T) {
|
| ... | ... |
@@ -12,8 +12,8 @@ import ( |
| 12 | 12 |
|
| 13 | 13 |
"github.com/docker/docker/api/types" |
| 14 | 14 |
"github.com/docker/docker/api/types/swarm" |
| 15 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 16 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 15 |
+ "gotest.tools/assert" |
|
| 16 |
+ is "gotest.tools/assert/cmp" |
|
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 | 19 |
func TestConfigCreateUnsupported(t *testing.T) {
|
| ... | ... |
@@ -11,9 +11,9 @@ import ( |
| 11 | 11 |
"testing" |
| 12 | 12 |
|
| 13 | 13 |
"github.com/docker/docker/api/types/swarm" |
| 14 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 15 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 16 | 14 |
"github.com/pkg/errors" |
| 15 |
+ "gotest.tools/assert" |
|
| 16 |
+ is "gotest.tools/assert/cmp" |
|
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 | 19 |
func TestConfigInspectNotFound(t *testing.T) {
|
| ... | ... |
@@ -13,8 +13,8 @@ import ( |
| 13 | 13 |
"github.com/docker/docker/api/types" |
| 14 | 14 |
"github.com/docker/docker/api/types/filters" |
| 15 | 15 |
"github.com/docker/docker/api/types/swarm" |
| 16 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 17 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 16 |
+ "gotest.tools/assert" |
|
| 17 |
+ is "gotest.tools/assert/cmp" |
|
| 18 | 18 |
) |
| 19 | 19 |
|
| 20 | 20 |
func TestConfigListUnsupported(t *testing.T) {
|
| ... | ... |
@@ -9,8 +9,8 @@ import ( |
| 9 | 9 |
"strings" |
| 10 | 10 |
"testing" |
| 11 | 11 |
|
| 12 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 13 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 12 |
+ "gotest.tools/assert" |
|
| 13 |
+ is "gotest.tools/assert/cmp" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
func TestConfigRemoveUnsupported(t *testing.T) {
|
| ... | ... |
@@ -10,8 +10,8 @@ import ( |
| 10 | 10 |
"testing" |
| 11 | 11 |
|
| 12 | 12 |
"github.com/docker/docker/api/types/swarm" |
| 13 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 13 |
+ "gotest.tools/assert" |
|
| 14 |
+ is "gotest.tools/assert/cmp" |
|
| 15 | 15 |
) |
| 16 | 16 |
|
| 17 | 17 |
func TestConfigUpdateUnsupported(t *testing.T) {
|
| ... | ... |
@@ -14,8 +14,8 @@ import ( |
| 14 | 14 |
"time" |
| 15 | 15 |
|
| 16 | 16 |
"github.com/docker/docker/api/types" |
| 17 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 18 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 17 |
+ "gotest.tools/assert" |
|
| 18 |
+ is "gotest.tools/assert/cmp" |
|
| 19 | 19 |
) |
| 20 | 20 |
|
| 21 | 21 |
func TestContainerLogsNotFoundError(t *testing.T) {
|
| ... | ... |
@@ -12,8 +12,8 @@ import ( |
| 12 | 12 |
|
| 13 | 13 |
"github.com/docker/docker/api/types" |
| 14 | 14 |
"github.com/docker/docker/api/types/filters" |
| 15 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 16 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 15 |
+ "gotest.tools/assert" |
|
| 16 |
+ is "gotest.tools/assert/cmp" |
|
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 | 19 |
func TestContainersPruneError(t *testing.T) {
|
| ... | ... |
@@ -10,8 +10,8 @@ import ( |
| 10 | 10 |
"testing" |
| 11 | 11 |
|
| 12 | 12 |
"github.com/docker/docker/api/types" |
| 13 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 13 |
+ "gotest.tools/assert" |
|
| 14 |
+ is "gotest.tools/assert/cmp" |
|
| 15 | 15 |
) |
| 16 | 16 |
|
| 17 | 17 |
func TestContainerRemoveError(t *testing.T) {
|
| ... | ... |
@@ -5,9 +5,9 @@ import ( |
| 5 | 5 |
"net/http" |
| 6 | 6 |
"testing" |
| 7 | 7 |
|
| 8 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 9 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 10 | 8 |
"github.com/pkg/errors" |
| 9 |
+ "gotest.tools/assert" |
|
| 10 |
+ is "gotest.tools/assert/cmp" |
|
| 11 | 11 |
) |
| 12 | 12 |
|
| 13 | 13 |
func TestDistributionInspectUnsupported(t *testing.T) {
|
| ... | ... |
@@ -11,9 +11,9 @@ import ( |
| 11 | 11 |
|
| 12 | 12 |
"github.com/docker/docker/api/server/httputils" |
| 13 | 13 |
"github.com/docker/docker/api/types" |
| 14 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 15 | 14 |
"github.com/pkg/errors" |
| 16 | 15 |
"golang.org/x/net/context" |
| 16 |
+ "gotest.tools/assert" |
|
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 | 19 |
func TestTLSCloseWriter(t *testing.T) {
|
| ... | ... |
@@ -12,8 +12,8 @@ import ( |
| 12 | 12 |
|
| 13 | 13 |
"github.com/docker/docker/api/types" |
| 14 | 14 |
"github.com/docker/docker/api/types/filters" |
| 15 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 16 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 15 |
+ "gotest.tools/assert" |
|
| 16 |
+ is "gotest.tools/assert/cmp" |
|
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 | 19 |
func TestImagesPruneError(t *testing.T) {
|
| ... | ... |
@@ -11,8 +11,8 @@ import ( |
| 11 | 11 |
"testing" |
| 12 | 12 |
|
| 13 | 13 |
"github.com/docker/docker/api/types" |
| 14 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 15 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 14 |
+ "gotest.tools/assert" |
|
| 15 |
+ is "gotest.tools/assert/cmp" |
|
| 16 | 16 |
) |
| 17 | 17 |
|
| 18 | 18 |
func TestImageRemoveError(t *testing.T) {
|
| ... | ... |
@@ -12,9 +12,9 @@ import ( |
| 12 | 12 |
|
| 13 | 13 |
"github.com/docker/docker/api/types" |
| 14 | 14 |
"github.com/docker/docker/api/types/network" |
| 15 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 16 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 17 | 15 |
"github.com/pkg/errors" |
| 16 |
+ "gotest.tools/assert" |
|
| 17 |
+ is "gotest.tools/assert/cmp" |
|
| 18 | 18 |
) |
| 19 | 19 |
|
| 20 | 20 |
func TestNetworkInspectError(t *testing.T) {
|
| ... | ... |
@@ -12,8 +12,8 @@ import ( |
| 12 | 12 |
|
| 13 | 13 |
"github.com/docker/docker/api/types" |
| 14 | 14 |
"github.com/docker/docker/api/types/filters" |
| 15 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 16 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 15 |
+ "gotest.tools/assert" |
|
| 16 |
+ is "gotest.tools/assert/cmp" |
|
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 | 19 |
func TestNetworksPruneError(t *testing.T) {
|
| ... | ... |
@@ -8,8 +8,8 @@ import ( |
| 8 | 8 |
"strings" |
| 9 | 9 |
"testing" |
| 10 | 10 |
|
| 11 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 12 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 11 |
+ "gotest.tools/assert" |
|
| 12 |
+ is "gotest.tools/assert/cmp" |
|
| 13 | 13 |
) |
| 14 | 14 |
|
| 15 | 15 |
// TestPingFail tests that when a server sends a non-successful response that we |
| ... | ... |
@@ -12,8 +12,8 @@ import ( |
| 12 | 12 |
|
| 13 | 13 |
"github.com/docker/docker/api/types" |
| 14 | 14 |
"github.com/docker/docker/api/types/swarm" |
| 15 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 16 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 15 |
+ "gotest.tools/assert" |
|
| 16 |
+ is "gotest.tools/assert/cmp" |
|
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 | 19 |
func TestSecretCreateUnsupported(t *testing.T) {
|
| ... | ... |
@@ -11,9 +11,9 @@ import ( |
| 11 | 11 |
"testing" |
| 12 | 12 |
|
| 13 | 13 |
"github.com/docker/docker/api/types/swarm" |
| 14 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 15 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 16 | 14 |
"github.com/pkg/errors" |
| 15 |
+ "gotest.tools/assert" |
|
| 16 |
+ is "gotest.tools/assert/cmp" |
|
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 | 19 |
func TestSecretInspectUnsupported(t *testing.T) {
|
| ... | ... |
@@ -13,8 +13,8 @@ import ( |
| 13 | 13 |
"github.com/docker/docker/api/types" |
| 14 | 14 |
"github.com/docker/docker/api/types/filters" |
| 15 | 15 |
"github.com/docker/docker/api/types/swarm" |
| 16 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 17 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 16 |
+ "gotest.tools/assert" |
|
| 17 |
+ is "gotest.tools/assert/cmp" |
|
| 18 | 18 |
) |
| 19 | 19 |
|
| 20 | 20 |
func TestSecretListUnsupported(t *testing.T) {
|
| ... | ... |
@@ -9,8 +9,8 @@ import ( |
| 9 | 9 |
"strings" |
| 10 | 10 |
"testing" |
| 11 | 11 |
|
| 12 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 13 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 12 |
+ "gotest.tools/assert" |
|
| 13 |
+ is "gotest.tools/assert/cmp" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
func TestSecretRemoveUnsupported(t *testing.T) {
|
| ... | ... |
@@ -10,8 +10,8 @@ import ( |
| 10 | 10 |
"testing" |
| 11 | 11 |
|
| 12 | 12 |
"github.com/docker/docker/api/types/swarm" |
| 13 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 13 |
+ "gotest.tools/assert" |
|
| 14 |
+ is "gotest.tools/assert/cmp" |
|
| 15 | 15 |
) |
| 16 | 16 |
|
| 17 | 17 |
func TestSecretUpdateUnsupported(t *testing.T) {
|
| ... | ... |
@@ -13,10 +13,10 @@ import ( |
| 13 | 13 |
"github.com/docker/docker/api/types" |
| 14 | 14 |
registrytypes "github.com/docker/docker/api/types/registry" |
| 15 | 15 |
"github.com/docker/docker/api/types/swarm" |
| 16 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 17 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 18 | 16 |
"github.com/opencontainers/go-digest" |
| 19 | 17 |
"github.com/opencontainers/image-spec/specs-go/v1" |
| 18 |
+ "gotest.tools/assert" |
|
| 19 |
+ is "gotest.tools/assert/cmp" |
|
| 20 | 20 |
) |
| 21 | 21 |
|
| 22 | 22 |
func TestServiceCreateError(t *testing.T) {
|
| ... | ... |
@@ -14,8 +14,8 @@ import ( |
| 14 | 14 |
"time" |
| 15 | 15 |
|
| 16 | 16 |
"github.com/docker/docker/api/types" |
| 17 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 18 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 17 |
+ "gotest.tools/assert" |
|
| 18 |
+ is "gotest.tools/assert/cmp" |
|
| 19 | 19 |
) |
| 20 | 20 |
|
| 21 | 21 |
func TestServiceLogsError(t *testing.T) {
|
| ... | ... |
@@ -9,8 +9,8 @@ import ( |
| 9 | 9 |
"strings" |
| 10 | 10 |
"testing" |
| 11 | 11 |
|
| 12 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 13 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 12 |
+ "gotest.tools/assert" |
|
| 13 |
+ is "gotest.tools/assert/cmp" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
func TestServiceRemoveError(t *testing.T) {
|
| ... | ... |
@@ -11,8 +11,8 @@ import ( |
| 11 | 11 |
"testing" |
| 12 | 12 |
|
| 13 | 13 |
"github.com/docker/docker/api/types" |
| 14 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 15 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 14 |
+ "gotest.tools/assert" |
|
| 15 |
+ is "gotest.tools/assert/cmp" |
|
| 16 | 16 |
) |
| 17 | 17 |
|
| 18 | 18 |
func TestSwarmGetUnlockKeyError(t *testing.T) {
|
| ... | ... |
@@ -11,9 +11,9 @@ import ( |
| 11 | 11 |
"testing" |
| 12 | 12 |
|
| 13 | 13 |
"github.com/docker/docker/api/types" |
| 14 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 15 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 16 | 14 |
"github.com/pkg/errors" |
| 15 |
+ "gotest.tools/assert" |
|
| 16 |
+ is "gotest.tools/assert/cmp" |
|
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 | 19 |
func TestVolumeInspectError(t *testing.T) {
|
| ... | ... |
@@ -6,9 +6,9 @@ import ( |
| 6 | 6 |
"testing" |
| 7 | 7 |
|
| 8 | 8 |
"github.com/docker/docker/daemon/config" |
| 9 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 10 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 11 | 9 |
"github.com/spf13/pflag" |
| 10 |
+ "gotest.tools/assert" |
|
| 11 |
+ is "gotest.tools/assert/cmp" |
|
| 12 | 12 |
) |
| 13 | 13 |
|
| 14 | 14 |
func TestDaemonParseShmSize(t *testing.T) {
|
| ... | ... |
@@ -4,11 +4,11 @@ import ( |
| 4 | 4 |
"testing" |
| 5 | 5 |
|
| 6 | 6 |
"github.com/docker/docker/daemon/config" |
| 7 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 8 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 9 |
- "github.com/gotestyourself/gotestyourself/fs" |
|
| 10 | 7 |
"github.com/sirupsen/logrus" |
| 11 | 8 |
"github.com/spf13/pflag" |
| 9 |
+ "gotest.tools/assert" |
|
| 10 |
+ is "gotest.tools/assert/cmp" |
|
| 11 |
+ "gotest.tools/fs" |
|
| 12 | 12 |
) |
| 13 | 13 |
|
| 14 | 14 |
func defaultOptions(configFile string) *daemonOptions {
|
| ... | ... |
@@ -6,9 +6,9 @@ import ( |
| 6 | 6 |
"testing" |
| 7 | 7 |
|
| 8 | 8 |
"github.com/docker/docker/daemon/config" |
| 9 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 10 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 11 |
- "github.com/gotestyourself/gotestyourself/fs" |
|
| 9 |
+ "gotest.tools/assert" |
|
| 10 |
+ is "gotest.tools/assert/cmp" |
|
| 11 |
+ "gotest.tools/fs" |
|
| 12 | 12 |
) |
| 13 | 13 |
|
| 14 | 14 |
func TestLoadDaemonCliConfigWithDaemonFlags(t *testing.T) {
|
| ... | ... |
@@ -6,9 +6,9 @@ import ( |
| 6 | 6 |
|
| 7 | 7 |
cliconfig "github.com/docker/docker/cli/config" |
| 8 | 8 |
"github.com/docker/docker/daemon/config" |
| 9 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 10 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 11 | 9 |
"github.com/spf13/pflag" |
| 10 |
+ "gotest.tools/assert" |
|
| 11 |
+ is "gotest.tools/assert/cmp" |
|
| 12 | 12 |
) |
| 13 | 13 |
|
| 14 | 14 |
func TestCommonOptionsInstallFlags(t *testing.T) {
|
| ... | ... |
@@ -11,7 +11,7 @@ import ( |
| 11 | 11 |
swarmtypes "github.com/docker/docker/api/types/swarm" |
| 12 | 12 |
"github.com/docker/docker/daemon/logger/jsonfilelog" |
| 13 | 13 |
"github.com/docker/docker/pkg/signal" |
| 14 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
+ "gotest.tools/assert" |
|
| 15 | 15 |
) |
| 16 | 16 |
|
| 17 | 17 |
func TestContainerStopSignal(t *testing.T) {
|
| ... | ... |
@@ -8,9 +8,9 @@ import ( |
| 8 | 8 |
|
| 9 | 9 |
"github.com/docker/docker/api/types" |
| 10 | 10 |
containertypes "github.com/docker/docker/api/types/container" |
| 11 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 12 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 13 | 11 |
"github.com/pborman/uuid" |
| 12 |
+ "gotest.tools/assert" |
|
| 13 |
+ is "gotest.tools/assert/cmp" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
var root string |
| ... | ... |
@@ -8,7 +8,7 @@ import ( |
| 8 | 8 |
"github.com/docker/docker/api/types/swarm/runtime" |
| 9 | 9 |
swarmapi "github.com/docker/swarmkit/api" |
| 10 | 10 |
google_protobuf3 "github.com/gogo/protobuf/types" |
| 11 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 11 |
+ "gotest.tools/assert" |
|
| 12 | 12 |
) |
| 13 | 13 |
|
| 14 | 14 |
func TestServiceConvertFromGRPCRuntimeContainer(t *testing.T) {
|
| ... | ... |
@@ -8,11 +8,11 @@ import ( |
| 8 | 8 |
|
| 9 | 9 |
"github.com/docker/docker/daemon/discovery" |
| 10 | 10 |
"github.com/docker/docker/opts" |
| 11 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 12 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 13 |
- "github.com/gotestyourself/gotestyourself/fs" |
|
| 14 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 15 | 11 |
"github.com/spf13/pflag" |
| 12 |
+ "gotest.tools/assert" |
|
| 13 |
+ is "gotest.tools/assert/cmp" |
|
| 14 |
+ "gotest.tools/fs" |
|
| 15 |
+ "gotest.tools/skip" |
|
| 16 | 16 |
) |
| 17 | 17 |
|
| 18 | 18 |
func TestDaemonConfigurationNotFound(t *testing.T) {
|
| ... | ... |
@@ -461,7 +461,7 @@ func TestReloadSetConfigFileNotExist(t *testing.T) {
|
| 461 | 461 |
// TestReloadDefaultConfigNotExist tests that if the default configuration file |
| 462 | 462 |
// doesn't exist the daemon still will be reloaded. |
| 463 | 463 |
func TestReloadDefaultConfigNotExist(t *testing.T) {
|
| 464 |
- skip.IfCondition(t, os.Getuid() != 0, "skipping test that requires root") |
|
| 464 |
+ skip.If(t, os.Getuid() != 0, "skipping test that requires root") |
|
| 465 | 465 |
reloaded := false |
| 466 | 466 |
configFile := "/etc/docker/daemon.json" |
| 467 | 467 |
flags := pflag.NewFlagSet("test", pflag.ContinueOnError)
|
| ... | ... |
@@ -7,10 +7,10 @@ import ( |
| 7 | 7 |
|
| 8 | 8 |
"github.com/docker/docker/opts" |
| 9 | 9 |
"github.com/docker/go-units" |
| 10 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 11 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 12 |
- "github.com/gotestyourself/gotestyourself/fs" |
|
| 13 | 10 |
"github.com/spf13/pflag" |
| 11 |
+ "gotest.tools/assert" |
|
| 12 |
+ is "gotest.tools/assert/cmp" |
|
| 13 |
+ "gotest.tools/fs" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
func TestGetConflictFreeConfiguration(t *testing.T) {
|
| ... | ... |
@@ -7,9 +7,9 @@ import ( |
| 7 | 7 |
"testing" |
| 8 | 8 |
|
| 9 | 9 |
"github.com/docker/docker/opts" |
| 10 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 11 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 12 | 10 |
"github.com/spf13/pflag" |
| 11 |
+ "gotest.tools/assert" |
|
| 12 |
+ is "gotest.tools/assert/cmp" |
|
| 13 | 13 |
) |
| 14 | 14 |
|
| 15 | 15 |
func TestDaemonConfigurationMerge(t *testing.T) {
|
| ... | ... |
@@ -9,7 +9,7 @@ import ( |
| 9 | 9 |
containertypes "github.com/docker/docker/api/types/container" |
| 10 | 10 |
"github.com/docker/docker/daemon/config" |
| 11 | 11 |
"github.com/docker/go-connections/nat" |
| 12 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 12 |
+ "gotest.tools/assert" |
|
| 13 | 13 |
) |
| 14 | 14 |
|
| 15 | 15 |
// TestContainerWarningHostAndPublishPorts that a warning is returned when setting network mode to host and specifying published ports. |
| ... | ... |
@@ -15,8 +15,8 @@ import ( |
| 15 | 15 |
"github.com/docker/docker/oci" |
| 16 | 16 |
"github.com/docker/docker/pkg/idtools" |
| 17 | 17 |
"github.com/docker/docker/pkg/mount" |
| 18 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 19 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 18 |
+ "gotest.tools/assert" |
|
| 19 |
+ is "gotest.tools/assert/cmp" |
|
| 20 | 20 |
) |
| 21 | 21 |
|
| 22 | 22 |
const mountsFixture = `142 78 0:38 / / rw,relatime - aufs none rw,si=573b861da0b3a05b,dio |
| ... | ... |
@@ -16,9 +16,9 @@ import ( |
| 16 | 16 |
volumesservice "github.com/docker/docker/volume/service" |
| 17 | 17 |
"github.com/docker/go-connections/nat" |
| 18 | 18 |
"github.com/docker/libnetwork" |
| 19 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 20 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 21 | 19 |
"github.com/pkg/errors" |
| 20 |
+ "gotest.tools/assert" |
|
| 21 |
+ is "gotest.tools/assert/cmp" |
|
| 22 | 22 |
) |
| 23 | 23 |
|
| 24 | 24 |
// |
| ... | ... |
@@ -9,8 +9,8 @@ import ( |
| 9 | 9 |
"github.com/docker/docker/api/types" |
| 10 | 10 |
containertypes "github.com/docker/docker/api/types/container" |
| 11 | 11 |
"github.com/docker/docker/container" |
| 12 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 13 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 12 |
+ "gotest.tools/assert" |
|
| 13 |
+ is "gotest.tools/assert/cmp" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
func newDaemonWithTmpRoot(t *testing.T) (*Daemon, func()) {
|
| ... | ... |
@@ -5,8 +5,8 @@ import ( |
| 5 | 5 |
"testing" |
| 6 | 6 |
"time" |
| 7 | 7 |
|
| 8 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 9 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 8 |
+ "gotest.tools/assert" |
|
| 9 |
+ is "gotest.tools/assert/cmp" |
|
| 10 | 10 |
) |
| 11 | 11 |
|
| 12 | 12 |
func TestDiscoveryOptsErrors(t *testing.T) {
|
| ... | ... |
@@ -8,9 +8,9 @@ import ( |
| 8 | 8 |
containertypes "github.com/docker/docker/api/types/container" |
| 9 | 9 |
"github.com/docker/docker/container" |
| 10 | 10 |
"github.com/docker/docker/daemon/exec" |
| 11 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 12 | 11 |
"github.com/opencontainers/runc/libcontainer/apparmor" |
| 13 | 12 |
"github.com/opencontainers/runtime-spec/specs-go" |
| 13 |
+ "gotest.tools/assert" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
func TestExecSetPlatformOpt(t *testing.T) {
|
| ... | ... |
@@ -17,8 +17,8 @@ import ( |
| 17 | 17 |
"github.com/docker/docker/pkg/archive" |
| 18 | 18 |
"github.com/docker/docker/pkg/reexec" |
| 19 | 19 |
"github.com/docker/docker/pkg/stringid" |
| 20 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 21 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 20 |
+ "gotest.tools/assert" |
|
| 21 |
+ is "gotest.tools/assert/cmp" |
|
| 22 | 22 |
) |
| 23 | 23 |
|
| 24 | 24 |
var ( |
| ... | ... |
@@ -13,9 +13,9 @@ import ( |
| 13 | 13 |
"time" |
| 14 | 14 |
|
| 15 | 15 |
"github.com/docker/docker/pkg/system" |
| 16 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 17 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 18 | 16 |
"golang.org/x/sys/unix" |
| 17 |
+ "gotest.tools/assert" |
|
| 18 |
+ is "gotest.tools/assert/cmp" |
|
| 19 | 19 |
) |
| 20 | 20 |
|
| 21 | 21 |
func TestCopy(t *testing.T) {
|
| ... | ... |
@@ -16,9 +16,9 @@ import ( |
| 16 | 16 |
"github.com/docker/docker/daemon/graphdriver/quota" |
| 17 | 17 |
"github.com/docker/docker/pkg/stringid" |
| 18 | 18 |
"github.com/docker/go-units" |
| 19 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 20 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 21 | 19 |
"golang.org/x/sys/unix" |
| 20 |
+ "gotest.tools/assert" |
|
| 21 |
+ is "gotest.tools/assert/cmp" |
|
| 22 | 22 |
) |
| 23 | 23 |
|
| 24 | 24 |
var ( |
| ... | ... |
@@ -9,9 +9,9 @@ import ( |
| 9 | 9 |
|
| 10 | 10 |
contdriver "github.com/containerd/continuity/driver" |
| 11 | 11 |
"github.com/docker/docker/daemon/graphdriver" |
| 12 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 13 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 14 | 12 |
"golang.org/x/sys/unix" |
| 13 |
+ "gotest.tools/assert" |
|
| 14 |
+ is "gotest.tools/assert/cmp" |
|
| 15 | 15 |
) |
| 16 | 16 |
|
| 17 | 17 |
func verifyFile(t testing.TB, path string, mode os.FileMode, uid, gid uint32) {
|
| ... | ... |
@@ -10,10 +10,10 @@ import ( |
| 10 | 10 |
"path/filepath" |
| 11 | 11 |
"testing" |
| 12 | 12 |
|
| 13 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 15 |
- "github.com/gotestyourself/gotestyourself/fs" |
|
| 16 | 13 |
"golang.org/x/sys/unix" |
| 14 |
+ "gotest.tools/assert" |
|
| 15 |
+ is "gotest.tools/assert/cmp" |
|
| 16 |
+ "gotest.tools/fs" |
|
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 | 19 |
// 10MB |
| ... | ... |
@@ -7,8 +7,8 @@ import ( |
| 7 | 7 |
|
| 8 | 8 |
"github.com/docker/docker/api/types" |
| 9 | 9 |
"github.com/docker/docker/dockerversion" |
| 10 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 11 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 10 |
+ "gotest.tools/assert" |
|
| 11 |
+ is "gotest.tools/assert/cmp" |
|
| 12 | 12 |
) |
| 13 | 13 |
|
| 14 | 14 |
func TestParseInitVersion(t *testing.T) {
|
| ... | ... |
@@ -7,8 +7,8 @@ import ( |
| 7 | 7 |
"github.com/docker/docker/container" |
| 8 | 8 |
"github.com/docker/docker/daemon/config" |
| 9 | 9 |
"github.com/docker/docker/daemon/exec" |
| 10 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 11 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 10 |
+ "gotest.tools/assert" |
|
| 11 |
+ is "gotest.tools/assert/cmp" |
|
| 12 | 12 |
) |
| 13 | 13 |
|
| 14 | 14 |
func TestGetInspectData(t *testing.T) {
|
| ... | ... |
@@ -6,8 +6,8 @@ import ( |
| 6 | 6 |
"github.com/docker/docker/api/types" |
| 7 | 7 |
"github.com/docker/docker/api/types/filters" |
| 8 | 8 |
"github.com/docker/docker/container" |
| 9 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 10 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 9 |
+ "gotest.tools/assert" |
|
| 10 |
+ is "gotest.tools/assert/cmp" |
|
| 11 | 11 |
) |
| 12 | 12 |
|
| 13 | 13 |
func TestListInvalidFilter(t *testing.T) {
|
| ... | ... |
@@ -9,8 +9,8 @@ import ( |
| 9 | 9 |
|
| 10 | 10 |
"github.com/docker/docker/api/types/plugins/logdriver" |
| 11 | 11 |
protoio "github.com/gogo/protobuf/io" |
| 12 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 13 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 12 |
+ "gotest.tools/assert" |
|
| 13 |
+ is "gotest.tools/assert/cmp" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
// mockLoggingPlugin implements the loggingPlugin interface for testing purposes |
| ... | ... |
@@ -21,8 +21,8 @@ import ( |
| 21 | 21 |
"github.com/docker/docker/daemon/logger" |
| 22 | 22 |
"github.com/docker/docker/daemon/logger/loggerutils" |
| 23 | 23 |
"github.com/docker/docker/dockerversion" |
| 24 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 25 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 24 |
+ "gotest.tools/assert" |
|
| 25 |
+ is "gotest.tools/assert/cmp" |
|
| 26 | 26 |
) |
| 27 | 27 |
|
| 28 | 28 |
const ( |
| ... | ... |
@@ -14,9 +14,9 @@ import ( |
| 14 | 14 |
|
| 15 | 15 |
"github.com/docker/docker/daemon/logger" |
| 16 | 16 |
"github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog" |
| 17 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 18 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 19 |
- "github.com/gotestyourself/gotestyourself/fs" |
|
| 17 |
+ "gotest.tools/assert" |
|
| 18 |
+ is "gotest.tools/assert/cmp" |
|
| 19 |
+ "gotest.tools/fs" |
|
| 20 | 20 |
) |
| 21 | 21 |
|
| 22 | 22 |
func TestJSONFileLogger(t *testing.T) {
|
| ... | ... |
@@ -4,8 +4,8 @@ import ( |
| 4 | 4 |
"testing" |
| 5 | 5 |
"time" |
| 6 | 6 |
|
| 7 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 8 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 7 |
+ "gotest.tools/assert" |
|
| 8 |
+ is "gotest.tools/assert/cmp" |
|
| 9 | 9 |
) |
| 10 | 10 |
|
| 11 | 11 |
func TestFastTimeMarshalJSONWithInvalidYear(t *testing.T) {
|
| ... | ... |
@@ -6,8 +6,8 @@ import ( |
| 6 | 6 |
"time" |
| 7 | 7 |
|
| 8 | 8 |
"github.com/docker/docker/daemon/logger" |
| 9 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 10 |
- "github.com/gotestyourself/gotestyourself/fs" |
|
| 9 |
+ "gotest.tools/assert" |
|
| 10 |
+ "gotest.tools/fs" |
|
| 11 | 11 |
) |
| 12 | 12 |
|
| 13 | 13 |
func BenchmarkJSONFileLoggerReadLogs(b *testing.B) {
|
| ... | ... |
@@ -9,8 +9,8 @@ import ( |
| 9 | 9 |
"github.com/docker/docker/daemon/config" |
| 10 | 10 |
"github.com/docker/docker/oci" |
| 11 | 11 |
"github.com/docker/docker/pkg/idtools" |
| 12 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 13 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 12 |
+ "gotest.tools/assert" |
|
| 13 |
+ is "gotest.tools/assert/cmp" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
// TestTmpfsDevShmNoDupMount checks that a user-specified /dev/shm tmpfs |
| ... | ... |
@@ -13,8 +13,8 @@ import ( |
| 13 | 13 |
_ "github.com/docker/docker/pkg/discovery/memory" |
| 14 | 14 |
"github.com/docker/docker/registry" |
| 15 | 15 |
"github.com/docker/libnetwork" |
| 16 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 17 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 16 |
+ "gotest.tools/assert" |
|
| 17 |
+ is "gotest.tools/assert/cmp" |
|
| 18 | 18 |
) |
| 19 | 19 |
|
| 20 | 20 |
func TestDaemonReloadLabels(t *testing.T) {
|
| ... | ... |
@@ -8,7 +8,7 @@ import ( |
| 8 | 8 |
|
| 9 | 9 |
"github.com/docker/docker/container" |
| 10 | 10 |
"github.com/docker/docker/daemon/exec" |
| 11 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 11 |
+ "gotest.tools/assert" |
|
| 12 | 12 |
) |
| 13 | 13 |
|
| 14 | 14 |
// This test simply verify that when a wrong ID used, a specific error should be returned for exec resize. |
| ... | ... |
@@ -6,9 +6,9 @@ import ( |
| 6 | 6 |
"path/filepath" |
| 7 | 7 |
"testing" |
| 8 | 8 |
|
| 9 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 10 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 11 |
- "github.com/gotestyourself/gotestyourself/fs" |
|
| 9 |
+ "gotest.tools/assert" |
|
| 10 |
+ is "gotest.tools/assert/cmp" |
|
| 11 |
+ "gotest.tools/fs" |
|
| 12 | 12 |
) |
| 13 | 13 |
|
| 14 | 14 |
// LoadOrCreateTrustKey |
| ... | ... |
@@ -10,9 +10,9 @@ import ( |
| 10 | 10 |
|
| 11 | 11 |
"github.com/docker/distribution/manifest/schema1" |
| 12 | 12 |
"github.com/docker/distribution/reference" |
| 13 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 15 | 13 |
"github.com/opencontainers/go-digest" |
| 14 |
+ "gotest.tools/assert" |
|
| 15 |
+ is "gotest.tools/assert/cmp" |
|
| 16 | 16 |
) |
| 17 | 17 |
|
| 18 | 18 |
// TestFixManifestLayers checks that fixManifestLayers removes a duplicate |
| ... | ... |
@@ -10,9 +10,9 @@ import ( |
| 10 | 10 |
"path/filepath" |
| 11 | 11 |
"testing" |
| 12 | 12 |
|
| 13 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 15 | 13 |
"github.com/opencontainers/go-digest" |
| 14 |
+ "gotest.tools/assert" |
|
| 15 |
+ is "gotest.tools/assert/cmp" |
|
| 16 | 16 |
) |
| 17 | 17 |
|
| 18 | 18 |
func defaultFSStoreBackend(t *testing.T) (StoreBackend, func()) {
|
| ... | ... |
@@ -10,8 +10,8 @@ import ( |
| 10 | 10 |
"github.com/docker/docker/api/types/container" |
| 11 | 11 |
"github.com/docker/docker/layer" |
| 12 | 12 |
"github.com/google/go-cmp/cmp" |
| 13 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 13 |
+ "gotest.tools/assert" |
|
| 14 |
+ is "gotest.tools/assert/cmp" |
|
| 15 | 15 |
) |
| 16 | 16 |
|
| 17 | 17 |
const sampleImageJSON = `{
|
| ... | ... |
@@ -6,9 +6,9 @@ import ( |
| 6 | 6 |
"testing" |
| 7 | 7 |
|
| 8 | 8 |
"github.com/docker/docker/layer" |
| 9 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 10 |
- "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 11 | 9 |
"github.com/opencontainers/go-digest" |
| 10 |
+ "gotest.tools/assert" |
|
| 11 |
+ "gotest.tools/assert/cmp" |
|
| 12 | 12 |
) |
| 13 | 13 |
|
| 14 | 14 |
func TestRestore(t *testing.T) {
|
| ... | ... |
@@ -8,9 +8,9 @@ import ( |
| 8 | 8 |
|
| 9 | 9 |
"github.com/docker/docker/integration-cli/daemon" |
| 10 | 10 |
"github.com/docker/docker/integration-cli/environment" |
| 11 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 12 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 13 | 11 |
"github.com/pkg/errors" |
| 12 |
+ "gotest.tools/assert" |
|
| 13 |
+ "gotest.tools/icmd" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
var testEnv *environment.Execution |
| ... | ... |
@@ -8,9 +8,9 @@ import ( |
| 8 | 8 |
"github.com/docker/docker/integration-cli/checker" |
| 9 | 9 |
"github.com/docker/docker/internal/test/daemon" |
| 10 | 10 |
"github.com/go-check/check" |
| 11 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 12 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 13 | 11 |
"github.com/pkg/errors" |
| 12 |
+ "gotest.tools/assert" |
|
| 13 |
+ "gotest.tools/icmd" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
type testingT interface {
|
| ... | ... |
@@ -11,7 +11,7 @@ import ( |
| 11 | 11 |
"github.com/docker/docker/client" |
| 12 | 12 |
"github.com/docker/docker/integration-cli/checker" |
| 13 | 13 |
"github.com/go-check/check" |
| 14 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
+ "gotest.tools/assert" |
|
| 15 | 15 |
) |
| 16 | 16 |
|
| 17 | 17 |
// CheckServiceTasksInState returns the number of tasks with a matching state, |
| ... | ... |
@@ -19,8 +19,8 @@ import ( |
| 19 | 19 |
"github.com/docker/docker/internal/test/fakestorage" |
| 20 | 20 |
"github.com/docker/docker/internal/test/request" |
| 21 | 21 |
"github.com/go-check/check" |
| 22 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 23 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 22 |
+ "gotest.tools/assert" |
|
| 23 |
+ is "gotest.tools/assert/cmp" |
|
| 24 | 24 |
) |
| 25 | 25 |
|
| 26 | 26 |
func (s *DockerSuite) TestBuildAPIDockerFileRemote(c *check.C) {
|
| ... | ... |
@@ -9,8 +9,8 @@ import ( |
| 9 | 9 |
"github.com/docker/docker/internal/test/fakecontext" |
| 10 | 10 |
"github.com/docker/docker/internal/test/request" |
| 11 | 11 |
"github.com/go-check/check" |
| 12 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 13 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 12 |
+ "gotest.tools/assert" |
|
| 13 |
+ is "gotest.tools/assert/cmp" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
func (s *DockerSuite) TestBuildWithRecycleBin(c *check.C) {
|
| ... | ... |
@@ -33,9 +33,9 @@ import ( |
| 33 | 33 |
"github.com/docker/docker/volume" |
| 34 | 34 |
"github.com/docker/go-connections/nat" |
| 35 | 35 |
"github.com/go-check/check" |
| 36 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 37 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 38 |
- "github.com/gotestyourself/gotestyourself/poll" |
|
| 36 |
+ "gotest.tools/assert" |
|
| 37 |
+ is "gotest.tools/assert/cmp" |
|
| 38 |
+ "gotest.tools/poll" |
|
| 39 | 39 |
) |
| 40 | 40 |
|
| 41 | 41 |
func (s *DockerSuite) TestContainerAPIGetAll(c *check.C) {
|
| ... | ... |
@@ -14,8 +14,8 @@ import ( |
| 14 | 14 |
"github.com/docker/docker/api/types/container" |
| 15 | 15 |
"github.com/docker/docker/api/types/mount" |
| 16 | 16 |
"github.com/go-check/check" |
| 17 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 18 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 17 |
+ "gotest.tools/assert" |
|
| 18 |
+ is "gotest.tools/assert/cmp" |
|
| 19 | 19 |
) |
| 20 | 20 |
|
| 21 | 21 |
func (s *DockerSuite) TestContainersAPICreateMountsBindNamedPipe(c *check.C) {
|
| ... | ... |
@@ -10,8 +10,8 @@ import ( |
| 10 | 10 |
"github.com/docker/docker/client" |
| 11 | 11 |
"github.com/docker/docker/integration-cli/checker" |
| 12 | 12 |
"github.com/go-check/check" |
| 13 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 13 |
+ "gotest.tools/assert" |
|
| 14 |
+ is "gotest.tools/assert/cmp" |
|
| 15 | 15 |
) |
| 16 | 16 |
|
| 17 | 17 |
func (s *DockerSuite) TestInspectAPIContainerResponse(c *check.C) {
|
| ... | ... |
@@ -17,8 +17,8 @@ import ( |
| 17 | 17 |
"github.com/docker/docker/integration-cli/daemon" |
| 18 | 18 |
testdaemon "github.com/docker/docker/internal/test/daemon" |
| 19 | 19 |
"github.com/go-check/check" |
| 20 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 21 | 20 |
"golang.org/x/sys/unix" |
| 21 |
+ "gotest.tools/icmd" |
|
| 22 | 22 |
) |
| 23 | 23 |
|
| 24 | 24 |
func setPortConfig(portConfig []swarm.PortConfig) testdaemon.ServiceConstructor {
|
| ... | ... |
@@ -26,8 +26,8 @@ import ( |
| 26 | 26 |
"github.com/docker/docker/internal/test/request" |
| 27 | 27 |
"github.com/docker/swarmkit/ca" |
| 28 | 28 |
"github.com/go-check/check" |
| 29 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 30 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 29 |
+ "gotest.tools/assert" |
|
| 30 |
+ is "gotest.tools/assert/cmp" |
|
| 31 | 31 |
) |
| 32 | 32 |
|
| 33 | 33 |
var defaultReconciliationTimeout = 30 * time.Second |
| ... | ... |
@@ -16,7 +16,6 @@ import ( |
| 16 | 16 |
"text/template" |
| 17 | 17 |
"time" |
| 18 | 18 |
|
| 19 |
- "github.com/moby/buildkit/frontend/dockerfile/command" |
|
| 20 | 19 |
"github.com/docker/docker/integration-cli/checker" |
| 21 | 20 |
"github.com/docker/docker/integration-cli/cli" |
| 22 | 21 |
"github.com/docker/docker/integration-cli/cli/build" |
| ... | ... |
@@ -26,8 +25,9 @@ import ( |
| 26 | 26 |
"github.com/docker/docker/internal/testutil" |
| 27 | 27 |
"github.com/docker/docker/pkg/archive" |
| 28 | 28 |
"github.com/go-check/check" |
| 29 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 29 |
+ "github.com/moby/buildkit/frontend/dockerfile/command" |
|
| 30 | 30 |
"github.com/opencontainers/go-digest" |
| 31 |
+ "gotest.tools/icmd" |
|
| 31 | 32 |
) |
| 32 | 33 |
|
| 33 | 34 |
func (s *DockerSuite) TestBuildJSONEmptyRun(c *check.C) {
|
| ... | ... |
@@ -21,7 +21,7 @@ import ( |
| 21 | 21 |
"github.com/docker/docker/internal/test/fakecontext" |
| 22 | 22 |
"github.com/docker/go-units" |
| 23 | 23 |
"github.com/go-check/check" |
| 24 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 24 |
+ "gotest.tools/icmd" |
|
| 25 | 25 |
) |
| 26 | 26 |
|
| 27 | 27 |
func (s *DockerSuite) TestBuildResourceConstraintsAreUsed(c *check.C) {
|
| ... | ... |
@@ -15,9 +15,9 @@ import ( |
| 15 | 15 |
"github.com/docker/docker/integration-cli/cli" |
| 16 | 16 |
"github.com/docker/docker/integration-cli/cli/build" |
| 17 | 17 |
"github.com/go-check/check" |
| 18 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 19 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 20 | 18 |
"github.com/opencontainers/go-digest" |
| 19 |
+ "gotest.tools/assert" |
|
| 20 |
+ is "gotest.tools/assert/cmp" |
|
| 21 | 21 |
) |
| 22 | 22 |
|
| 23 | 23 |
var ( |
| ... | ... |
@@ -8,8 +8,8 @@ import ( |
| 8 | 8 |
"github.com/docker/docker/integration-cli/checker" |
| 9 | 9 |
"github.com/docker/docker/pkg/mount" |
| 10 | 10 |
"github.com/go-check/check" |
| 11 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 12 | 11 |
"golang.org/x/sys/unix" |
| 12 |
+ "gotest.tools/icmd" |
|
| 13 | 13 |
) |
| 14 | 14 |
|
| 15 | 15 |
// TestDaemonRestartWithPluginEnabled tests state restore for an enabled plugin |
| ... | ... |
@@ -39,9 +39,9 @@ import ( |
| 39 | 39 |
"github.com/docker/libnetwork/iptables" |
| 40 | 40 |
"github.com/docker/libtrust" |
| 41 | 41 |
"github.com/go-check/check" |
| 42 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 43 | 42 |
"github.com/kr/pty" |
| 44 | 43 |
"golang.org/x/sys/unix" |
| 44 |
+ "gotest.tools/icmd" |
|
| 45 | 45 |
) |
| 46 | 46 |
|
| 47 | 47 |
// TestLegacyDaemonCommand test starting docker daemon using "deprecated" docker daemon |
| ... | ... |
@@ -20,7 +20,7 @@ import ( |
| 20 | 20 |
"github.com/docker/docker/integration-cli/cli" |
| 21 | 21 |
"github.com/docker/docker/integration-cli/cli/build" |
| 22 | 22 |
"github.com/go-check/check" |
| 23 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 23 |
+ "gotest.tools/icmd" |
|
| 24 | 24 |
) |
| 25 | 25 |
|
| 26 | 26 |
func (s *DockerSuite) TestEventsTimestampFormats(c *check.C) {
|
| ... | ... |
@@ -20,7 +20,7 @@ import ( |
| 20 | 20 |
"github.com/docker/docker/integration-cli/cli" |
| 21 | 21 |
"github.com/docker/docker/integration-cli/cli/build" |
| 22 | 22 |
"github.com/go-check/check" |
| 23 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 23 |
+ "gotest.tools/icmd" |
|
| 24 | 24 |
) |
| 25 | 25 |
|
| 26 | 26 |
func (s *DockerSuite) TestExec(c *check.C) {
|
| ... | ... |
@@ -14,7 +14,7 @@ import ( |
| 14 | 14 |
"github.com/docker/docker/integration-cli/cli/build" |
| 15 | 15 |
"github.com/docker/docker/pkg/stringid" |
| 16 | 16 |
"github.com/go-check/check" |
| 17 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 17 |
+ "gotest.tools/icmd" |
|
| 18 | 18 |
) |
| 19 | 19 |
|
| 20 | 20 |
func (s *DockerSuite) TestImagesEnsureImageIsListed(c *check.C) {
|
| ... | ... |
@@ -12,7 +12,7 @@ import ( |
| 12 | 12 |
"github.com/docker/docker/integration-cli/checker" |
| 13 | 13 |
"github.com/docker/docker/integration-cli/cli" |
| 14 | 14 |
"github.com/go-check/check" |
| 15 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 15 |
+ "gotest.tools/icmd" |
|
| 16 | 16 |
) |
| 17 | 17 |
|
| 18 | 18 |
func (s *DockerSuite) TestImportDisplay(c *check.C) {
|
| ... | ... |
@@ -12,7 +12,7 @@ import ( |
| 12 | 12 |
"github.com/docker/docker/api/types/container" |
| 13 | 13 |
"github.com/docker/docker/integration-cli/checker" |
| 14 | 14 |
"github.com/go-check/check" |
| 15 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 15 |
+ "gotest.tools/icmd" |
|
| 16 | 16 |
) |
| 17 | 17 |
|
| 18 | 18 |
func checkValidGraphDriver(c *check.C, name string) {
|
| ... | ... |
@@ -12,7 +12,7 @@ import ( |
| 12 | 12 |
"github.com/docker/docker/integration-cli/cli" |
| 13 | 13 |
"github.com/docker/docker/pkg/jsonmessage" |
| 14 | 14 |
"github.com/go-check/check" |
| 15 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 15 |
+ "gotest.tools/icmd" |
|
| 16 | 16 |
) |
| 17 | 17 |
|
| 18 | 18 |
// This used to work, it test a log of PageSize-1 (gh#4851) |
| ... | ... |
@@ -27,9 +27,9 @@ import ( |
| 27 | 27 |
remoteipam "github.com/docker/libnetwork/ipams/remote/api" |
| 28 | 28 |
"github.com/docker/libnetwork/netlabel" |
| 29 | 29 |
"github.com/go-check/check" |
| 30 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 31 | 30 |
"github.com/vishvananda/netlink" |
| 32 | 31 |
"golang.org/x/sys/unix" |
| 32 |
+ "gotest.tools/icmd" |
|
| 33 | 33 |
) |
| 34 | 34 |
|
| 35 | 35 |
const dummyNetworkDriver = "dummy-network-driver" |
| ... | ... |
@@ -15,7 +15,7 @@ import ( |
| 15 | 15 |
"github.com/docker/docker/integration-cli/cli/build" |
| 16 | 16 |
"github.com/docker/docker/integration-cli/daemon" |
| 17 | 17 |
"github.com/go-check/check" |
| 18 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 18 |
+ "gotest.tools/icmd" |
|
| 19 | 19 |
) |
| 20 | 20 |
|
| 21 | 21 |
func pruneNetworkAndVerify(c *check.C, d *daemon.Daemon, kept, pruned []string) {
|
| ... | ... |
@@ -13,7 +13,7 @@ import ( |
| 13 | 13 |
"github.com/docker/docker/integration-cli/cli/build" |
| 14 | 14 |
"github.com/docker/docker/pkg/stringid" |
| 15 | 15 |
"github.com/go-check/check" |
| 16 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 16 |
+ "gotest.tools/icmd" |
|
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 | 19 |
func (s *DockerSuite) TestPsListContainersBase(c *check.C) {
|
| ... | ... |
@@ -16,8 +16,8 @@ import ( |
| 16 | 16 |
"github.com/docker/docker/integration-cli/checker" |
| 17 | 17 |
"github.com/docker/docker/integration-cli/cli/build" |
| 18 | 18 |
"github.com/go-check/check" |
| 19 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 20 | 19 |
"github.com/opencontainers/go-digest" |
| 20 |
+ "gotest.tools/icmd" |
|
| 21 | 21 |
) |
| 22 | 22 |
|
| 23 | 23 |
// testPullImageWithAliases pulls a specific image tag and verifies that any aliases (i.e., other |
| ... | ... |
@@ -14,7 +14,7 @@ import ( |
| 14 | 14 |
"github.com/docker/docker/integration-cli/checker" |
| 15 | 15 |
"github.com/docker/docker/integration-cli/cli/build" |
| 16 | 16 |
"github.com/go-check/check" |
| 17 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 17 |
+ "gotest.tools/icmd" |
|
| 18 | 18 |
) |
| 19 | 19 |
|
| 20 | 20 |
// Pushing an image to a private registry. |
| ... | ... |
@@ -10,7 +10,7 @@ import ( |
| 10 | 10 |
"github.com/docker/docker/integration-cli/cli/build" |
| 11 | 11 |
"github.com/docker/docker/pkg/stringid" |
| 12 | 12 |
"github.com/go-check/check" |
| 13 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 13 |
+ "gotest.tools/icmd" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
func (s *DockerSuite) TestRmiWithContainerFails(c *check.C) {
|
| ... | ... |
@@ -36,7 +36,7 @@ import ( |
| 36 | 36 |
"github.com/docker/libnetwork/resolvconf" |
| 37 | 37 |
"github.com/docker/libnetwork/types" |
| 38 | 38 |
"github.com/go-check/check" |
| 39 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 39 |
+ "gotest.tools/icmd" |
|
| 40 | 40 |
) |
| 41 | 41 |
|
| 42 | 42 |
// "test123" should be printed by docker run |
| ... | ... |
@@ -18,8 +18,8 @@ import ( |
| 18 | 18 |
"github.com/docker/docker/integration-cli/checker" |
| 19 | 19 |
"github.com/docker/docker/integration-cli/cli/build" |
| 20 | 20 |
"github.com/go-check/check" |
| 21 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 22 | 21 |
"github.com/opencontainers/go-digest" |
| 22 |
+ "gotest.tools/icmd" |
|
| 23 | 23 |
) |
| 24 | 24 |
|
| 25 | 25 |
// save a repo using gz compression and try to load it using stdout |
| ... | ... |
@@ -14,8 +14,8 @@ import ( |
| 14 | 14 |
"github.com/docker/docker/integration-cli/checker" |
| 15 | 15 |
"github.com/docker/docker/integration-cli/cli/build" |
| 16 | 16 |
"github.com/go-check/check" |
| 17 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 18 | 17 |
"github.com/kr/pty" |
| 18 |
+ "gotest.tools/icmd" |
|
| 19 | 19 |
) |
| 20 | 20 |
|
| 21 | 21 |
// save a repo and try to load it using stdout |
| ... | ... |
@@ -12,7 +12,7 @@ import ( |
| 12 | 12 |
"github.com/docker/docker/integration-cli/cli" |
| 13 | 13 |
"github.com/docker/docker/integration-cli/cli/build" |
| 14 | 14 |
"github.com/go-check/check" |
| 15 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 15 |
+ "gotest.tools/icmd" |
|
| 16 | 16 |
) |
| 17 | 17 |
|
| 18 | 18 |
// start a service, and then make its task unhealthy during running |
| ... | ... |
@@ -13,7 +13,7 @@ import ( |
| 13 | 13 |
"github.com/docker/docker/integration-cli/checker" |
| 14 | 14 |
"github.com/docker/docker/integration-cli/daemon" |
| 15 | 15 |
"github.com/go-check/check" |
| 16 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 16 |
+ "gotest.tools/icmd" |
|
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 | 19 |
type logMessage struct {
|
| ... | ... |
@@ -8,7 +8,7 @@ import ( |
| 8 | 8 |
"github.com/docker/docker/integration-cli/checker" |
| 9 | 9 |
"github.com/docker/docker/integration-cli/cli" |
| 10 | 10 |
"github.com/go-check/check" |
| 11 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 11 |
+ "gotest.tools/icmd" |
|
| 12 | 12 |
) |
| 13 | 13 |
|
| 14 | 14 |
// Regression test for https://github.com/docker/docker/issues/7843 |
| ... | ... |
@@ -27,9 +27,9 @@ import ( |
| 27 | 27 |
remoteipam "github.com/docker/libnetwork/ipams/remote/api" |
| 28 | 28 |
"github.com/docker/swarmkit/ca/keyutils" |
| 29 | 29 |
"github.com/go-check/check" |
| 30 |
- "github.com/gotestyourself/gotestyourself/fs" |
|
| 31 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 32 | 30 |
"github.com/vishvananda/netlink" |
| 31 |
+ "gotest.tools/fs" |
|
| 32 |
+ "gotest.tools/icmd" |
|
| 33 | 33 |
) |
| 34 | 34 |
|
| 35 | 35 |
func (s *DockerSwarmSuite) TestSwarmUpdate(c *check.C) {
|
| ... | ... |
@@ -16,7 +16,7 @@ import ( |
| 16 | 16 |
"github.com/docker/docker/integration-cli/checker" |
| 17 | 17 |
"github.com/docker/docker/integration-cli/cli/build" |
| 18 | 18 |
"github.com/go-check/check" |
| 19 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 19 |
+ "gotest.tools/icmd" |
|
| 20 | 20 |
) |
| 21 | 21 |
|
| 22 | 22 |
func (s *DockerSuite) TestVolumeCLICreate(c *check.C) {
|
| ... | ... |
@@ -60,7 +60,7 @@ func OnlyDefaultNetworks() bool {
|
| 60 | 60 |
return true |
| 61 | 61 |
} |
| 62 | 62 |
|
| 63 |
-// Deprecated: use skip.IfCondition(t, !testEnv.DaemonInfo.ExperimentalBuild) |
|
| 63 |
+// Deprecated: use skip.If(t, !testEnv.DaemonInfo.ExperimentalBuild) |
|
| 64 | 64 |
func ExperimentalDaemon() bool {
|
| 65 | 65 |
return testEnv.DaemonInfo.ExperimentalBuild |
| 66 | 66 |
} |
| ... | ... |
@@ -9,8 +9,8 @@ import ( |
| 9 | 9 |
|
| 10 | 10 |
"github.com/docker/docker/internal/testutil" |
| 11 | 11 |
"github.com/go-check/check" |
| 12 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 13 | 12 |
"github.com/pkg/errors" |
| 13 |
+ "gotest.tools/icmd" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
func getPrefixAndSlashFromDaemonPlatform() (prefix, slash string) {
|
| ... | ... |
@@ -21,7 +21,7 @@ func getPrefixAndSlashFromDaemonPlatform() (prefix, slash string) {
|
| 21 | 21 |
} |
| 22 | 22 |
|
| 23 | 23 |
// TODO: update code to call cmd.RunCmd directly, and remove this function |
| 24 |
-// Deprecated: use gotestyourself/gotestyourself/icmd |
|
| 24 |
+// Deprecated: use gotest.tools/icmd |
|
| 25 | 25 |
func runCommandWithOutput(execCmd *exec.Cmd) (string, int, error) {
|
| 26 | 26 |
result := icmd.RunCmd(transformCmd(execCmd)) |
| 27 | 27 |
return result.Combined(), result.ExitCode, result.Error |
| ... | ... |
@@ -10,12 +10,12 @@ import ( |
| 10 | 10 |
dclient "github.com/docker/docker/client" |
| 11 | 11 |
"github.com/docker/docker/internal/test/fakecontext" |
| 12 | 12 |
"github.com/docker/docker/internal/test/request" |
| 13 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 15 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 16 | 13 |
"github.com/moby/buildkit/session" |
| 17 | 14 |
"github.com/moby/buildkit/session/filesync" |
| 18 | 15 |
"golang.org/x/sync/errgroup" |
| 16 |
+ "gotest.tools/assert" |
|
| 17 |
+ is "gotest.tools/assert/cmp" |
|
| 18 |
+ "gotest.tools/skip" |
|
| 19 | 19 |
) |
| 20 | 20 |
|
| 21 | 21 |
func TestBuildWithSession(t *testing.T) {
|
| ... | ... |
@@ -12,9 +12,9 @@ import ( |
| 12 | 12 |
"github.com/docker/docker/integration/internal/container" |
| 13 | 13 |
"github.com/docker/docker/internal/test/fakecontext" |
| 14 | 14 |
"github.com/docker/docker/pkg/stdcopy" |
| 15 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 16 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 17 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 15 |
+ "gotest.tools/assert" |
|
| 16 |
+ is "gotest.tools/assert/cmp" |
|
| 17 |
+ "gotest.tools/skip" |
|
| 18 | 18 |
) |
| 19 | 19 |
|
| 20 | 20 |
func TestBuildSquashParent(t *testing.T) {
|
| ... | ... |
@@ -16,9 +16,9 @@ import ( |
| 16 | 16 |
"github.com/docker/docker/internal/test/fakecontext" |
| 17 | 17 |
"github.com/docker/docker/internal/test/request" |
| 18 | 18 |
"github.com/docker/docker/pkg/jsonmessage" |
| 19 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 20 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 21 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 19 |
+ "gotest.tools/assert" |
|
| 20 |
+ is "gotest.tools/assert/cmp" |
|
| 21 |
+ "gotest.tools/skip" |
|
| 22 | 22 |
) |
| 23 | 23 |
|
| 24 | 24 |
func TestBuildWithRemoveAndForceRemove(t *testing.T) {
|
| ... | ... |
@@ -385,7 +385,7 @@ COPY bar /` |
| 385 | 385 |
// docker/for-linux#135 |
| 386 | 386 |
// #35641 |
| 387 | 387 |
func TestBuildMultiStageLayerLeak(t *testing.T) {
|
| 388 |
- skip.IfCondition(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.37"), "broken in earlier versions") |
|
| 388 |
+ skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.37"), "broken in earlier versions") |
|
| 389 | 389 |
ctx := context.TODO() |
| 390 | 390 |
defer setupTest(t)() |
| 391 | 391 |
|
| ... | ... |
@@ -14,9 +14,9 @@ import ( |
| 14 | 14 |
"github.com/docker/docker/client" |
| 15 | 15 |
"github.com/docker/docker/integration/internal/swarm" |
| 16 | 16 |
"github.com/docker/docker/pkg/stdcopy" |
| 17 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 18 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 19 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 17 |
+ "gotest.tools/assert" |
|
| 18 |
+ is "gotest.tools/assert/cmp" |
|
| 19 |
+ "gotest.tools/skip" |
|
| 20 | 20 |
) |
| 21 | 21 |
|
| 22 | 22 |
func TestConfigList(t *testing.T) {
|
| ... | ... |
@@ -8,9 +8,9 @@ import ( |
| 8 | 8 |
"github.com/docker/docker/api/types" |
| 9 | 9 |
"github.com/docker/docker/client" |
| 10 | 10 |
"github.com/docker/docker/integration/internal/container" |
| 11 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 12 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 13 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 11 |
+ "gotest.tools/assert" |
|
| 12 |
+ is "gotest.tools/assert/cmp" |
|
| 13 |
+ "gotest.tools/skip" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
func TestCopyFromContainerPathDoesNotExist(t *testing.T) {
|
| ... | ... |
@@ -14,10 +14,10 @@ import ( |
| 14 | 14 |
ctr "github.com/docker/docker/integration/internal/container" |
| 15 | 15 |
"github.com/docker/docker/internal/test/request" |
| 16 | 16 |
"github.com/docker/docker/oci" |
| 17 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 18 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 19 |
- "github.com/gotestyourself/gotestyourself/poll" |
|
| 20 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 17 |
+ "gotest.tools/assert" |
|
| 18 |
+ is "gotest.tools/assert/cmp" |
|
| 19 |
+ "gotest.tools/poll" |
|
| 20 |
+ "gotest.tools/skip" |
|
| 21 | 21 |
) |
| 22 | 22 |
|
| 23 | 23 |
func TestCreateFailsWhenIdentifierDoesNotExist(t *testing.T) {
|
| ... | ... |
@@ -11,9 +11,9 @@ import ( |
| 11 | 11 |
"github.com/docker/docker/api/types" |
| 12 | 12 |
"github.com/docker/docker/integration/internal/container" |
| 13 | 13 |
"github.com/docker/docker/internal/test/daemon" |
| 14 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 15 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 16 | 14 |
"golang.org/x/sys/unix" |
| 15 |
+ "gotest.tools/assert" |
|
| 16 |
+ "gotest.tools/skip" |
|
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 | 19 |
// This is a regression test for #36145 |
| ... | ... |
@@ -9,8 +9,8 @@ import ( |
| 9 | 9 |
"github.com/docker/docker/integration/internal/container" |
| 10 | 10 |
"github.com/docker/docker/internal/test/request" |
| 11 | 11 |
"github.com/docker/docker/pkg/archive" |
| 12 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 13 |
- "github.com/gotestyourself/gotestyourself/poll" |
|
| 12 |
+ "gotest.tools/assert" |
|
| 13 |
+ "gotest.tools/poll" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
func TestDiff(t *testing.T) {
|
| ... | ... |
@@ -10,9 +10,9 @@ import ( |
| 10 | 10 |
"github.com/docker/docker/api/types/versions" |
| 11 | 11 |
"github.com/docker/docker/integration/internal/container" |
| 12 | 12 |
"github.com/docker/docker/internal/test/request" |
| 13 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 15 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 13 |
+ "gotest.tools/assert" |
|
| 14 |
+ is "gotest.tools/assert/cmp" |
|
| 15 |
+ "gotest.tools/skip" |
|
| 16 | 16 |
) |
| 17 | 17 |
|
| 18 | 18 |
func TestExec(t *testing.T) {
|
| ... | ... |
@@ -12,10 +12,10 @@ import ( |
| 12 | 12 |
"github.com/docker/docker/internal/test/daemon" |
| 13 | 13 |
"github.com/docker/docker/internal/test/request" |
| 14 | 14 |
"github.com/docker/docker/pkg/jsonmessage" |
| 15 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 16 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 17 |
- "github.com/gotestyourself/gotestyourself/poll" |
|
| 18 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 15 |
+ "gotest.tools/assert" |
|
| 16 |
+ is "gotest.tools/assert/cmp" |
|
| 17 |
+ "gotest.tools/poll" |
|
| 18 |
+ "gotest.tools/skip" |
|
| 19 | 19 |
) |
| 20 | 20 |
|
| 21 | 21 |
// export an image and try to import it into a new one |
| ... | ... |
@@ -10,7 +10,7 @@ import ( |
| 10 | 10 |
"github.com/docker/docker/client" |
| 11 | 11 |
"github.com/docker/docker/integration/internal/container" |
| 12 | 12 |
"github.com/docker/docker/internal/test/request" |
| 13 |
- "github.com/gotestyourself/gotestyourself/poll" |
|
| 13 |
+ "gotest.tools/poll" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
// TestHealthCheckWorkdir verifies that health-checks inherit the containers' |
| ... | ... |
@@ -9,10 +9,10 @@ import ( |
| 9 | 9 |
"github.com/docker/docker/client" |
| 10 | 10 |
"github.com/docker/docker/integration/internal/container" |
| 11 | 11 |
"github.com/docker/docker/internal/test/request" |
| 12 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 13 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 14 |
- "github.com/gotestyourself/gotestyourself/poll" |
|
| 15 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 12 |
+ "gotest.tools/assert" |
|
| 13 |
+ is "gotest.tools/assert/cmp" |
|
| 14 |
+ "gotest.tools/poll" |
|
| 15 |
+ "gotest.tools/skip" |
|
| 16 | 16 |
) |
| 17 | 17 |
|
| 18 | 18 |
func TestInspectCpusetInConfigPre120(t *testing.T) {
|
| ... | ... |
@@ -9,10 +9,10 @@ import ( |
| 9 | 9 |
"github.com/docker/docker/client" |
| 10 | 10 |
"github.com/docker/docker/integration/internal/container" |
| 11 | 11 |
"github.com/docker/docker/internal/test/request" |
| 12 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 13 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 14 |
- "github.com/gotestyourself/gotestyourself/poll" |
|
| 15 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 12 |
+ "gotest.tools/assert" |
|
| 13 |
+ is "gotest.tools/assert/cmp" |
|
| 14 |
+ "gotest.tools/poll" |
|
| 15 |
+ "gotest.tools/skip" |
|
| 16 | 16 |
) |
| 17 | 17 |
|
| 18 | 18 |
func TestKillContainerInvalidSignal(t *testing.T) {
|
| ... | ... |
@@ -10,9 +10,9 @@ import ( |
| 10 | 10 |
"github.com/docker/docker/api/types/filters" |
| 11 | 11 |
"github.com/docker/docker/integration/internal/container" |
| 12 | 12 |
"github.com/docker/docker/internal/test/request" |
| 13 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 15 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 13 |
+ "gotest.tools/assert" |
|
| 14 |
+ is "gotest.tools/assert/cmp" |
|
| 15 |
+ "gotest.tools/skip" |
|
| 16 | 16 |
) |
| 17 | 17 |
|
| 18 | 18 |
func TestLinksEtcHostsContentMatch(t *testing.T) {
|
| ... | ... |
@@ -9,15 +9,15 @@ import ( |
| 9 | 9 |
"github.com/docker/docker/integration/internal/container" |
| 10 | 10 |
"github.com/docker/docker/internal/test/request" |
| 11 | 11 |
"github.com/docker/docker/pkg/stdcopy" |
| 12 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 13 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 12 |
+ "gotest.tools/assert" |
|
| 13 |
+ "gotest.tools/skip" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
// Regression test for #35370 |
| 17 | 17 |
// Makes sure that when following we don't get an EOF error when there are no logs |
| 18 | 18 |
func TestLogsFollowTailEmpty(t *testing.T) {
|
| 19 | 19 |
// FIXME(vdemeester) fails on a e2e run on linux... |
| 20 |
- skip.IfCondition(t, testEnv.IsRemoteDaemon()) |
|
| 20 |
+ skip.If(t, testEnv.IsRemoteDaemon()) |
|
| 21 | 21 |
defer setupTest(t)() |
| 22 | 22 |
client := request.NewAPIClient(t) |
| 23 | 23 |
ctx := context.Background() |
| ... | ... |
@@ -13,10 +13,10 @@ import ( |
| 13 | 13 |
"github.com/docker/docker/client" |
| 14 | 14 |
"github.com/docker/docker/internal/test/request" |
| 15 | 15 |
"github.com/docker/docker/pkg/system" |
| 16 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 17 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 18 |
- "github.com/gotestyourself/gotestyourself/fs" |
|
| 19 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 16 |
+ "gotest.tools/assert" |
|
| 17 |
+ is "gotest.tools/assert/cmp" |
|
| 18 |
+ "gotest.tools/fs" |
|
| 19 |
+ "gotest.tools/skip" |
|
| 20 | 20 |
) |
| 21 | 21 |
|
| 22 | 22 |
func TestContainerNetworkMountsNoChown(t *testing.T) {
|
| ... | ... |
@@ -15,10 +15,10 @@ import ( |
| 15 | 15 |
"github.com/docker/docker/integration/internal/container" |
| 16 | 16 |
"github.com/docker/docker/internal/test/request" |
| 17 | 17 |
"github.com/docker/go-connections/nat" |
| 18 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 19 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 20 |
- "github.com/gotestyourself/gotestyourself/poll" |
|
| 21 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 18 |
+ "gotest.tools/assert" |
|
| 19 |
+ is "gotest.tools/assert/cmp" |
|
| 20 |
+ "gotest.tools/poll" |
|
| 21 |
+ "gotest.tools/skip" |
|
| 22 | 22 |
) |
| 23 | 23 |
|
| 24 | 24 |
func TestNetworkNat(t *testing.T) {
|
| ... | ... |
@@ -12,10 +12,10 @@ import ( |
| 12 | 12 |
"github.com/docker/docker/api/types/versions" |
| 13 | 13 |
"github.com/docker/docker/integration/internal/container" |
| 14 | 14 |
"github.com/docker/docker/internal/test/request" |
| 15 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 16 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 17 |
- "github.com/gotestyourself/gotestyourself/poll" |
|
| 18 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 15 |
+ "gotest.tools/assert" |
|
| 16 |
+ is "gotest.tools/assert/cmp" |
|
| 17 |
+ "gotest.tools/poll" |
|
| 18 |
+ "gotest.tools/skip" |
|
| 19 | 19 |
) |
| 20 | 20 |
|
| 21 | 21 |
func TestPause(t *testing.T) {
|
| ... | ... |
@@ -8,8 +8,8 @@ import ( |
| 8 | 8 |
"github.com/docker/docker/api/types/filters" |
| 9 | 9 |
"github.com/docker/docker/integration/internal/container" |
| 10 | 10 |
"github.com/docker/docker/internal/test/request" |
| 11 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 12 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 11 |
+ "gotest.tools/assert" |
|
| 12 |
+ is "gotest.tools/assert/cmp" |
|
| 13 | 13 |
) |
| 14 | 14 |
|
| 15 | 15 |
func TestPsFilter(t *testing.T) {
|
| ... | ... |
@@ -10,11 +10,11 @@ import ( |
| 10 | 10 |
"github.com/docker/docker/api/types/filters" |
| 11 | 11 |
"github.com/docker/docker/integration/internal/container" |
| 12 | 12 |
"github.com/docker/docker/internal/test/request" |
| 13 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 15 |
- "github.com/gotestyourself/gotestyourself/fs" |
|
| 16 |
- "github.com/gotestyourself/gotestyourself/poll" |
|
| 17 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 13 |
+ "gotest.tools/assert" |
|
| 14 |
+ is "gotest.tools/assert/cmp" |
|
| 15 |
+ "gotest.tools/fs" |
|
| 16 |
+ "gotest.tools/poll" |
|
| 17 |
+ "gotest.tools/skip" |
|
| 18 | 18 |
) |
| 19 | 19 |
|
| 20 | 20 |
func getPrefixAndSlashFromDaemonPlatform() (prefix, slash string) {
|
| ... | ... |
@@ -12,10 +12,10 @@ import ( |
| 12 | 12 |
"github.com/docker/docker/integration/internal/container" |
| 13 | 13 |
"github.com/docker/docker/internal/test/request" |
| 14 | 14 |
"github.com/docker/docker/pkg/stringid" |
| 15 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 16 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 17 |
- "github.com/gotestyourself/gotestyourself/poll" |
|
| 18 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 15 |
+ "gotest.tools/assert" |
|
| 16 |
+ is "gotest.tools/assert/cmp" |
|
| 17 |
+ "gotest.tools/poll" |
|
| 18 |
+ "gotest.tools/skip" |
|
| 19 | 19 |
) |
| 20 | 20 |
|
| 21 | 21 |
// This test simulates the scenario mentioned in #31392: |
| ... | ... |
@@ -11,10 +11,10 @@ import ( |
| 11 | 11 |
"github.com/docker/docker/integration/internal/container" |
| 12 | 12 |
"github.com/docker/docker/internal/test/request" |
| 13 | 13 |
req "github.com/docker/docker/internal/test/request" |
| 14 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 15 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 16 |
- "github.com/gotestyourself/gotestyourself/poll" |
|
| 17 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 14 |
+ "gotest.tools/assert" |
|
| 15 |
+ is "gotest.tools/assert/cmp" |
|
| 16 |
+ "gotest.tools/poll" |
|
| 17 |
+ "gotest.tools/skip" |
|
| 18 | 18 |
) |
| 19 | 19 |
|
| 20 | 20 |
func TestResize(t *testing.T) {
|
| ... | ... |
@@ -9,8 +9,8 @@ import ( |
| 9 | 9 |
"github.com/docker/docker/api/types" |
| 10 | 10 |
"github.com/docker/docker/api/types/container" |
| 11 | 11 |
"github.com/docker/docker/internal/test/daemon" |
| 12 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 13 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 12 |
+ "gotest.tools/assert" |
|
| 13 |
+ "gotest.tools/skip" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
func TestDaemonRestartKillContainers(t *testing.T) {
|
| ... | ... |
@@ -10,10 +10,10 @@ import ( |
| 10 | 10 |
"github.com/docker/docker/api/types" |
| 11 | 11 |
"github.com/docker/docker/integration/internal/container" |
| 12 | 12 |
"github.com/docker/docker/internal/test/request" |
| 13 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 15 |
- "github.com/gotestyourself/gotestyourself/poll" |
|
| 16 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 13 |
+ "gotest.tools/assert" |
|
| 14 |
+ is "gotest.tools/assert/cmp" |
|
| 15 |
+ "gotest.tools/poll" |
|
| 16 |
+ "gotest.tools/skip" |
|
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 | 19 |
func TestStats(t *testing.T) {
|
| ... | ... |
@@ -11,10 +11,10 @@ import ( |
| 11 | 11 |
"github.com/docker/docker/api/types" |
| 12 | 12 |
"github.com/docker/docker/integration/internal/container" |
| 13 | 13 |
"github.com/docker/docker/internal/test/request" |
| 14 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 15 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 16 |
- "github.com/gotestyourself/gotestyourself/poll" |
|
| 17 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 14 |
+ "gotest.tools/assert" |
|
| 15 |
+ "gotest.tools/icmd" |
|
| 16 |
+ "gotest.tools/poll" |
|
| 17 |
+ "gotest.tools/skip" |
|
| 18 | 18 |
) |
| 19 | 19 |
|
| 20 | 20 |
func TestStopContainerWithRestartPolicyAlways(t *testing.T) {
|
| ... | ... |
@@ -10,10 +10,10 @@ import ( |
| 10 | 10 |
containertypes "github.com/docker/docker/api/types/container" |
| 11 | 11 |
"github.com/docker/docker/integration/internal/container" |
| 12 | 12 |
"github.com/docker/docker/internal/test/request" |
| 13 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 15 |
- "github.com/gotestyourself/gotestyourself/poll" |
|
| 16 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 13 |
+ "gotest.tools/assert" |
|
| 14 |
+ is "gotest.tools/assert/cmp" |
|
| 15 |
+ "gotest.tools/poll" |
|
| 16 |
+ "gotest.tools/skip" |
|
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 | 19 |
func TestUpdateMemory(t *testing.T) {
|
| ... | ... |
@@ -8,9 +8,9 @@ import ( |
| 8 | 8 |
containertypes "github.com/docker/docker/api/types/container" |
| 9 | 9 |
"github.com/docker/docker/integration/internal/container" |
| 10 | 10 |
"github.com/docker/docker/internal/test/request" |
| 11 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 12 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 13 |
- "github.com/gotestyourself/gotestyourself/poll" |
|
| 11 |
+ "gotest.tools/assert" |
|
| 12 |
+ is "gotest.tools/assert/cmp" |
|
| 13 |
+ "gotest.tools/poll" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
func TestUpdateRestartPolicy(t *testing.T) {
|
| ... | ... |
@@ -8,9 +8,9 @@ import ( |
| 8 | 8 |
"github.com/docker/docker/api/types/versions" |
| 9 | 9 |
"github.com/docker/docker/integration/internal/container" |
| 10 | 10 |
"github.com/docker/docker/internal/test/request" |
| 11 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 12 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 13 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 11 |
+ "gotest.tools/assert" |
|
| 12 |
+ is "gotest.tools/assert/cmp" |
|
| 13 |
+ "gotest.tools/skip" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
func TestCommitInheritsEnv(t *testing.T) {
|
| ... | ... |
@@ -7,8 +7,8 @@ import ( |
| 7 | 7 |
"github.com/docker/docker/api/types" |
| 8 | 8 |
"github.com/docker/docker/integration/internal/container" |
| 9 | 9 |
"github.com/docker/docker/internal/test/request" |
| 10 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 11 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 10 |
+ "gotest.tools/assert" |
|
| 11 |
+ is "gotest.tools/assert/cmp" |
|
| 12 | 12 |
) |
| 13 | 13 |
|
| 14 | 14 |
func TestRemoveImageOrphaning(t *testing.T) {
|
| ... | ... |
@@ -7,8 +7,8 @@ import ( |
| 7 | 7 |
|
| 8 | 8 |
"github.com/docker/docker/internal/test/request" |
| 9 | 9 |
"github.com/docker/docker/internal/testutil" |
| 10 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 11 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 10 |
+ "gotest.tools/assert" |
|
| 11 |
+ is "gotest.tools/assert/cmp" |
|
| 12 | 12 |
) |
| 13 | 13 |
|
| 14 | 14 |
// tagging a named image in a new unprefixed repo should work |
| ... | ... |
@@ -8,7 +8,7 @@ import ( |
| 8 | 8 |
"github.com/docker/docker/api/types/container" |
| 9 | 9 |
"github.com/docker/docker/api/types/network" |
| 10 | 10 |
"github.com/docker/docker/client" |
| 11 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 11 |
+ "gotest.tools/assert" |
|
| 12 | 12 |
) |
| 13 | 13 |
|
| 14 | 14 |
// TestContainerConfig holds container configuration struct that |
| ... | ... |
@@ -6,7 +6,7 @@ import ( |
| 6 | 6 |
|
| 7 | 7 |
"github.com/docker/docker/api/types" |
| 8 | 8 |
"github.com/docker/docker/client" |
| 9 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 9 |
+ "gotest.tools/assert" |
|
| 10 | 10 |
) |
| 11 | 11 |
|
| 12 | 12 |
func createNetwork(ctx context.Context, client client.APIClient, name string, ops ...func(*types.NetworkCreate)) (string, error) {
|
| ... | ... |
@@ -11,9 +11,9 @@ import ( |
| 11 | 11 |
swarmtypes "github.com/docker/docker/api/types/swarm" |
| 12 | 12 |
"github.com/docker/docker/internal/test/daemon" |
| 13 | 13 |
"github.com/docker/docker/internal/test/environment" |
| 14 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 15 |
- "github.com/gotestyourself/gotestyourself/poll" |
|
| 16 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 14 |
+ "gotest.tools/assert" |
|
| 15 |
+ "gotest.tools/poll" |
|
| 16 |
+ "gotest.tools/skip" |
|
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 | 19 |
// ServicePoll tweaks the pollSettings for `service` |
| ... | ... |
@@ -8,9 +8,9 @@ import ( |
| 8 | 8 |
"github.com/docker/docker/api/types/versions" |
| 9 | 9 |
"github.com/docker/docker/integration/internal/network" |
| 10 | 10 |
"github.com/docker/docker/internal/test/request" |
| 11 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 12 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 13 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 11 |
+ "gotest.tools/assert" |
|
| 12 |
+ is "gotest.tools/assert/cmp" |
|
| 13 |
+ "gotest.tools/skip" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
func containsNetwork(nws []types.NetworkResource, networkID string) bool {
|
| ... | ... |
@@ -8,8 +8,8 @@ import ( |
| 8 | 8 |
"github.com/docker/docker/api/types" |
| 9 | 9 |
"github.com/docker/docker/client" |
| 10 | 10 |
"github.com/docker/docker/pkg/parsers/kernel" |
| 11 |
- "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 12 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 11 |
+ "gotest.tools/assert/cmp" |
|
| 12 |
+ "gotest.tools/icmd" |
|
| 13 | 13 |
) |
| 14 | 14 |
|
| 15 | 15 |
// CreateMasterDummy creates a dummy network interface |
| ... | ... |
@@ -10,8 +10,8 @@ import ( |
| 10 | 10 |
swarmtypes "github.com/docker/docker/api/types/swarm" |
| 11 | 11 |
"github.com/docker/docker/client" |
| 12 | 12 |
"github.com/docker/docker/integration/internal/swarm" |
| 13 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
- "github.com/gotestyourself/gotestyourself/poll" |
|
| 13 |
+ "gotest.tools/assert" |
|
| 14 |
+ "gotest.tools/poll" |
|
| 15 | 15 |
) |
| 16 | 16 |
|
| 17 | 17 |
const defaultSwarmPort = 2477 |
| ... | ... |
@@ -12,8 +12,8 @@ import ( |
| 12 | 12 |
"github.com/docker/docker/integration/internal/container" |
| 13 | 13 |
n "github.com/docker/docker/integration/network" |
| 14 | 14 |
"github.com/docker/docker/internal/test/daemon" |
| 15 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 16 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 15 |
+ "gotest.tools/assert" |
|
| 16 |
+ "gotest.tools/skip" |
|
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 | 19 |
func TestDockerNetworkIpvlanPersistance(t *testing.T) {
|
| ... | ... |
@@ -12,8 +12,8 @@ import ( |
| 12 | 12 |
net "github.com/docker/docker/integration/internal/network" |
| 13 | 13 |
n "github.com/docker/docker/integration/network" |
| 14 | 14 |
"github.com/docker/docker/internal/test/daemon" |
| 15 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 16 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 15 |
+ "gotest.tools/assert" |
|
| 16 |
+ "gotest.tools/skip" |
|
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 | 19 |
func TestDockerNetworkMacvlanPersistance(t *testing.T) {
|
| ... | ... |
@@ -11,10 +11,10 @@ import ( |
| 11 | 11 |
"github.com/docker/docker/client" |
| 12 | 12 |
"github.com/docker/docker/integration/internal/swarm" |
| 13 | 13 |
"github.com/docker/docker/internal/test/daemon" |
| 14 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 15 |
- "github.com/gotestyourself/gotestyourself/icmd" |
|
| 16 |
- "github.com/gotestyourself/gotestyourself/poll" |
|
| 17 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 14 |
+ "gotest.tools/assert" |
|
| 15 |
+ "gotest.tools/icmd" |
|
| 16 |
+ "gotest.tools/poll" |
|
| 17 |
+ "gotest.tools/skip" |
|
| 18 | 18 |
) |
| 19 | 19 |
|
| 20 | 20 |
// delInterface removes given network interface |
| ... | ... |
@@ -25,8 +25,8 @@ import ( |
| 25 | 25 |
"github.com/docker/docker/internal/test/environment" |
| 26 | 26 |
"github.com/docker/docker/pkg/archive" |
| 27 | 27 |
"github.com/docker/docker/pkg/authorization" |
| 28 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 29 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 28 |
+ "gotest.tools/assert" |
|
| 29 |
+ "gotest.tools/skip" |
|
| 30 | 30 |
) |
| 31 | 31 |
|
| 32 | 32 |
const ( |
| ... | ... |
@@ -211,7 +211,7 @@ func TestAuthZPluginDenyResponse(t *testing.T) {
|
| 211 | 211 |
// TestAuthZPluginAllowEventStream verifies event stream propagates |
| 212 | 212 |
// correctly after request pass through by the authorization plugin |
| 213 | 213 |
func TestAuthZPluginAllowEventStream(t *testing.T) {
|
| 214 |
- skip.IfCondition(t, testEnv.DaemonInfo.OSType != "linux") |
|
| 214 |
+ skip.If(t, testEnv.DaemonInfo.OSType != "linux") |
|
| 215 | 215 |
|
| 216 | 216 |
defer setupTestV1(t)() |
| 217 | 217 |
ctrl.reqRes.Allow = true |
| ... | ... |
@@ -16,8 +16,8 @@ import ( |
| 16 | 16 |
"github.com/docker/docker/client" |
| 17 | 17 |
"github.com/docker/docker/integration/internal/container" |
| 18 | 18 |
"github.com/docker/docker/integration/internal/requirement" |
| 19 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 20 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 19 |
+ "gotest.tools/assert" |
|
| 20 |
+ "gotest.tools/skip" |
|
| 21 | 21 |
) |
| 22 | 22 |
|
| 23 | 23 |
var ( |
| ... | ... |
@@ -29,8 +29,8 @@ var ( |
| 29 | 29 |
) |
| 30 | 30 |
|
| 31 | 31 |
func setupTestV2(t *testing.T) func() {
|
| 32 |
- skip.IfCondition(t, testEnv.DaemonInfo.OSType != "linux") |
|
| 33 |
- skip.IfCondition(t, !requirement.HasHubConnectivity(t)) |
|
| 32 |
+ skip.If(t, testEnv.DaemonInfo.OSType != "linux") |
|
| 33 |
+ skip.If(t, !requirement.HasHubConnectivity(t)) |
|
| 34 | 34 |
|
| 35 | 35 |
teardown := setupTest(t) |
| 36 | 36 |
|
| ... | ... |
@@ -40,7 +40,7 @@ func setupTestV2(t *testing.T) func() {
|
| 40 | 40 |
} |
| 41 | 41 |
|
| 42 | 42 |
func TestAuthZPluginV2AllowNonVolumeRequest(t *testing.T) {
|
| 43 |
- skip.IfCondition(t, os.Getenv("DOCKER_ENGINE_GOARCH") != "amd64")
|
|
| 43 |
+ skip.If(t, os.Getenv("DOCKER_ENGINE_GOARCH") != "amd64")
|
|
| 44 | 44 |
defer setupTestV2(t)() |
| 45 | 45 |
|
| 46 | 46 |
client, err := d.NewClient() |
| ... | ... |
@@ -64,7 +64,7 @@ func TestAuthZPluginV2AllowNonVolumeRequest(t *testing.T) {
|
| 64 | 64 |
} |
| 65 | 65 |
|
| 66 | 66 |
func TestAuthZPluginV2Disable(t *testing.T) {
|
| 67 |
- skip.IfCondition(t, os.Getenv("DOCKER_ENGINE_GOARCH") != "amd64")
|
|
| 67 |
+ skip.If(t, os.Getenv("DOCKER_ENGINE_GOARCH") != "amd64")
|
|
| 68 | 68 |
defer setupTestV2(t)() |
| 69 | 69 |
|
| 70 | 70 |
client, err := d.NewClient() |
| ... | ... |
@@ -91,7 +91,7 @@ func TestAuthZPluginV2Disable(t *testing.T) {
|
| 91 | 91 |
} |
| 92 | 92 |
|
| 93 | 93 |
func TestAuthZPluginV2RejectVolumeRequests(t *testing.T) {
|
| 94 |
- skip.IfCondition(t, os.Getenv("DOCKER_ENGINE_GOARCH") != "amd64")
|
|
| 94 |
+ skip.If(t, os.Getenv("DOCKER_ENGINE_GOARCH") != "amd64")
|
|
| 95 | 95 |
defer setupTestV2(t)() |
| 96 | 96 |
|
| 97 | 97 |
client, err := d.NewClient() |
| ... | ... |
@@ -127,7 +127,7 @@ func TestAuthZPluginV2RejectVolumeRequests(t *testing.T) {
|
| 127 | 127 |
} |
| 128 | 128 |
|
| 129 | 129 |
func TestAuthZPluginV2BadManifestFailsDaemonStart(t *testing.T) {
|
| 130 |
- skip.IfCondition(t, os.Getenv("DOCKER_ENGINE_GOARCH") != "amd64")
|
|
| 130 |
+ skip.If(t, os.Getenv("DOCKER_ENGINE_GOARCH") != "amd64")
|
|
| 131 | 131 |
defer setupTestV2(t)() |
| 132 | 132 |
|
| 133 | 133 |
client, err := d.NewClient() |
| ... | ... |
@@ -22,9 +22,9 @@ import ( |
| 22 | 22 |
"github.com/docker/docker/internal/test/daemon" |
| 23 | 23 |
"github.com/docker/docker/pkg/archive" |
| 24 | 24 |
"github.com/docker/docker/pkg/plugins" |
| 25 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 26 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 27 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 25 |
+ "gotest.tools/assert" |
|
| 26 |
+ is "gotest.tools/assert/cmp" |
|
| 27 |
+ "gotest.tools/skip" |
|
| 28 | 28 |
) |
| 29 | 29 |
|
| 30 | 30 |
type graphEventsCounter struct {
|
| ... | ... |
@@ -11,8 +11,8 @@ import ( |
| 11 | 11 |
"github.com/docker/docker/api/types" |
| 12 | 12 |
"github.com/docker/docker/integration/internal/container" |
| 13 | 13 |
"github.com/docker/docker/internal/test/daemon" |
| 14 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 15 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 14 |
+ "gotest.tools/assert" |
|
| 15 |
+ "gotest.tools/skip" |
|
| 16 | 16 |
) |
| 17 | 17 |
|
| 18 | 18 |
func TestContinueAfterPluginCrash(t *testing.T) {
|
| ... | ... |
@@ -6,8 +6,8 @@ import ( |
| 6 | 6 |
|
| 7 | 7 |
"github.com/docker/docker/api/types" |
| 8 | 8 |
"github.com/docker/docker/internal/test/daemon" |
| 9 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 10 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 9 |
+ "gotest.tools/assert" |
|
| 10 |
+ "gotest.tools/skip" |
|
| 11 | 11 |
) |
| 12 | 12 |
|
| 13 | 13 |
// Regression test for #35553 |
| ... | ... |
@@ -9,8 +9,8 @@ import ( |
| 9 | 9 |
"github.com/docker/docker/api/types" |
| 10 | 10 |
"github.com/docker/docker/internal/test/daemon" |
| 11 | 11 |
"github.com/docker/docker/internal/test/fixtures/plugin" |
| 12 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 13 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 12 |
+ "gotest.tools/assert" |
|
| 13 |
+ "gotest.tools/skip" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
// TestPluginWithDevMounts tests very specific regression caused by mounts ordering |
| ... | ... |
@@ -13,9 +13,9 @@ import ( |
| 13 | 13 |
"github.com/docker/docker/client" |
| 14 | 14 |
"github.com/docker/docker/integration/internal/swarm" |
| 15 | 15 |
"github.com/docker/docker/pkg/stdcopy" |
| 16 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 17 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 18 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 16 |
+ "gotest.tools/assert" |
|
| 17 |
+ is "gotest.tools/assert/cmp" |
|
| 18 |
+ "gotest.tools/skip" |
|
| 19 | 19 |
) |
| 20 | 20 |
|
| 21 | 21 |
func TestSecretInspect(t *testing.T) {
|
| ... | ... |
@@ -13,9 +13,9 @@ import ( |
| 13 | 13 |
"github.com/docker/docker/client" |
| 14 | 14 |
"github.com/docker/docker/integration/internal/swarm" |
| 15 | 15 |
"github.com/docker/docker/internal/test/daemon" |
| 16 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 17 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 18 |
- "github.com/gotestyourself/gotestyourself/poll" |
|
| 16 |
+ "gotest.tools/assert" |
|
| 17 |
+ is "gotest.tools/assert/cmp" |
|
| 18 |
+ "gotest.tools/poll" |
|
| 19 | 19 |
) |
| 20 | 20 |
|
| 21 | 21 |
func TestServiceCreateInit(t *testing.T) {
|
| ... | ... |
@@ -12,10 +12,10 @@ import ( |
| 12 | 12 |
"github.com/docker/docker/client" |
| 13 | 13 |
"github.com/docker/docker/integration/internal/swarm" |
| 14 | 14 |
"github.com/google/go-cmp/cmp" |
| 15 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 16 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 17 |
- "github.com/gotestyourself/gotestyourself/poll" |
|
| 18 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 15 |
+ "gotest.tools/assert" |
|
| 16 |
+ is "gotest.tools/assert/cmp" |
|
| 17 |
+ "gotest.tools/poll" |
|
| 18 |
+ "gotest.tools/skip" |
|
| 19 | 19 |
) |
| 20 | 20 |
|
| 21 | 21 |
func TestInspect(t *testing.T) {
|
| ... | ... |
@@ -54,7 +54,7 @@ func TestInspect(t *testing.T) {
|
| 54 | 54 |
assert.Check(t, is.DeepEqual(service, expected, cmpServiceOpts())) |
| 55 | 55 |
} |
| 56 | 56 |
|
| 57 |
-// TODO: use helpers from gotestyourself/assert/opt when available |
|
| 57 |
+// TODO: use helpers from gotest.tools/assert/opt when available |
|
| 58 | 58 |
func cmpServiceOpts() cmp.Option {
|
| 59 | 59 |
const threshold = 20 * time.Second |
| 60 | 60 |
|
| ... | ... |
@@ -8,8 +8,8 @@ import ( |
| 8 | 8 |
"github.com/docker/docker/api/types/network" |
| 9 | 9 |
"github.com/docker/docker/integration/internal/container" |
| 10 | 10 |
"github.com/docker/docker/integration/internal/swarm" |
| 11 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 12 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 11 |
+ "gotest.tools/assert" |
|
| 12 |
+ is "gotest.tools/assert/cmp" |
|
| 13 | 13 |
) |
| 14 | 14 |
|
| 15 | 15 |
func TestDockerNetworkConnectAlias(t *testing.T) {
|
| ... | ... |
@@ -15,9 +15,9 @@ import ( |
| 15 | 15 |
"github.com/docker/docker/internal/test/daemon" |
| 16 | 16 |
"github.com/docker/docker/internal/test/fixtures/plugin" |
| 17 | 17 |
"github.com/docker/docker/internal/test/registry" |
| 18 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 19 |
- "github.com/gotestyourself/gotestyourself/poll" |
|
| 20 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 18 |
+ "gotest.tools/assert" |
|
| 19 |
+ "gotest.tools/poll" |
|
| 20 |
+ "gotest.tools/skip" |
|
| 21 | 21 |
) |
| 22 | 22 |
|
| 23 | 23 |
func TestServicePlugin(t *testing.T) {
|
| ... | ... |
@@ -5,9 +5,9 @@ import ( |
| 5 | 5 |
"testing" |
| 6 | 6 |
|
| 7 | 7 |
req "github.com/docker/docker/internal/test/request" |
| 8 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 9 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 10 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 8 |
+ "gotest.tools/assert" |
|
| 9 |
+ is "gotest.tools/assert/cmp" |
|
| 10 |
+ "gotest.tools/skip" |
|
| 11 | 11 |
) |
| 12 | 12 |
|
| 13 | 13 |
func TestSessionCreate(t *testing.T) {
|
| ... | ... |
@@ -9,7 +9,7 @@ import ( |
| 9 | 9 |
"github.com/docker/docker/integration/internal/container" |
| 10 | 10 |
"github.com/docker/docker/internal/test/daemon" |
| 11 | 11 |
|
| 12 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 12 |
+ "gotest.tools/assert" |
|
| 13 | 13 |
) |
| 14 | 14 |
|
| 15 | 15 |
// hasSystemd checks whether the host was booted with systemd as its init |
| ... | ... |
@@ -18,9 +18,9 @@ import ( |
| 18 | 18 |
"github.com/docker/docker/internal/test/request" |
| 19 | 19 |
req "github.com/docker/docker/internal/test/request" |
| 20 | 20 |
"github.com/docker/docker/pkg/jsonmessage" |
| 21 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 22 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 23 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 21 |
+ "gotest.tools/assert" |
|
| 22 |
+ is "gotest.tools/assert/cmp" |
|
| 23 |
+ "gotest.tools/skip" |
|
| 24 | 24 |
) |
| 25 | 25 |
|
| 26 | 26 |
func TestEventsExecDie(t *testing.T) {
|
| ... | ... |
@@ -9,8 +9,8 @@ import ( |
| 9 | 9 |
|
| 10 | 10 |
"github.com/docker/docker/internal/test/request" |
| 11 | 11 |
req "github.com/docker/docker/internal/test/request" |
| 12 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 13 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 12 |
+ "gotest.tools/assert" |
|
| 13 |
+ is "gotest.tools/assert/cmp" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
func TestInfoBinaryCommits(t *testing.T) {
|
| ... | ... |
@@ -6,8 +6,8 @@ import ( |
| 6 | 6 |
"testing" |
| 7 | 7 |
|
| 8 | 8 |
"github.com/docker/docker/internal/test/request" |
| 9 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 10 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 9 |
+ "gotest.tools/assert" |
|
| 10 |
+ is "gotest.tools/assert/cmp" |
|
| 11 | 11 |
) |
| 12 | 12 |
|
| 13 | 13 |
func TestInfoAPI(t *testing.T) {
|
| ... | ... |
@@ -7,14 +7,14 @@ import ( |
| 7 | 7 |
"github.com/docker/docker/api/types" |
| 8 | 8 |
"github.com/docker/docker/integration/internal/requirement" |
| 9 | 9 |
"github.com/docker/docker/internal/test/request" |
| 10 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 11 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 12 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 10 |
+ "gotest.tools/assert" |
|
| 11 |
+ is "gotest.tools/assert/cmp" |
|
| 12 |
+ "gotest.tools/skip" |
|
| 13 | 13 |
) |
| 14 | 14 |
|
| 15 | 15 |
// Test case for GitHub 22244 |
| 16 | 16 |
func TestLoginFailsWithBadCredentials(t *testing.T) {
|
| 17 |
- skip.IfCondition(t, !requirement.HasHubConnectivity(t)) |
|
| 17 |
+ skip.If(t, !requirement.HasHubConnectivity(t)) |
|
| 18 | 18 |
|
| 19 | 19 |
client := request.NewAPIClient(t) |
| 20 | 20 |
|
| ... | ... |
@@ -5,8 +5,8 @@ import ( |
| 5 | 5 |
"testing" |
| 6 | 6 |
|
| 7 | 7 |
"github.com/docker/docker/internal/test/request" |
| 8 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 9 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 8 |
+ "gotest.tools/assert" |
|
| 9 |
+ is "gotest.tools/assert/cmp" |
|
| 10 | 10 |
) |
| 11 | 11 |
|
| 12 | 12 |
func TestVersion(t *testing.T) {
|
| ... | ... |
@@ -13,9 +13,9 @@ import ( |
| 13 | 13 |
"github.com/docker/docker/integration/internal/container" |
| 14 | 14 |
"github.com/docker/docker/internal/test/request" |
| 15 | 15 |
"github.com/google/go-cmp/cmp/cmpopts" |
| 16 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 17 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 18 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 16 |
+ "gotest.tools/assert" |
|
| 17 |
+ is "gotest.tools/assert/cmp" |
|
| 18 |
+ "gotest.tools/skip" |
|
| 19 | 19 |
) |
| 20 | 20 |
|
| 21 | 21 |
func TestVolumesCreateAndList(t *testing.T) {
|
| ... | ... |
@@ -6,7 +6,7 @@ import ( |
| 6 | 6 |
"github.com/docker/docker/api/types" |
| 7 | 7 |
"github.com/docker/docker/api/types/swarm" |
| 8 | 8 |
"github.com/docker/docker/internal/test" |
| 9 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 9 |
+ "gotest.tools/assert" |
|
| 10 | 10 |
) |
| 11 | 11 |
|
| 12 | 12 |
// ConfigConstructor defines a swarm config constructor |
| ... | ... |
@@ -5,7 +5,7 @@ import ( |
| 5 | 5 |
|
| 6 | 6 |
"github.com/docker/docker/api/types" |
| 7 | 7 |
"github.com/docker/docker/internal/test" |
| 8 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 8 |
+ "gotest.tools/assert" |
|
| 9 | 9 |
) |
| 10 | 10 |
|
| 11 | 11 |
// ActiveContainers returns the list of ids of the currently running containers |
| ... | ... |
@@ -23,8 +23,8 @@ import ( |
| 23 | 23 |
"github.com/docker/docker/pkg/stringid" |
| 24 | 24 |
"github.com/docker/go-connections/sockets" |
| 25 | 25 |
"github.com/docker/go-connections/tlsconfig" |
| 26 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 27 | 26 |
"github.com/pkg/errors" |
| 27 |
+ "gotest.tools/assert" |
|
| 28 | 28 |
) |
| 29 | 29 |
|
| 30 | 30 |
type testingT interface {
|
| ... | ... |
@@ -8,7 +8,7 @@ import ( |
| 8 | 8 |
"github.com/docker/docker/api/types" |
| 9 | 9 |
"github.com/docker/docker/api/types/swarm" |
| 10 | 10 |
"github.com/docker/docker/internal/test" |
| 11 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 11 |
+ "gotest.tools/assert" |
|
| 12 | 12 |
) |
| 13 | 13 |
|
| 14 | 14 |
// NodeConstructor defines a swarm node constructor |
| ... | ... |
@@ -6,7 +6,7 @@ import ( |
| 6 | 6 |
"github.com/docker/docker/api/types" |
| 7 | 7 |
"github.com/docker/docker/api/types/swarm" |
| 8 | 8 |
"github.com/docker/docker/internal/test" |
| 9 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 9 |
+ "gotest.tools/assert" |
|
| 10 | 10 |
) |
| 11 | 11 |
|
| 12 | 12 |
// SecretConstructor defines a swarm secret constructor |
| ... | ... |
@@ -8,7 +8,7 @@ import ( |
| 8 | 8 |
"github.com/docker/docker/api/types/filters" |
| 9 | 9 |
"github.com/docker/docker/api/types/swarm" |
| 10 | 10 |
"github.com/docker/docker/internal/test" |
| 11 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 11 |
+ "gotest.tools/assert" |
|
| 12 | 12 |
) |
| 13 | 13 |
|
| 14 | 14 |
// ServiceConstructor defines a swarm service constructor function |
| ... | ... |
@@ -7,7 +7,7 @@ import ( |
| 7 | 7 |
"github.com/docker/docker/api/types/filters" |
| 8 | 8 |
dclient "github.com/docker/docker/client" |
| 9 | 9 |
"github.com/docker/docker/internal/test" |
| 10 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 10 |
+ "gotest.tools/assert" |
|
| 11 | 11 |
) |
| 12 | 12 |
|
| 13 | 13 |
var frozenImages = []string{"busybox:latest", "busybox:glibc", "hello-world:frozen", "debian:jessie"}
|
| ... | ... |
@@ -12,7 +12,7 @@ import ( |
| 12 | 12 |
"github.com/docker/docker/internal/test" |
| 13 | 13 |
"github.com/docker/docker/internal/test/fakecontext" |
| 14 | 14 |
"github.com/docker/docker/internal/test/fakestorage" |
| 15 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 15 |
+ "gotest.tools/assert" |
|
| 16 | 16 |
) |
| 17 | 17 |
|
| 18 | 18 |
type testingT interface {
|
| ... | ... |
@@ -12,7 +12,7 @@ import ( |
| 12 | 12 |
"github.com/docker/docker/api/types" |
| 13 | 13 |
"github.com/docker/docker/internal/test" |
| 14 | 14 |
"github.com/docker/docker/pkg/archive" |
| 15 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 15 |
+ "gotest.tools/assert" |
|
| 16 | 16 |
) |
| 17 | 17 |
|
| 18 | 18 |
var ensureHTTPServerOnce sync.Once |
| ... | ... |
@@ -20,7 +20,7 @@ import ( |
| 20 | 20 |
"github.com/docker/docker/internal/test/request" |
| 21 | 21 |
"github.com/docker/docker/internal/testutil" |
| 22 | 22 |
"github.com/docker/go-connections/nat" |
| 23 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 23 |
+ "gotest.tools/assert" |
|
| 24 | 24 |
) |
| 25 | 25 |
|
| 26 | 26 |
var testEnv *environment.Execution |
| ... | ... |
@@ -20,8 +20,8 @@ import ( |
| 20 | 20 |
"github.com/docker/docker/pkg/ioutils" |
| 21 | 21 |
"github.com/docker/go-connections/sockets" |
| 22 | 22 |
"github.com/docker/go-connections/tlsconfig" |
| 23 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 24 | 23 |
"github.com/pkg/errors" |
| 24 |
+ "gotest.tools/assert" |
|
| 25 | 25 |
) |
| 26 | 26 |
|
| 27 | 27 |
// NewAPIClient returns a docker API client configured from environment variables |
| ... | ... |
@@ -3,8 +3,8 @@ package testutil // import "github.com/docker/docker/internal/testutil" |
| 3 | 3 |
import ( |
| 4 | 4 |
"testing" |
| 5 | 5 |
|
| 6 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 7 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 6 |
+ "gotest.tools/assert" |
|
| 7 |
+ is "gotest.tools/assert/cmp" |
|
| 8 | 8 |
) |
| 9 | 9 |
|
| 10 | 10 |
func testLengthHelper(generator func(int) string, t *testing.T) {
|
| ... | ... |
@@ -3,8 +3,8 @@ package opts // import "github.com/docker/docker/opts" |
| 3 | 3 |
import ( |
| 4 | 4 |
"testing" |
| 5 | 5 |
|
| 6 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 7 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 6 |
+ "gotest.tools/assert" |
|
| 7 |
+ is "gotest.tools/assert/cmp" |
|
| 8 | 8 |
) |
| 9 | 9 |
|
| 10 | 10 |
func TestQuotedStringSetWithQuotes(t *testing.T) {
|
| ... | ... |
@@ -8,9 +8,9 @@ import ( |
| 8 | 8 |
"testing" |
| 9 | 9 |
|
| 10 | 10 |
"github.com/docker/docker/pkg/system" |
| 11 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 12 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 13 | 11 |
"golang.org/x/sys/unix" |
| 12 |
+ "gotest.tools/assert" |
|
| 13 |
+ "gotest.tools/skip" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
// setupOverlayTestDir creates files in a directory with overlay whiteouts |
| ... | ... |
@@ -18,9 +18,9 @@ import ( |
| 18 | 18 |
|
| 19 | 19 |
"github.com/docker/docker/pkg/idtools" |
| 20 | 20 |
"github.com/docker/docker/pkg/ioutils" |
| 21 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 22 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 23 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 21 |
+ "gotest.tools/assert" |
|
| 22 |
+ is "gotest.tools/assert/cmp" |
|
| 23 |
+ "gotest.tools/skip" |
|
| 24 | 24 |
) |
| 25 | 25 |
|
| 26 | 26 |
var tmp string |
| ... | ... |
@@ -13,10 +13,10 @@ import ( |
| 13 | 13 |
"testing" |
| 14 | 14 |
|
| 15 | 15 |
"github.com/docker/docker/pkg/system" |
| 16 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 17 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 18 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 19 | 16 |
"golang.org/x/sys/unix" |
| 17 |
+ "gotest.tools/assert" |
|
| 18 |
+ is "gotest.tools/assert/cmp" |
|
| 19 |
+ "gotest.tools/skip" |
|
| 20 | 20 |
) |
| 21 | 21 |
|
| 22 | 22 |
func TestCanonicalTarNameForPath(t *testing.T) {
|
| ... | ... |
@@ -11,8 +11,8 @@ import ( |
| 11 | 11 |
"time" |
| 12 | 12 |
|
| 13 | 13 |
"github.com/docker/docker/pkg/system" |
| 14 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 15 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 14 |
+ "gotest.tools/assert" |
|
| 15 |
+ "gotest.tools/skip" |
|
| 16 | 16 |
) |
| 17 | 17 |
|
| 18 | 18 |
func max(x, y int) int {
|
| ... | ... |
@@ -11,8 +11,8 @@ import ( |
| 11 | 11 |
"testing" |
| 12 | 12 |
"time" |
| 13 | 13 |
|
| 14 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 15 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 14 |
+ "gotest.tools/assert" |
|
| 15 |
+ is "gotest.tools/assert/cmp" |
|
| 16 | 16 |
) |
| 17 | 17 |
|
| 18 | 18 |
func TestPeerCertificateMarshalJSON(t *testing.T) {
|
| ... | ... |
@@ -9,8 +9,8 @@ import ( |
| 9 | 9 |
"testing" |
| 10 | 10 |
|
| 11 | 11 |
"github.com/docker/docker/pkg/plugingetter" |
| 12 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 13 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 12 |
+ "gotest.tools/assert" |
|
| 13 |
+ is "gotest.tools/assert/cmp" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
func TestMiddlewareWrapHandler(t *testing.T) {
|
| ... | ... |
@@ -10,10 +10,10 @@ import ( |
| 10 | 10 |
"path/filepath" |
| 11 | 11 |
"testing" |
| 12 | 12 |
|
| 13 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 15 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 16 | 13 |
"golang.org/x/sys/unix" |
| 14 |
+ "gotest.tools/assert" |
|
| 15 |
+ is "gotest.tools/assert/cmp" |
|
| 16 |
+ "gotest.tools/skip" |
|
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 | 19 |
const ( |
| ... | ... |
@@ -9,8 +9,8 @@ import ( |
| 9 | 9 |
"time" |
| 10 | 10 |
|
| 11 | 11 |
"github.com/docker/docker/pkg/term" |
| 12 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 13 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 12 |
+ "gotest.tools/assert" |
|
| 13 |
+ is "gotest.tools/assert/cmp" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
func TestError(t *testing.T) {
|
| ... | ... |
@@ -14,9 +14,9 @@ import ( |
| 14 | 14 |
|
| 15 | 15 |
"github.com/docker/docker/pkg/plugins/transport" |
| 16 | 16 |
"github.com/docker/go-connections/tlsconfig" |
| 17 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 18 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 19 | 17 |
"github.com/pkg/errors" |
| 18 |
+ "gotest.tools/assert" |
|
| 19 |
+ is "gotest.tools/assert/cmp" |
|
| 20 | 20 |
) |
| 21 | 21 |
|
| 22 | 22 |
var ( |
| ... | ... |
@@ -7,8 +7,8 @@ import ( |
| 7 | 7 |
"strings" |
| 8 | 8 |
"testing" |
| 9 | 9 |
|
| 10 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 11 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 10 |
+ "gotest.tools/assert" |
|
| 11 |
+ is "gotest.tools/assert/cmp" |
|
| 12 | 12 |
) |
| 13 | 13 |
|
| 14 | 14 |
func TestBufioReaderPoolGetWithNoReaderShouldCreateOne(t *testing.T) {
|
| ... | ... |
@@ -10,8 +10,8 @@ import ( |
| 10 | 10 |
"syscall" |
| 11 | 11 |
"testing" |
| 12 | 12 |
|
| 13 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 13 |
+ "gotest.tools/assert" |
|
| 14 |
+ is "gotest.tools/assert/cmp" |
|
| 15 | 15 |
) |
| 16 | 16 |
|
| 17 | 17 |
func buildTestBinary(t *testing.T, tmpdir string, prefix string) (string, string) {
|
| ... | ... |
@@ -10,8 +10,8 @@ import ( |
| 10 | 10 |
"github.com/docker/docker/pkg/jsonmessage" |
| 11 | 11 |
"github.com/google/go-cmp/cmp" |
| 12 | 12 |
"github.com/google/go-cmp/cmp/cmpopts" |
| 13 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 13 |
+ "gotest.tools/assert" |
|
| 14 |
+ is "gotest.tools/assert/cmp" |
|
| 15 | 15 |
) |
| 16 | 16 |
|
| 17 | 17 |
func TestRawProgressFormatterFormatStatus(t *testing.T) {
|
| ... | ... |
@@ -3,8 +3,8 @@ package term // import "github.com/docker/docker/pkg/term" |
| 3 | 3 |
import ( |
| 4 | 4 |
"testing" |
| 5 | 5 |
|
| 6 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 7 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 6 |
+ "gotest.tools/assert" |
|
| 7 |
+ is "gotest.tools/assert/cmp" |
|
| 8 | 8 |
) |
| 9 | 9 |
|
| 10 | 10 |
func TestToBytes(t *testing.T) {
|
| ... | ... |
@@ -9,9 +9,9 @@ import ( |
| 9 | 9 |
"time" |
| 10 | 10 |
|
| 11 | 11 |
"github.com/docker/docker/libcontainerd" |
| 12 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 13 | 12 |
"github.com/opencontainers/runtime-spec/specs-go" |
| 14 | 13 |
"github.com/pkg/errors" |
| 14 |
+ "gotest.tools/assert" |
|
| 15 | 15 |
) |
| 16 | 16 |
|
| 17 | 17 |
func TestLifeCycle(t *testing.T) {
|
| ... | ... |
@@ -13,9 +13,9 @@ import ( |
| 13 | 13 |
"github.com/docker/docker/pkg/stringid" |
| 14 | 14 |
"github.com/docker/docker/pkg/system" |
| 15 | 15 |
"github.com/docker/docker/plugin/v2" |
| 16 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 17 | 16 |
"github.com/opencontainers/runtime-spec/specs-go" |
| 18 | 17 |
"github.com/pkg/errors" |
| 18 |
+ "gotest.tools/skip" |
|
| 19 | 19 |
) |
| 20 | 20 |
|
| 21 | 21 |
func TestManagerWithPluginMounts(t *testing.T) {
|
| ... | ... |
@@ -9,9 +9,9 @@ import ( |
| 9 | 9 |
"testing" |
| 10 | 10 |
|
| 11 | 11 |
"github.com/docker/distribution/reference" |
| 12 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 13 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 14 | 12 |
"github.com/opencontainers/go-digest" |
| 13 |
+ "gotest.tools/assert" |
|
| 14 |
+ is "gotest.tools/assert/cmp" |
|
| 15 | 15 |
) |
| 16 | 16 |
|
| 17 | 17 |
var ( |
| ... | ... |
@@ -6,8 +6,8 @@ import ( |
| 6 | 6 |
"strings" |
| 7 | 7 |
"testing" |
| 8 | 8 |
|
| 9 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 10 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 9 |
+ "gotest.tools/assert" |
|
| 10 |
+ is "gotest.tools/assert/cmp" |
|
| 11 | 11 |
) |
| 12 | 12 |
|
| 13 | 13 |
func TestLoadAllowNondistributableArtifacts(t *testing.T) {
|
| ... | ... |
@@ -13,8 +13,8 @@ import ( |
| 13 | 13 |
"github.com/docker/distribution/registry/client/transport" |
| 14 | 14 |
"github.com/docker/docker/api/types" |
| 15 | 15 |
registrytypes "github.com/docker/docker/api/types/registry" |
| 16 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 17 |
- "github.com/gotestyourself/gotestyourself/skip" |
|
| 16 |
+ "gotest.tools/assert" |
|
| 17 |
+ "gotest.tools/skip" |
|
| 18 | 18 |
) |
| 19 | 19 |
|
| 20 | 20 |
var ( |
| ... | ... |
@@ -10,8 +10,8 @@ import ( |
| 10 | 10 |
"testing" |
| 11 | 11 |
"time" |
| 12 | 12 |
|
| 13 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 13 |
+ "gotest.tools/assert" |
|
| 14 |
+ is "gotest.tools/assert/cmp" |
|
| 15 | 15 |
) |
| 16 | 16 |
|
| 17 | 17 |
func TestResumableRequestHeaderSimpleErrors(t *testing.T) {
|
| ... | ... |
@@ -12,8 +12,8 @@ import ( |
| 12 | 12 |
"github.com/docker/docker/api/types/container" |
| 13 | 13 |
networktypes "github.com/docker/docker/api/types/network" |
| 14 | 14 |
"github.com/docker/docker/api/types/strslice" |
| 15 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 16 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 15 |
+ "gotest.tools/assert" |
|
| 16 |
+ is "gotest.tools/assert/cmp" |
|
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 | 19 |
type f struct {
|
| ... | ... |
@@ -10,8 +10,8 @@ import ( |
| 10 | 10 |
|
| 11 | 11 |
"github.com/docker/docker/api/types/container" |
| 12 | 12 |
"github.com/docker/docker/pkg/sysinfo" |
| 13 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 14 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 13 |
+ "gotest.tools/assert" |
|
| 14 |
+ is "gotest.tools/assert/cmp" |
|
| 15 | 15 |
) |
| 16 | 16 |
|
| 17 | 17 |
// TODO Windows: This will need addressing for a Windows daemon. |
| ... | ... |
@@ -18,7 +18,6 @@ golang.org/x/sys 37707fdb30a5b38865cfb95e5aab41707daec7fd |
| 18 | 18 |
github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1 |
| 19 | 19 |
github.com/docker/go-connections 7beb39f0b969b075d1325fecb092faf27fd357b6 |
| 20 | 20 |
golang.org/x/text f72d8390a633d5dfb0cc84043294db9f6c935756 |
| 21 |
-github.com/pmezard/go-difflib v1.0.0 |
|
| 22 | 21 |
gotest.tools v2.1.0 |
| 23 | 22 |
github.com/google/go-cmp v0.2.0 |
| 24 | 23 |
|
| ... | ... |
@@ -8,8 +8,8 @@ import ( |
| 8 | 8 |
"time" |
| 9 | 9 |
|
| 10 | 10 |
"github.com/boltdb/bolt" |
| 11 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 12 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 11 |
+ "gotest.tools/assert" |
|
| 12 |
+ is "gotest.tools/assert/cmp" |
|
| 13 | 13 |
) |
| 14 | 14 |
|
| 15 | 15 |
func TestSetGetMeta(t *testing.T) {
|
| ... | ... |
@@ -10,7 +10,7 @@ import ( |
| 10 | 10 |
volumedrivers "github.com/docker/docker/volume/drivers" |
| 11 | 11 |
"github.com/docker/docker/volume/service/opts" |
| 12 | 12 |
volumetestutils "github.com/docker/docker/volume/testutils" |
| 13 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 13 |
+ "gotest.tools/assert" |
|
| 14 | 14 |
) |
| 15 | 15 |
|
| 16 | 16 |
func TestRestore(t *testing.T) {
|
| ... | ... |
@@ -13,8 +13,8 @@ import ( |
| 13 | 13 |
"github.com/docker/docker/volume/local" |
| 14 | 14 |
"github.com/docker/docker/volume/service/opts" |
| 15 | 15 |
"github.com/docker/docker/volume/testutils" |
| 16 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 17 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 16 |
+ "gotest.tools/assert" |
|
| 17 |
+ is "gotest.tools/assert/cmp" |
|
| 18 | 18 |
) |
| 19 | 19 |
|
| 20 | 20 |
func TestLocalVolumeSize(t *testing.T) {
|
| ... | ... |
@@ -12,8 +12,8 @@ import ( |
| 12 | 12 |
volumedrivers "github.com/docker/docker/volume/drivers" |
| 13 | 13 |
"github.com/docker/docker/volume/service/opts" |
| 14 | 14 |
"github.com/docker/docker/volume/testutils" |
| 15 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 16 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 15 |
+ "gotest.tools/assert" |
|
| 16 |
+ is "gotest.tools/assert/cmp" |
|
| 17 | 17 |
) |
| 18 | 18 |
|
| 19 | 19 |
func TestServiceCreate(t *testing.T) {
|
| ... | ... |
@@ -15,8 +15,8 @@ import ( |
| 15 | 15 |
"github.com/docker/docker/volume/service/opts" |
| 16 | 16 |
volumetestutils "github.com/docker/docker/volume/testutils" |
| 17 | 17 |
"github.com/google/go-cmp/cmp" |
| 18 |
- "github.com/gotestyourself/gotestyourself/assert" |
|
| 19 |
- is "github.com/gotestyourself/gotestyourself/assert/cmp" |
|
| 18 |
+ "gotest.tools/assert" |
|
| 19 |
+ is "gotest.tools/assert/cmp" |
|
| 20 | 20 |
) |
| 21 | 21 |
|
| 22 | 22 |
func TestCreate(t *testing.T) {
|