Skip to content

Test rework, part 3 #3464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 4, 2024
Merged

Test rework, part 3 #3464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
346b492
Test tooling fixes
apostasie Sep 25, 2024
19fa3d9
Increase delay of delayOnceReader to reduce flakyness of TestAttach
apostasie Sep 25, 2024
5ce1e4b
Fix parallelism for docker
apostasie Sep 26, 2024
2c1a5b8
Fix tests broken by tooling update
apostasie Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions cmd/nerdctl/container/container_create_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,16 @@ func TestIssue2993(t *testing.T) {
testCase := &test.Group{
{
Description: "Issue #2993 - nerdctl no longer leaks containers and etchosts directories and files when container creation fails.",
Require: nerdtest.Private,
Setup: func(data test.Data, helpers test.Helpers) {
helpers.Ensure("run", "--name", data.Identifier(), "-d", testutil.AlpineImage, "sleep", "infinity")
dataRoot := data.TempDir()

helpers.Ensure("run", "--data-root", dataRoot, "--name", data.Identifier(), "-d", testutil.AlpineImage, "sleep", "infinity")

dataRoot := string(data.ReadConfig(nerdtest.DataRoot))
h := getAddrHash(defaults.DefaultAddress)
dataStore := filepath.Join(dataRoot, h)
namespace := data.Identifier()

// FIXME: update with next tooling iteration to retrieve from the command
namespace := "nerdctl-test"

containersPath := filepath.Join(dataStore, "containers", namespace)
containersDirs, err := os.ReadDir(containersPath)
Expand All @@ -229,10 +231,10 @@ func TestIssue2993(t *testing.T) {
data.Set(etchostsPathKey, etchostsPath)
},
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("rm", "-f", data.Identifier())
helpers.Anyhow("rm", "--data-root", data.TempDir(), "-f", data.Identifier())
},
Command: func(data test.Data, helpers test.Helpers) test.Command {
return helpers.Command("run", "--name", data.Identifier(), "-d", testutil.AlpineImage, "sleep", "infinity")
return helpers.Command("run", "--data-root", data.TempDir(), "--name", data.Identifier(), "-d", testutil.AlpineImage, "sleep", "infinity")
},
Expected: func(data test.Data, helpers test.Helpers) *test.Expected {
return &test.Expected{
Expand All @@ -252,14 +254,16 @@ func TestIssue2993(t *testing.T) {
},
{
Description: "Issue #2993 - nerdctl no longer leaks containers and etchosts directories and files when containers are removed.",
Require: nerdtest.Private,
Setup: func(data test.Data, helpers test.Helpers) {
helpers.Ensure("run", "--name", data.Identifier(), "-d", testutil.AlpineImage, "sleep", "infinity")
dataRoot := data.TempDir()

helpers.Ensure("run", "--data-root", dataRoot, "--name", data.Identifier(), "-d", testutil.AlpineImage, "sleep", "infinity")

dataRoot := string(data.ReadConfig(nerdtest.DataRoot))
h := getAddrHash(defaults.DefaultAddress)
dataStore := filepath.Join(dataRoot, h)
namespace := data.Identifier()

// FIXME: update with next tooling iteration to retrieve from the command
namespace := "nerdctl-test"

containersPath := filepath.Join(dataStore, "containers", namespace)
containersDirs, err := os.ReadDir(containersPath)
Expand All @@ -275,10 +279,10 @@ func TestIssue2993(t *testing.T) {
data.Set(etchostsPathKey, etchostsPath)
},
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("rm", "-f", data.Identifier())
helpers.Anyhow("--data-root", data.TempDir(), "rm", "-f", data.Identifier())
},
Command: func(data test.Data, helpers test.Helpers) test.Command {
return helpers.Command("rm", "-f", data.Identifier())
return helpers.Command("--data-root", data.TempDir(), "rm", "-f", data.Identifier())
},
Expected: func(data test.Data, helpers test.Helpers) *test.Expected {
return &test.Expected{
Expand Down
77 changes: 41 additions & 36 deletions cmd/nerdctl/network/network_prune_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,45 +27,50 @@ import (
func TestNetworkPrune(t *testing.T) {
nerdtest.Setup()

testGroup := &test.Group{
{
Description: "Prune does not collect started container network",
Require: nerdtest.Private,
Setup: func(data test.Data, helpers test.Helpers) {
helpers.Ensure("network", "create", data.Identifier())
helpers.Ensure("run", "-d", "--net", data.Identifier(), "--name", data.Identifier(), testutil.NginxAlpineImage)
},
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("rm", "-f", data.Identifier())
helpers.Anyhow("network", "rm", data.Identifier())
},
Command: test.RunCommand("network", "prune", "-f"),
Expected: func(data test.Data, helpers test.Helpers) *test.Expected {
return &test.Expected{
Output: test.DoesNotContain(data.Identifier()),
}
},
},
{
Description: "Prune does collect stopped container network",
Require: nerdtest.Private,
Setup: func(data test.Data, helpers test.Helpers) {
helpers.Ensure("network", "create", data.Identifier())
helpers.Ensure("run", "-d", "--net", data.Identifier(), "--name", data.Identifier(), testutil.NginxAlpineImage)
helpers.Ensure("stop", data.Identifier())
},
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("rm", "-f", data.Identifier())
helpers.Anyhow("network", "rm", data.Identifier())
testCase := &test.Case{
Description: "TestNetworkPrune",
Require: nerdtest.Private,

SubTests: []*test.Case{
{
Description: "Prune does not collect started container network",
NoParallel: true,
Setup: func(data test.Data, helpers test.Helpers) {
helpers.Ensure("network", "create", data.Identifier())
helpers.Ensure("run", "-d", "--net", data.Identifier(), "--name", data.Identifier(), testutil.NginxAlpineImage)
},
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("rm", "-f", data.Identifier())
helpers.Anyhow("network", "rm", data.Identifier())
},
Command: test.RunCommand("network", "prune", "-f"),
Expected: func(data test.Data, helpers test.Helpers) *test.Expected {
return &test.Expected{
Output: test.DoesNotContain(data.Identifier()),
}
},
},
Command: test.RunCommand("network", "prune", "-f"),
Expected: func(data test.Data, helpers test.Helpers) *test.Expected {
return &test.Expected{
Output: test.Contains(data.Identifier()),
}
{
Description: "Prune does collect stopped container network",
NoParallel: true,
Setup: func(data test.Data, helpers test.Helpers) {
helpers.Ensure("network", "create", data.Identifier())
helpers.Ensure("run", "-d", "--net", data.Identifier(), "--name", data.Identifier(), testutil.NginxAlpineImage)
helpers.Ensure("stop", data.Identifier())
},
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("rm", "-f", data.Identifier())
helpers.Anyhow("network", "rm", data.Identifier())
},
Command: test.RunCommand("network", "prune", "-f"),
Expected: func(data test.Data, helpers test.Helpers) *test.Expected {
return &test.Expected{
Output: test.Contains(data.Identifier()),
}
},
},
},
}

testGroup.Run(t)
testCase.Run(t)
}
128 changes: 66 additions & 62 deletions cmd/nerdctl/system/system_prune_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,75 +32,79 @@ import (
func TestSystemPrune(t *testing.T) {
nerdtest.Setup()

testGroup := &test.Group{
{
Description: "volume prune all success",
// Private because of prune evidently
Require: nerdtest.Private,
Setup: func(data test.Data, helpers test.Helpers) {
helpers.Ensure("network", "create", data.Identifier())
helpers.Ensure("volume", "create", data.Identifier())
anonIdentifier := helpers.Capture("volume", "create")
helpers.Ensure("run", "-v", fmt.Sprintf("%s:/volume", data.Identifier()),
"--net", data.Identifier(), "--name", data.Identifier(), testutil.CommonImage)
testCase := &test.Case{
Description: "TestSystemPrune",
NoParallel: true,
SubTests: []*test.Case{
{
Description: "volume prune all success",
// Private because of prune evidently
Require: nerdtest.Private,
Setup: func(data test.Data, helpers test.Helpers) {
helpers.Ensure("network", "create", data.Identifier())
helpers.Ensure("volume", "create", data.Identifier())
anonIdentifier := helpers.Capture("volume", "create")
helpers.Ensure("run", "-v", fmt.Sprintf("%s:/volume", data.Identifier()),
"--net", data.Identifier(), "--name", data.Identifier(), testutil.CommonImage)

data.Set("anonIdentifier", anonIdentifier)
data.Set("anonIdentifier", anonIdentifier)
},
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("network", "rm", data.Identifier())
helpers.Anyhow("volume", "rm", data.Identifier())
helpers.Anyhow("volume", "rm", data.Get("anonIdentifier"))
helpers.Anyhow("rm", "-f", data.Identifier())
},
Command: test.RunCommand("system", "prune", "-f", "--volumes", "--all"),
Expected: func(data test.Data, helpers test.Helpers) *test.Expected {
return &test.Expected{
ExitCode: 0,
Output: func(stdout string, info string, t *testing.T) {
volumes := helpers.Capture("volume", "ls")
networks := helpers.Capture("network", "ls")
images := helpers.Capture("images")
containers := helpers.Capture("ps", "-a")
assert.Assert(t, strings.Contains(volumes, data.Identifier()), volumes)
assert.Assert(t, !strings.Contains(volumes, data.Get("anonIdentifier")), volumes)
assert.Assert(t, !strings.Contains(containers, data.Identifier()), containers)
assert.Assert(t, !strings.Contains(networks, data.Identifier()), networks)
assert.Assert(t, !strings.Contains(images, testutil.CommonImage), images)
},
}
},
},
Cleanup: func(data test.Data, helpers test.Helpers) {
helpers.Anyhow("network", "rm", data.Identifier())
helpers.Anyhow("volume", "rm", data.Identifier())
helpers.Anyhow("volume", "rm", data.Get("anonIdentifier"))
helpers.Anyhow("rm", "-f", data.Identifier())
},
Command: test.RunCommand("system", "prune", "-f", "--volumes", "--all"),
Expected: func(data test.Data, helpers test.Helpers) *test.Expected {
return &test.Expected{
ExitCode: 0,
Output: func(stdout string, info string, t *testing.T) {
volumes := helpers.Capture("volume", "ls")
networks := helpers.Capture("network", "ls")
images := helpers.Capture("images")
containers := helpers.Capture("ps", "-a")
assert.Assert(t, strings.Contains(volumes, data.Identifier()), volumes)
assert.Assert(t, !strings.Contains(volumes, data.Get("anonIdentifier")), volumes)
assert.Assert(t, !strings.Contains(containers, data.Identifier()), containers)
assert.Assert(t, !strings.Contains(networks, data.Identifier()), networks)
assert.Assert(t, !strings.Contains(images, testutil.CommonImage), images)
},
}
},
},
{
Description: "buildkit",
// FIXME: using a dedicated namespace does not work with rootful (because of buildkitd)
NoParallel: true,
// buildkitd is not available with docker
Require: test.Require(nerdtest.Build, test.Not(nerdtest.Docker)),
// FIXME: this test will happily say "green" even if the command actually fails to do its duty
// if there is nothing in the build cache.
// Ensure with setup here that we DO build something first
Setup: func(data test.Data, helpers test.Helpers) {
helpers.Ensure("system", "prune", "-f", "--volumes", "--all")
},
Command: func(data test.Data, helpers test.Helpers) test.Command {
buildctlBinary, err := buildkitutil.BuildctlBinary()
if err != nil {
t.Fatal(err)
}
{
Description: "buildkit",
// FIXME: using a dedicated namespace does not work with rootful (because of buildkitd)
NoParallel: true,
// buildkitd is not available with docker
Require: test.Require(nerdtest.Build, test.Not(nerdtest.Docker)),
// FIXME: this test will happily say "green" even if the command actually fails to do its duty
// if there is nothing in the build cache.
// Ensure with setup here that we DO build something first
Setup: func(data test.Data, helpers test.Helpers) {
helpers.Ensure("system", "prune", "-f", "--volumes", "--all")
},
Command: func(data test.Data, helpers test.Helpers) test.Command {
buildctlBinary, err := buildkitutil.BuildctlBinary()
if err != nil {
t.Fatal(err)
}

host, err := buildkitutil.GetBuildkitHost(testutil.Namespace)
if err != nil {
t.Fatal(err)
}
host, err := buildkitutil.GetBuildkitHost(testutil.Namespace)
if err != nil {
t.Fatal(err)
}

buildctlArgs := buildkitutil.BuildctlBaseArgs(host)
buildctlArgs = append(buildctlArgs, "du")
buildctlArgs := buildkitutil.BuildctlBaseArgs(host)
buildctlArgs = append(buildctlArgs, "du")

return helpers.CustomCommand(buildctlBinary, buildctlArgs...)
return helpers.CustomCommand(buildctlBinary, buildctlArgs...)
},
Expected: test.Expects(0, nil, test.Contains("Total:\t\t0B")),
},
Expected: test.Expects(0, nil, test.Contains("Total:\t\t0B")),
},
}

testGroup.Run(t)
testCase.Run(t)
}
Loading