Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[19.03 backport] test-fixes and improvements #267

Merged
merged 3 commits into from
Jun 11, 2019
Merged

[19.03 backport] test-fixes and improvements #267

merged 3 commits into from
Jun 11, 2019

Conversation

thaJeztah
Copy link
Member

backports for 19.03 of;

cpuguy83 and others added 3 commits June 7, 2019 14:10
@cpuguy83 @thaJeztah
Optimize test daemon startup
48786ba 
This adds some logs, handles timers better, and sets a request timeout
for the ping request.

I'm not sure the ticker in that loop is what we really want since the
ticker keeps ticking while we are (attempting) to make a request... but
I opted to not change that for now.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 20ea894)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@cpuguy83 @thaJeztah
Add log entries for daemon startup/shutdown
a24b908 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 595987f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Harden TestPsListContainersFilterExited
020bb75 
This test runs on a daemon also used by other tests
so make sure we don't get failures if another test
doesn't cleanup or is running in parallel.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 915acff)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 19.03.0 milestone Jun 7, 2019
@thaJeztah
Copy link
Member Author

ping @kolyshkin @cpuguy83

@thaJeztah thaJeztah mentioned this pull request Jun 7, 2019
Closed
4 tasks
@thaJeztah
Copy link
Member Author

thaJeztah commented Jun 11, 2019 •
edited by andrewhsu

This one looks a bit flaky;

08:04:24 --- FAIL: TestStopContainerWithTimeout (0.01s)
08:04:24     --- PASS: TestStopContainerWithTimeout/0 (0.83s)
08:04:24     --- PASS: TestStopContainerWithTimeout/-1 (3.24s)
08:04:24     --- PASS: TestStopContainerWithTimeout/3 (2.53s)
08:04:24     --- FAIL: TestStopContainerWithTimeout/1 (3.28s)
08:04:24         stop_linux_test.go:68: assertion failed: 42 (inspect.State.ExitCode int) != 137 (d.expectedExitCode int)

@andrewhsu
Copy link

Looks like this one passed with rekick:

00:24:10.192 === RUN   TestStopContainerWithTimeout
00:24:10.197 === RUN   TestStopContainerWithTimeout/0
00:24:10.197 === PAUSE TestStopContainerWithTimeout/0
00:24:10.198 === RUN   TestStopContainerWithTimeout/1
00:24:10.198 === PAUSE TestStopContainerWithTimeout/1
00:24:10.198 === RUN   TestStopContainerWithTimeout/3
00:24:10.198 === PAUSE TestStopContainerWithTimeout/3
00:24:10.198 === RUN   TestStopContainerWithTimeout/-1
00:24:10.198 === PAUSE TestStopContainerWithTimeout/-1
00:24:10.210 === CONT  TestStopContainerWithTimeout/0
00:24:10.212 === CONT  TestStopContainerWithTimeout/3
00:24:11.022 === CONT  TestStopContainerWithTimeout/1
00:24:12.557 === CONT  TestStopContainerWithTimeout/-1
00:24:15.049 --- PASS: TestStopContainerWithTimeout (0.02s)
00:24:15.049     --- PASS: TestStopContainerWithTimeout/0 (0.81s)
00:24:15.049     --- PASS: TestStopContainerWithTimeout/1 (1.54s)
00:24:15.049     --- PASS: TestStopContainerWithTimeout/3 (3.25s)
00:24:15.049     --- PASS: TestStopContainerWithTimeout/-1 (2.49s)

andrewhsu
andrewhsu approved these changes Jun 11, 2019
View reviewed changes
Copy link

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@andrewhsu andrewhsu merged commit a33a82b into docker:19.03 Jun 11, 2019
@thaJeztah thaJeztah deleted the 19.03_backport_test_fixes branch June 12, 2019 06:30
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@andrewhsu andrewhsu andrewhsu approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
19.03.0
3 participants
@thaJeztah @andrewhsu @cpuguy83