8e2d63d5df
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>
80 lines
1.7 KiB
Go
80 lines
1.7 KiB
Go
package builders
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
)
|
|
|
|
// Container creates a container with default values.
|
|
// Any number of container function builder can be passed to augment it.
|
|
func Container(name string, builders ...func(container *types.Container)) *types.Container {
|
|
// now := time.Now()
|
|
// onehourago := now.Add(-120 * time.Minute)
|
|
container := &types.Container{
|
|
ID: "container_id",
|
|
Names: []string{"/" + name},
|
|
Command: "top",
|
|
Image: "busybox:latest",
|
|
Status: "Up 1 minute",
|
|
Created: time.Now().Add(-1 * time.Minute).Unix(),
|
|
}
|
|
|
|
for _, builder := range builders {
|
|
builder(container)
|
|
}
|
|
|
|
return container
|
|
}
|
|
|
|
// WithLabel adds a label to the container
|
|
func WithLabel(key, value string) func(*types.Container) {
|
|
return func(c *types.Container) {
|
|
if c.Labels == nil {
|
|
c.Labels = map[string]string{}
|
|
}
|
|
c.Labels[key] = value
|
|
}
|
|
}
|
|
|
|
// WithName adds a name to the container
|
|
func WithName(name string) func(*types.Container) {
|
|
return func(c *types.Container) {
|
|
c.Names = append(c.Names, "/"+name)
|
|
}
|
|
}
|
|
|
|
// WithPort adds a port mapping to the container
|
|
func WithPort(privateport, publicport uint16, builders ...func(*types.Port)) func(*types.Container) {
|
|
return func(c *types.Container) {
|
|
if c.Ports == nil {
|
|
c.Ports = []types.Port{}
|
|
}
|
|
port := &types.Port{
|
|
PrivatePort: privateport,
|
|
PublicPort: publicport,
|
|
}
|
|
for _, builder := range builders {
|
|
builder(port)
|
|
}
|
|
c.Ports = append(c.Ports, *port)
|
|
}
|
|
}
|
|
|
|
// IP sets the ip of the port
|
|
func IP(ip string) func(*types.Port) {
|
|
return func(p *types.Port) {
|
|
p.IP = ip
|
|
}
|
|
}
|
|
|
|
// TCP sets the port to tcp
|
|
func TCP(p *types.Port) {
|
|
p.Type = "tcp"
|
|
}
|
|
|
|
// UDP sets the port to udp
|
|
func UDP(p *types.Port) {
|
|
p.Type = "udp"
|
|
}
|