Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix flaky TestContainerList tests 

These tests were creating a stub container, using the current timestamp as
created date. However, if CI was slow to run the test, `Less than a second ago`
would change into `1 second ago`, causing the test to fail:

    --- FAIL: TestContainerListNoTrunc (0.00s)
        list_test.go:198: assertion failed:
            --- expected
            +++ actual
            @@ -1,4 +1,4 @@
            -CONTAINER ID   IMAGE            COMMAND   CREATED                  STATUS        PORTS     NAMES
            -container_id   busybox:latest   "top"     Less than a second ago   Up 1 second             c1
            -container_id   busybox:latest   "top"     Less than a second ago   Up 1 second             c2,foo/bar
            +CONTAINER ID   IMAGE            COMMAND   CREATED        STATUS        PORTS     NAMES
            +container_id   busybox:latest   "top"     1 second ago   Up 1 second             c1
            +container_id   busybox:latest   "top"     1 second ago   Up 1 second             c2,foo/bar

This patch changes the "created" time of the container to be a minute ago. This
will result in `About a minute ago`, with a margin of 1 minute.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-03-28 20:37:06 +02:00
parent 5a1e151c02
commit 8e2d63d5df
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/command/container/testdata/container-list-without-format-no-trunc.golden vendored
View File

@ -1,3 +1,3 @@
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
container_id busybox:latest "top" Less than a second ago Up 1 second c1 container_id busybox:latest "top" About a minute ago Up 1 minute c1
container_id busybox:latest "top" Less than a second ago Up 1 second c2,foo/bar container_id busybox:latest "top" About a minute ago Up 1 minute c2,foo/bar

12
cli/command/container/testdata/container-list-without-format.golden vendored
View File

@ -1,6 +1,6 @@
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
container_id busybox:latest "top" Less than a second ago Up 1 second c1 container_id busybox:latest "top" About a minute ago Up 1 minute c1
container_id busybox:latest "top" Less than a second ago Up 1 second c2 container_id busybox:latest "top" About a minute ago Up 1 minute c2
container_id busybox:latest "top" Less than a second ago Up 1 second 80-82/tcp c3 container_id busybox:latest "top" About a minute ago Up 1 minute 80-82/tcp c3
container_id busybox:latest "top" Less than a second ago Up 1 second 81/udp c4 container_id busybox:latest "top" About a minute ago Up 1 minute 81/udp c4
container_id busybox:latest "top" Less than a second ago Up 1 second 8.8.8.8:82->82/tcp c5 container_id busybox:latest "top" About a minute ago Up 1 minute 8.8.8.8:82->82/tcp c5

4
internal/test/builders/container.go
View File

@ -16,8 +16,8 @@ func Container(name string, builders ...func(container *types.Container)) *types
Names: []string{"/" + name}, Names: []string{"/" + name},
Command: "top", Command: "top",
Image: "busybox:latest", Image: "busybox:latest",
Status: "Up 1 second", Status: "Up 1 minute",
Created: time.Now().Unix(), Created: time.Now().Add(-1 * time.Minute).Unix(),
} }
for _, builder := range builders { for _, builder := range builders {