kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #21750 from LK4D4/flaky_format_test

Browse source 
integration-cli: try to make TestEventsTimestampFormats less flaky
This commit is contained in:
Sebastiaan van Stijn 2016-04-07 13:42:17 -07:00
commit 14015eedb1
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
integration-cli/docker_cli_events_test.go
View file

@ -18,14 +18,13 @@ import (
) )
func (s *DockerSuite) TestEventsTimestampFormats(c *check.C) { func (s *DockerSuite) TestEventsTimestampFormats(c *check.C) {
image := "busybox" name := "events-time-format-test"
// Start stopwatch, generate an event // Start stopwatch, generate an event
time.Sleep(1 * time.Second) // so that we don't grab events from previous test occurred in the same second
start := daemonTime(c) start := daemonTime(c)
dockerCmd(c, "tag", image, "timestamptest:1") time.Sleep(1100 * time.Millisecond) // so that first event occur in different second from since (just for the case)
dockerCmd(c, "rmi", "timestamptest:1") dockerCmd(c, "run", "--rm", "--name", name, "busybox", "true")
time.Sleep(1 * time.Second) // so that until > since time.Sleep(1100 * time.Millisecond) // so that until > since
end := daemonTime(c) end := daemonTime(c)
// List of available time formats to --since // List of available time formats to --since
@ -37,9 +36,19 @@ func (s *DockerSuite) TestEventsTimestampFormats(c *check.C) {
for _, f := range []func(time.Time) string{unixTs, rfc3339, duration} { for _, f := range []func(time.Time) string{unixTs, rfc3339, duration} {
since, until := f(start), f(end) since, until := f(start), f(end)
out, _ := dockerCmd(c, "events", "--since="+since, "--until="+until) out, _ := dockerCmd(c, "events", "--since="+since, "--until="+until)
events := strings.Split(strings.TrimSpace(out), "\n") events := strings.Split(out, "\n")
c.Assert(events, checker.HasLen, 2, check.Commentf("unexpected events, was expecting only 2 events tag/untag (since=%s, until=%s) out=%s", since, until, out)) events = events[:len(events)-1]
c.Assert(out, checker.Contains, "untag", check.Commentf("expected 'untag' event not found (since=%s, until=%s)", since, until))
nEvents := len(events)
c.Assert(nEvents, checker.GreaterOrEqualThan, 5) //Missing expected event
containerEvents := eventActionsByIDAndType(c, events, name, "container")
c.Assert(containerEvents, checker.HasLen, 5, check.Commentf("events: %v", events))
c.Assert(containerEvents[0], checker.Equals, "create", check.Commentf(out))
c.Assert(containerEvents[1], checker.Equals, "attach", check.Commentf(out))
c.Assert(containerEvents[2], checker.Equals, "start", check.Commentf(out))
c.Assert(containerEvents[3], checker.Equals, "die", check.Commentf(out))
c.Assert(containerEvents[4], checker.Equals, "destroy", check.Commentf(out))
} }
} }