26be2bc6b9
The `client` variable was colliding with the `client` import in various files. While it didn't conflict in all files, there was inconsistency in the naming, sometimes using the confusing `cli` name (it's not the "cli"), and such names can easily start spreading (through copy/paste, or "code by example"). Let's make a one-time pass through all of them in this package to use the same name. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
42 lines
1.4 KiB
Go
42 lines
1.4 KiB
Go
package container // import "github.com/docker/docker/integration/container"
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
"time"
|
|
|
|
containertypes "github.com/docker/docker/api/types/container"
|
|
"github.com/docker/docker/integration/internal/container"
|
|
"gotest.tools/v3/assert"
|
|
"gotest.tools/v3/poll"
|
|
"gotest.tools/v3/skip"
|
|
)
|
|
|
|
func TestDiff(t *testing.T) {
|
|
skip.If(t, testEnv.DaemonInfo.OSType == "windows", "FIXME")
|
|
defer setupTest(t)()
|
|
apiClient := testEnv.APIClient()
|
|
ctx := context.Background()
|
|
|
|
cID := container.Run(ctx, t, apiClient, container.WithCmd("sh", "-c", `mkdir /foo; echo xyzzy > /foo/bar`))
|
|
|
|
// Wait for it to exit as cannot diff a running container on Windows, and
|
|
// it will take a few seconds to exit. Also there's no way in Windows to
|
|
// differentiate between an Add or a Modify, and all files are under
|
|
// a "Files/" prefix.
|
|
expected := []containertypes.FilesystemChange{
|
|
{Kind: containertypes.ChangeAdd, Path: "/foo"},
|
|
{Kind: containertypes.ChangeAdd, Path: "/foo/bar"},
|
|
}
|
|
if testEnv.DaemonInfo.OSType == "windows" {
|
|
poll.WaitOn(t, container.IsInState(ctx, apiClient, cID, "exited"), poll.WithDelay(100*time.Millisecond), poll.WithTimeout(60*time.Second))
|
|
expected = []containertypes.FilesystemChange{
|
|
{Kind: containertypes.ChangeModify, Path: "Files/foo"},
|
|
{Kind: containertypes.ChangeModify, Path: "Files/foo/bar"},
|
|
}
|
|
}
|
|
|
|
items, err := apiClient.ContainerDiff(ctx, cID)
|
|
assert.NilError(t, err)
|
|
assert.DeepEqual(t, expected, items)
|
|
}
|