Merge pull request #2897 from djdongjin/deflake-ipfs-tests

Deflake IPFS and EStargz tests
containerd · Mar 25, 2024 · b668da5 · b668da5
2 parents 2066b28 + e7608c8
commit b668da5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/cmd/nerdctl/image_convert_test.go b/cmd/nerdctl/image_convert_test.go
@@ -28,7 +28,6 @@ func TestImageConvertEStargz(t *testing.T) {
 		t.Skip("no windows support yet")
 	}
 	testutil.DockerIncompatible(t)
-	t.Parallel()
 	base := testutil.NewBase(t)
 	convertedImage := testutil.Identifier(t) + ":esgz"
 	base.Cmd("rmi", convertedImage).Run()

diff --git a/cmd/nerdctl/ipfs_linux_test.go b/cmd/nerdctl/ipfs_linux_test.go
@@ -159,7 +159,7 @@ func TestIPFSWithLazyPullingCommit(t *testing.T) {
 func pushImageToIPFS(t *testing.T, base *testutil.Base, name string, opts ...string) string {
 	base.Cmd("pull", name).AssertOK()
 	ipfsCID := cidOf(t, base.Cmd(append([]string{"push"}, append(opts, "ipfs://"+name)...)...).OutLines())
-	base.Cmd("rmi", name).AssertOK()
+	base.Cmd("rmi", name).Run()
 	return ipfsCID
 }