Sebastiaan van Stijn 973ca00d60 reduce flakiness of TestSwarmLockUnlockCluster and TestSwarmJoinPromoteLocked ...

I noticed that this test failed, because the node was in status "pending".

The test checks for the node's status immediately after it was restarted, so
possibly it needs some time to unlock.

    14:07:10 FAIL: docker_cli_swarm_test.go:1128: DockerSwarmSuite.TestSwarmLockUnlockCluster
    ...
    14:07:10 docker_cli_swarm_test.go:1168:
    14:07:10     checkSwarmLockedToUnlocked(c, d)
    14:07:10 docker_cli_swarm_test.go:1017:
    14:07:10     c.Assert(getNodeStatus(c, d), checker.Equals, swarm.LocalNodeStateActive)
    14:07:10 ... obtained swarm.LocalNodeState = "pending"
    14:07:10 ... expected swarm.LocalNodeState = "active"

This patch adds a `waitAndAssert` for the node's status, with a 1 second timeout.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

2019-01-12 20:42:18 +01:00

..

checker

Add canonical import comment

2018-02-05 16:51:57 -05:00

cli

Update tests to use gotest.tools 👼

2018-06-13 09:04:30 +02:00

daemon

Test: Replace NewClient() with NewClientT()

2018-12-22 15:53:02 +01:00

environment

Various code-cleanup

2018-05-23 17:50:54 +02:00

fixtures

Clean some integration-cli/fixtures package/files

2018-04-16 10:48:58 +02:00

requirement

Add canonical import comment

2018-02-05 16:51:57 -05:00

testdata

Clean some integration-cli/fixtures package/files

2018-04-16 10:48:58 +02:00

benchmark_test.go

…

check_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

daemon_swarm_hack_test.go

Make internal/test/daemon.Daemon swarm aware

2018-04-11 12:10:17 +02:00

docker_api_attach_test.go

Remove use of deprecated client.NewEnvClient()

2019-01-03 22:49:00 +01:00

docker_api_build_test.go

integration-cli/build: don't panic

2018-12-20 18:51:57 -08:00

docker_api_build_windows_test.go

Update tests to use gotest.tools 👼

2018-06-13 09:04:30 +02:00

docker_api_containers_test.go

Remove use of deprecated client.NewEnvClient()

2019-01-03 22:49:00 +01:00

docker_api_containers_windows_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

docker_api_exec_resize_test.go

Fix race condition between exec start and resize

2018-06-08 11:07:48 +08:00

docker_api_exec_test.go

Remove use of deprecated client.NewEnvClient()

2019-01-03 22:49:00 +01:00

docker_api_images_test.go

Remove use of deprecated client.NewEnvClient()

2019-01-03 22:49:00 +01:00

docker_api_inspect_test.go

Remove use of deprecated client.NewEnvClient()

2019-01-03 22:49:00 +01:00

docker_api_logs_test.go

Remove use of deprecated client.NewEnvClient()

2019-01-03 22:49:00 +01:00

docker_api_network_test.go

migrate TestAPINetworkCreateDelete from integration-cli/ to integration/

2018-06-15 16:06:45 -04:00

docker_api_stats_test.go

Remove use of deprecated client.NewEnvClient()

2019-01-03 22:49:00 +01:00

docker_api_swarm_node_test.go

integration-cli/Test*Swarm*: use same args on restart

2018-11-01 13:25:12 -07:00

docker_api_swarm_service_test.go

Merge pull request #38417 from thaJeztah/replace_newclient

2019-01-04 23:37:00 -08:00

docker_api_swarm_test.go

Merge pull request #38417 from thaJeztah/replace_newclient

2019-01-04 23:37:00 -08:00

docker_api_test.go

fix and skip some tests based on API version

2018-05-15 16:05:04 -07:00

docker_cli_attach_test.go

Update tests to use gotest.tools 👼

2018-06-13 09:04:30 +02:00

docker_cli_attach_unix_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

docker_cli_build_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

docker_cli_build_unix_test.go

Update tests to use gotest.tools 👼

2018-06-13 09:04:30 +02:00

docker_cli_by_digest_test.go

Update tests to use gotest.tools 👼

2018-06-13 09:04:30 +02:00

docker_cli_commit_test.go

Fix ineffassign linting

2018-07-11 22:18:45 +02:00

docker_cli_cp_from_container_test.go

Migrate some copy tests to integration

2018-02-27 16:48:35 -05:00

docker_cli_cp_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

docker_cli_cp_to_container_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

docker_cli_cp_to_container_unix_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

docker_cli_cp_utils_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

docker_cli_create_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

docker_cli_daemon_plugins_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

docker_cli_daemon_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

docker_cli_events_test.go

Remove use of deprecated client.NewEnvClient()

2019-01-03 22:49:00 +01:00

docker_cli_events_unix_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

docker_cli_exec_test.go

Remove use of deprecated client.NewEnvClient()

2019-01-03 22:49:00 +01:00

docker_cli_exec_unix_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

docker_cli_external_volume_driver_unix_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

docker_cli_health_test.go

Fix ineffassign linting

2018-07-11 22:18:45 +02:00

docker_cli_history_test.go

…

docker_cli_images_test.go

Update tests to use gotest.tools 👼

2018-06-13 09:04:30 +02:00

docker_cli_import_test.go

Update tests to use gotest.tools 👼

2018-06-13 09:04:30 +02:00

docker_cli_info_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

docker_cli_info_unix_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

docker_cli_inspect_test.go

Update tests to use gotest.tools 👼

2018-06-13 09:04:30 +02:00

docker_cli_links_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

docker_cli_login_test.go

integration: use %s for check.Commentf()

2018-08-14 10:45:39 +03:00

docker_cli_logout_test.go

integration: use %s for check.Commentf()

2018-08-14 10:45:39 +03:00

docker_cli_logs_bench_test.go

…

docker_cli_logs_test.go

integration: use %s for check.Commentf()

2018-08-14 10:45:39 +03:00

docker_cli_netmode_test.go

fix and skip some tests based on API version

2018-05-15 16:05:04 -07:00

docker_cli_network_unix_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

docker_cli_plugins_logdriver_test.go

Remove use of deprecated client.NewEnvClient()

2019-01-03 22:49:00 +01:00

docker_cli_plugins_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

docker_cli_port_test.go

…

docker_cli_proxy_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

docker_cli_prune_unix_test.go

Update tests to use gotest.tools 👼

2018-06-13 09:04:30 +02:00

docker_cli_ps_test.go

Fix ineffassign linting

2018-07-11 22:18:45 +02:00

docker_cli_pull_local_test.go

Update tests to use gotest.tools 👼

2018-06-13 09:04:30 +02:00

docker_cli_pull_test.go

Disallow using legacy (V1) registries

2017-12-09 02:24:43 -08:00

docker_cli_push_test.go

integration: use %s for check.Commentf()

2018-08-14 10:45:39 +03:00

docker_cli_registry_user_agent_test.go

Move and refactor integration-cli/registry to internal/test

2018-04-13 10:45:34 +02:00

docker_cli_restart_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

docker_cli_rmi_test.go

Update tests to use gotest.tools 👼

2018-06-13 09:04:30 +02:00

docker_cli_run_test.go

Remove use of deprecated client.NewEnvClient()

2019-01-03 22:49:00 +01:00

docker_cli_run_unix_test.go

Merge pull request #38486 from thaJeztah/dont_use_deprecated_envclient

2019-01-05 11:23:19 +01:00

docker_cli_save_load_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

docker_cli_save_load_unix_test.go

Update tests to use gotest.tools 👼

2018-06-13 09:04:30 +02:00

docker_cli_search_test.go

integration: use %s for check.Commentf()

2018-08-14 10:45:39 +03:00

docker_cli_service_create_test.go

integration: use %s for check.Commentf()

2018-08-14 10:45:39 +03:00

docker_cli_service_health_test.go

integration: use %s for check.Commentf()

2018-08-14 10:45:39 +03:00

docker_cli_service_logs_test.go

Update tests to use gotest.tools 👼

2018-06-13 09:04:30 +02:00

docker_cli_service_scale_test.go

Fix ineffassign linting

2018-07-11 22:18:45 +02:00

docker_cli_sni_test.go

Various code-cleanup

2018-05-23 17:50:54 +02:00

docker_cli_start_test.go

TestStartReturnCorrectExitCode: show error

2018-09-11 12:43:30 -07:00

docker_cli_stats_test.go

Fix tests creating zombie processes

2017-10-20 07:11:38 -07:00

docker_cli_swarm_test.go

reduce flakiness of TestSwarmLockUnlockCluster and TestSwarmJoinPromoteLocked

2019-01-12 20:42:18 +01:00

docker_cli_swarm_unix_test.go

integration: use %s for check.Commentf()

2018-08-14 10:45:39 +03:00

docker_cli_top_test.go

Update tests to use gotest.tools 👼

2018-06-13 09:04:30 +02:00

docker_cli_update_unix_test.go

Remove use of deprecated client.NewEnvClient()

2019-01-03 22:49:00 +01:00

docker_cli_userns_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

docker_cli_v2_only_test.go

Move and refactor integration-cli/registry to internal/test

2018-04-13 10:45:34 +02:00

docker_cli_volume_test.go

Remove use of deprecated client.NewEnvClient()

2019-01-03 22:49:00 +01:00

docker_deprecated_api_v124_test.go

fix and skip some tests based on API version

2018-05-15 16:05:04 -07:00

docker_deprecated_api_v124_unix_test.go

Move integration-cli/request to internal/test/request…

2018-04-17 16:25:59 +02:00

docker_hub_pull_suite_test.go

Remove SameHostDaemon, use testEnv.IsLocalDaemon instead

2018-12-24 13:25:53 +01:00

docker_utils_test.go

Remove use of deprecated client.NewEnvClient()

2019-01-03 22:49:00 +01:00

events_utils_test.go

Update libcontainerd to use containerd 1.0

2017-10-20 07:11:37 -07:00

fixtures_linux_daemon_test.go

Clean some integration-cli/fixtures package/files

2018-04-16 10:48:58 +02:00

requirements_test.go

Remove use of deprecated client.NewEnvClient()

2019-01-03 22:49:00 +01:00

requirements_unix_test.go

Skip kernel-memory tests on RHEL/CentOS daemons

2019-01-04 13:27:46 +01:00

test_vars_exec_test.go

…

test_vars_noexec_test.go

…

test_vars_noseccomp_test.go

…

test_vars_seccomp_test.go

…

test_vars_test.go

Remove deprecated environment.DaemonPlatform()

2018-01-15 15:32:06 +01:00

test_vars_unix_test.go

…

test_vars_windows_test.go

…

utils_test.go

Update tests to use gotest.tools 👼

2018-06-13 09:04:30 +02:00