Skip to content

Commit f6d36c4

Browse files
apostasieapostasie
committed
Move from AlpineImage to CommonImage to enable windows tests
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
1 parent bfc8e0b commit f6d36c4

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

‎cmd/nerdctl/ipfs/ipfs_kubo_linux_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TestIPFSAddrWithKubo(t *testing.T) {
4343
)
4444

4545
testCase.Setup = func(data test.Data, helpers test.Helpers) {
46-
helpers.Ensure("pull", "--quiet", testutil.AlpineImage)
46+
helpers.Ensure("pull", "--quiet", testutil.CommonImage)
4747

4848
ipfsRegistry = registry.NewKuboRegistry(data, helpers, t, nil, 0, nil)
4949
ipfsRegistry.Setup(data, helpers)
@@ -62,7 +62,7 @@ func TestIPFSAddrWithKubo(t *testing.T) {
6262
Description: "with default snapshotter",
6363
NoParallel: true,
6464
Setup: func(data test.Data, helpers test.Helpers) {
65-
ipfsCID := pushToIPFS(helpers, testutil.AlpineImage, fmt.Sprintf("--ipfs-address=%s", data.Get(ipfsAddrKey)))
65+
ipfsCID := pushToIPFS(helpers, testutil.CommonImage, fmt.Sprintf("--ipfs-address=%s", data.Get(ipfsAddrKey)))
6666
helpers.Ensure("pull", "--ipfs-address", data.Get(ipfsAddrKey), "ipfs://"+ipfsCID)
6767
data.Set(mainImageCIDKey, ipfsCID)
6868
},
@@ -85,7 +85,7 @@ func TestIPFSAddrWithKubo(t *testing.T) {
8585
nerdtest.NerdctlNeedsFixing("https://github.com/containerd/nerdctl/issues/3475"),
8686
),
8787
Setup: func(data test.Data, helpers test.Helpers) {
88-
ipfsCID := pushToIPFS(helpers, testutil.AlpineImage, fmt.Sprintf("--ipfs-address=%s", data.Get(ipfsAddrKey)), "--estargz")
88+
ipfsCID := pushToIPFS(helpers, testutil.CommonImage, fmt.Sprintf("--ipfs-address=%s", data.Get(ipfsAddrKey)), "--estargz")
8989
helpers.Ensure("pull", "--ipfs-address", data.Get(ipfsAddrKey), "ipfs://"+ipfsCID)
9090
data.Set(mainImageCIDKey, ipfsCID)
9191
},

‎cmd/nerdctl/ipfs/ipfs_registry_linux_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func TestIPFSNerdctlRegistry(t *testing.T) {
6262
)
6363

6464
testCase.Setup = func(data test.Data, helpers test.Helpers) {
65-
helpers.Ensure("pull", "--quiet", testutil.AlpineImage)
65+
helpers.Ensure("pull", "--quiet", testutil.CommonImage)
6666

6767
// Start a local ipfs backed registry
6868
ipfsServer = helpers.Command("ipfs", "registry", "serve", "--listen-registry", listenAddr)
@@ -84,7 +84,7 @@ func TestIPFSNerdctlRegistry(t *testing.T) {
8484
Description: "with default snapshotter",
8585
NoParallel: true,
8686
Setup: func(data test.Data, helpers test.Helpers) {
87-
data.Set(ipfsImageURLKey, listenAddr+"/ipfs/"+pushToIPFS(helpers, testutil.AlpineImage))
87+
data.Set(ipfsImageURLKey, listenAddr+"/ipfs/"+pushToIPFS(helpers, testutil.CommonImage))
8888
helpers.Ensure("pull", "--quiet", data.Get(ipfsImageURLKey))
8989
},
9090
Cleanup: func(data test.Data, helpers test.Helpers) {
@@ -102,7 +102,7 @@ func TestIPFSNerdctlRegistry(t *testing.T) {
102102
NoParallel: true,
103103
Require: nerdtest.Stargz,
104104
Setup: func(data test.Data, helpers test.Helpers) {
105-
data.Set(ipfsImageURLKey, listenAddr+"/ipfs/"+pushToIPFS(helpers, testutil.AlpineImage, "--estargz"))
105+
data.Set(ipfsImageURLKey, listenAddr+"/ipfs/"+pushToIPFS(helpers, testutil.CommonImage, "--estargz"))
106106
helpers.Ensure("pull", "--quiet", data.Get(ipfsImageURLKey))
107107
},
108108
Cleanup: func(data test.Data, helpers test.Helpers) {
@@ -126,7 +126,7 @@ func TestIPFSNerdctlRegistry(t *testing.T) {
126126
}
127127
},
128128
Setup: func(data test.Data, helpers test.Helpers) {
129-
data.Set(ipfsImageURLKey, listenAddr+"/ipfs/"+pushToIPFS(helpers, testutil.AlpineImage))
129+
data.Set(ipfsImageURLKey, listenAddr+"/ipfs/"+pushToIPFS(helpers, testutil.CommonImage))
130130

131131
dockerfile := fmt.Sprintf(`FROM %s
132132
CMD ["echo", "nerdctl-build-test-string"]

‎cmd/nerdctl/ipfs/ipfs_simple_linux_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ func TestIPFSSimple(t *testing.T) {
4242
)
4343

4444
testCase.Setup = func(data test.Data, helpers test.Helpers) {
45-
helpers.Ensure("pull", "--quiet", testutil.AlpineImage)
45+
helpers.Ensure("pull", "--quiet", testutil.CommonImage)
4646
}
4747

4848
testCase.SubTests = []*test.Case{
4949
{
5050
Description: "with default snapshotter",
5151
NoParallel: true,
5252
Setup: func(data test.Data, helpers test.Helpers) {
53-
data.Set(mainImageCIDKey, pushToIPFS(helpers, testutil.AlpineImage))
53+
data.Set(mainImageCIDKey, pushToIPFS(helpers, testutil.CommonImage))
5454
helpers.Ensure("pull", "ipfs://"+data.Get(mainImageCIDKey))
5555
},
5656
Cleanup: func(data test.Data, helpers test.Helpers) {
@@ -71,7 +71,7 @@ func TestIPFSSimple(t *testing.T) {
7171
nerdtest.NerdctlNeedsFixing("https://github.com/containerd/nerdctl/issues/3475"),
7272
),
7373
Setup: func(data test.Data, helpers test.Helpers) {
74-
data.Set(mainImageCIDKey, pushToIPFS(helpers, testutil.AlpineImage, "--estargz"))
74+
data.Set(mainImageCIDKey, pushToIPFS(helpers, testutil.CommonImage, "--estargz"))
7575
helpers.Ensure("pull", "ipfs://"+data.Get(mainImageCIDKey))
7676
},
7777
Cleanup: func(data test.Data, helpers test.Helpers) {
@@ -88,7 +88,7 @@ func TestIPFSSimple(t *testing.T) {
8888
Description: "with commit and push",
8989
NoParallel: true,
9090
Setup: func(data test.Data, helpers test.Helpers) {
91-
data.Set(mainImageCIDKey, pushToIPFS(helpers, testutil.AlpineImage))
91+
data.Set(mainImageCIDKey, pushToIPFS(helpers, testutil.CommonImage))
9292
helpers.Ensure("pull", "ipfs://"+data.Get(mainImageCIDKey))
9393

9494
// Run a container that does modify something, then commit and push it
@@ -126,7 +126,7 @@ func TestIPFSSimple(t *testing.T) {
126126
nerdtest.NerdctlNeedsFixing("https://github.com/containerd/nerdctl/issues/3475"),
127127
),
128128
Setup: func(data test.Data, helpers test.Helpers) {
129-
data.Set(mainImageCIDKey, pushToIPFS(helpers, testutil.AlpineImage, "--estargz"))
129+
data.Set(mainImageCIDKey, pushToIPFS(helpers, testutil.CommonImage, "--estargz"))
130130
helpers.Ensure("pull", "ipfs://"+data.Get(mainImageCIDKey))
131131

132132
// Run a container that does modify something, then commit and push it
@@ -161,7 +161,7 @@ func TestIPFSSimple(t *testing.T) {
161161
NoParallel: true,
162162
Require: test.Binary("openssl"),
163163
Setup: func(data test.Data, helpers test.Helpers) {
164-
data.Set(mainImageCIDKey, pushToIPFS(helpers, testutil.AlpineImage))
164+
data.Set(mainImageCIDKey, pushToIPFS(helpers, testutil.CommonImage))
165165
helpers.Ensure("pull", "ipfs://"+data.Get(mainImageCIDKey))
166166

167167
// Prep a key pair

‎cmd/nerdctl/issues/main_linux_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func TestIssue108(t *testing.T) {
3939
{
4040
Description: "-it --net=host",
4141
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
42-
cmd := helpers.Command("run", "-it", "--rm", "--net=host", testutil.AlpineImage, "echo", "this was always working")
42+
cmd := helpers.Command("run", "-it", "--rm", "--net=host", testutil.CommonImage, "echo", "this was always working")
4343
cmd.WithPseudoTTY()
4444
return cmd
4545
},
@@ -48,7 +48,7 @@ func TestIssue108(t *testing.T) {
4848
{
4949
Description: "--net=host -it",
5050
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
51-
cmd := helpers.Command("run", "--rm", "--net=host", "-it", testutil.AlpineImage, "echo", "this was not working due to issue #108")
51+
cmd := helpers.Command("run", "--rm", "--net=host", "-it", testutil.CommonImage, "echo", "this was not working due to issue #108")
5252
cmd.WithPseudoTTY()
5353
return cmd
5454
},

‎cmd/nerdctl/network/network_create_linux_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ func TestNetworkCreate(t *testing.T) {
4949
helpers.Anyhow("network", "rm", data.Identifier("1"))
5050
},
5151
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
52-
data.Set("container2", helpers.Capture("run", "--rm", "--net", data.Identifier("1"), testutil.AlpineImage, "ip", "route"))
53-
return helpers.Command("run", "--rm", "--net", data.Identifier(), testutil.AlpineImage, "ip", "route")
52+
data.Set("container2", helpers.Capture("run", "--rm", "--net", data.Identifier("1"), testutil.CommonImage, "ip", "route"))
53+
return helpers.Command("run", "--rm", "--net", data.Identifier(), testutil.CommonImage, "ip", "route")
5454
},
5555
Expected: func(data test.Data, helpers test.Helpers) *test.Expected {
5656
return &test.Expected{
@@ -72,7 +72,7 @@ func TestNetworkCreate(t *testing.T) {
7272
helpers.Anyhow("network", "rm", data.Identifier())
7373
},
7474
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
75-
return helpers.Command("run", "--rm", "--net", data.Identifier(), testutil.AlpineImage, "ifconfig", "eth0")
75+
return helpers.Command("run", "--rm", "--net", data.Identifier(), testutil.CommonImage, "ifconfig", "eth0")
7676
},
7777
Expected: test.Expects(0, nil, test.Contains("MTU:9216")),
7878
},

‎cmd/nerdctl/network/network_prune_linux_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestNetworkPrune(t *testing.T) {
3636
Setup: func(data test.Data, helpers test.Helpers) {
3737
identifier := data.Identifier()
3838
helpers.Ensure("network", "create", identifier)
39-
helpers.Ensure("run", "-d", "--net", identifier, "--name", identifier, testutil.NginxAlpineImage)
39+
helpers.Ensure("run", "-d", "--net", identifier, "--name", identifier, testutil.CommonImage, "sleep", nerdtest.Infinity)
4040
},
4141
Cleanup: func(data test.Data, helpers test.Helpers) {
4242
helpers.Anyhow("rm", "-f", data.Identifier())
@@ -54,7 +54,7 @@ func TestNetworkPrune(t *testing.T) {
5454
NoParallel: true,
5555
Setup: func(data test.Data, helpers test.Helpers) {
5656
helpers.Ensure("network", "create", data.Identifier())
57-
helpers.Ensure("run", "-d", "--net", data.Identifier(), "--name", data.Identifier(), testutil.NginxAlpineImage)
57+
helpers.Ensure("run", "-d", "--net", data.Identifier(), "--name", data.Identifier(), testutil.CommonImage, "sleep", nerdtest.Infinity)
5858
helpers.Ensure("stop", data.Identifier())
5959
},
6060
Cleanup: func(data test.Data, helpers test.Helpers) {

0 commit comments

Comments
 (0)