|
17 | 17 | package container |
18 | 18 |
|
19 | 19 | import ( |
20 | | - "runtime" |
21 | 20 | "testing" |
22 | 21 |
|
| 22 | + "github.com/containerd/nerdctl/mod/tigron/expect" |
| 23 | + "github.com/containerd/nerdctl/mod/tigron/require" |
| 24 | + "github.com/containerd/nerdctl/mod/tigron/test" |
| 25 | + |
23 | 26 | "github.com/containerd/nerdctl/v2/pkg/testutil" |
| 27 | + "github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest" |
24 | 28 | ) |
25 | 29 |
|
26 | 30 | func TestStart(t *testing.T) { |
27 | | - t.Parallel() |
28 | | - base := testutil.NewBase(t) |
29 | | - containerName := testutil.Identifier(t) |
| 31 | + nerdtest.Setup() |
30 | 32 |
|
31 | | - defer base.Cmd("rm", "-f", containerName).AssertOK() |
32 | | - base.Cmd("run", "--name", containerName, testutil.CommonImage).AssertOK() |
33 | | - base.Cmd("start", containerName).AssertOutContains(containerName) |
| 33 | + testCase := &test.Case{ |
| 34 | + Setup: func(data test.Data, helpers test.Helpers) { |
| 35 | + helpers.Ensure("run", "-d", |
| 36 | + "--name", data.Identifier(), |
| 37 | + testutil.CommonImage) |
| 38 | + }, |
| 39 | + Cleanup: func(data test.Data, helpers test.Helpers) { |
| 40 | + helpers.Anyhow("rm", "-f", data.Identifier()) |
| 41 | + }, |
| 42 | + Command: func(data test.Data, helpers test.Helpers) test.TestableCommand { |
| 43 | + return helpers.Command("start", data.Identifier()) |
| 44 | + }, |
| 45 | + Expected: func(data test.Data, helpers test.Helpers) *test.Expected { |
| 46 | + return test.Expects(0, nil, expect.Contains(data.Identifier()))(data, helpers) |
| 47 | + }, |
| 48 | + } |
| 49 | + testCase.Run(t) |
34 | 50 | } |
35 | 51 |
|
36 | 52 | func TestStartAttach(t *testing.T) { |
37 | | - if runtime.GOOS == "windows" { |
38 | | - t.Skip("start attach test is not yet implemented on Windows") |
39 | | - } |
40 | | - t.Parallel() |
41 | | - base := testutil.NewBase(t) |
42 | | - containerName := testutil.Identifier(t) |
43 | 53 |
|
44 | | - defer base.Cmd("rm", "-f", containerName).AssertOK() |
45 | | - base.Cmd("run", "--name", containerName, testutil.CommonImage, "sh", "-euxc", "echo foo").AssertOK() |
46 | | - base.Cmd("start", "-a", containerName).AssertOutContains("foo") |
| 54 | + nerdtest.Setup() |
| 55 | + |
| 56 | + testCase := &test.Case{ |
| 57 | + Require: require.Not(require.Windows), |
| 58 | + Setup: func(data test.Data, helpers test.Helpers) { |
| 59 | + helpers.Ensure("run", |
| 60 | + "--name", data.Identifier(), |
| 61 | + testutil.CommonImage, "sh", "-euxc", "echo foo") |
| 62 | + }, |
| 63 | + Cleanup: func(data test.Data, helpers test.Helpers) { |
| 64 | + helpers.Anyhow("rm", "-f", data.Identifier()) |
| 65 | + }, |
| 66 | + Command: func(data test.Data, helpers test.Helpers) test.TestableCommand { |
| 67 | + return helpers.Command("start", "-a", data.Identifier()) |
| 68 | + }, |
| 69 | + Expected: func(data test.Data, helpers test.Helpers) *test.Expected { |
| 70 | + return test.Expects(0, nil, expect.Contains("foo"))(data, helpers) |
| 71 | + }, |
| 72 | + } |
| 73 | + testCase.Run(t) |
47 | 74 | } |
0 commit comments