-
Notifications
You must be signed in to change notification settings - Fork 422
[18.09 backport] test-fixes and updates, and fix images filter when use multi reference filter #198
[18.09 backport] test-fixes and updates, and fix images filter when use multi reference filter #198
Conversation
Signed-off-by: Xiaoxi He <xxhe@alauda.io> (cherry picked from commit 5c0d2a0) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com> (cherry picked from commit febefb8) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: zhangyue <zy675793960@yeah.net> (cherry picked from commit 5007c36) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 2cb7b73) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
`testEnv` is a package-level variable, so protecting / restoring `testEnv` in parallel will result in "concurrent map write" errors. This patch removes `t.Parallel()` from tests that use this functionality (through `defer setupTest(t)()`). Note that _subtests_ can still be run in parallel, as the defer will be called after all subtests have completed. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 4d88a95) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Ah;
|
A client is already created in testenv.New(), so we can just as well use that one, instead of creating a new client. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 0de62d9) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1d45d47
to
39b217e
Compare
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit a3948d1) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
These tests can only be run on a local Linux daemon, so there's no need to build them on Windows Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 8422493) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
These tests are run on a local Linux daemon only, so no need to do a platform-check. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 69c0b7e) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 263e28a) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit c8ff5ec) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This fix removes code duplication and consolidates networkIsRemoved into one place. Signed-off-by: Yong Tang <yong.tang.github@outlook.com> (cherry picked from commit 28b7824) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Clean up and refactor this test; - make `serviceRunningTasksCount` to use a `desired-state` filter - use subtests, and inline the `validNetworkVerbose` checks; also use asserts for the individual checks, so that any failure will log exactly what failed - remove helper functions that are no longer needed Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 60d93aa) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This introduces `NoTasksForService` and `NoTasks` poller checks, that can be used to check if no tasks are left in general, or for a specific service. Some redundant checks were also removed from some tests. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 56a68c1) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 3105ca2) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 8d3fecc) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This fix uses poll.WaitOn to replace customerized implementation in authz_plugin_test.go Signed-off-by: Yong Tang <yong.tang.github@outlook.com> (cherry picked from commit 0492b09) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 2e326eb) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 3449b12) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 3a4bb96) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Favor `d.NewClientT` instead. Signed-off-by: Brian Goff <cpuguy83@gmail.com> (cherry picked from commit e063099) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
It looks like the logic of the test became wrong after commit ae0883c ("Move TestAttachDetach to integration-cli"). The original logic was: * (a few first steps skipped for clarity) * send escape sequence to "attach"; * check "attach" is exiting (i.e. escape sequence works); * check the container is still alive; * kill the container. Also, timeouts were big at that time, in the order of seconds. The logic after the above mentioned commit and until now is: * ... * send escape sequence to "attach"; * check the container is running (why shouldn't it?); * kill the container; * checks that the "attach" has exited. So, from the "let's check detach using escape sequence is working" the test became something like "let's check that attach is gone once we kill the container". Let's fix the above test, also increasing the timeout waiting for attach to exit (which fails from time to time on power CI). Now, the second test, TestAttachDetachTruncatedID, does the exact same thing, except it uses a truncated container ID. It does not seem to be of much value, so let's remove it. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 9f3a343) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
…nkBreakout) Signed-off-by: John Howard <jhoward@microsoft.com> (cherry picked from commit b1b9937) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 0d59f43) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1. Using MNT_FORCE flag does not make sense for nsfs. Using MNT_DETACH though might help. 2. When -check.vv is added to TESTFLAGS, there are a lot of messages like this one: > unmount of /tmp/dxr/d847fd103a4ba/netns failed: invalid argument and some like > unmount of /tmp/dxr/dd245af642d94/netns failed: no such file or directory The first one means directory is not a mount point, the second one means it's gone. Do ignore both of these. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 73baee2) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
A timer is leaking on every daemon start and stop. Probably nothing major, but given the amount of daemon starts/stops during tests, it's better to be accurate about it. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 6016520) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 39eaf1e) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Since container.Create() already initializes HostConfig to be non-nil, there is no need for this code. Remove it. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 17022b3) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
NOTE TestUpdateRestartPolicy is left as is as otherwise it will decrease its readability. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit f664df0) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Move the test case from integration-cli to integration. The test logic itself has not changed, except these two things: * the new test sets default-ipc-mode via command line rather than via daemon.json (less code); * the new test uses current API version. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 9fd765f) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 86f2ac4) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 6345208) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
39b217e
to
9a4d7bb
Compare
Ah, must've missed one
|
Ah; it's a test that's removed on master, that's why |
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Power and s390 passed (except for Experimental; https://jenkins.dockerproject.org/job/Docker-PRs-experimental/44998/console
restarting janky and experimental |
Added moby#39095 Use existing Windows image for test instead of microsoft/nanoserver to fix the |
Ah, dang, of course the fix won't work without #197
|
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com> (cherry picked from commit aad7e97) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Added moby#39095 Use existing Windows image for test instead of microsoft/nanoserver |
b92f3b0
to
04d0295
Compare
Only failure on experimental is a flaky test moby#38521
|
ping @kolyshkin @vdemeester @andrewhsu PTAL 🤗 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM for test fixes
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 🐅
Backports for 18.09 of:
d.NewClient
from testing tools moby/moby#38686 Completely remove deprecatedd.NewClient
from testing tools