Browse code

c8d: fix TestRemoveContainerAfterLiveRestore

There is no need to pass the storage driver to the daemon the test
starts

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>

Djordje Lukic authored on 2023/09/18 21:37:17
Showing 2 changed files
... ...
@@ -2539,15 +2539,15 @@ func (s *DockerDaemonSuite) TestExecWithUserAfterLiveRestore(c *testing.T) {
2539 2539
 }
2540 2540
 
2541 2541
 func (s *DockerDaemonSuite) TestRemoveContainerAfterLiveRestore(c *testing.T) {
2542
-	testRequires(c, DaemonIsLinux, overlayFSSupported, testEnv.IsLocalDaemon)
2543
-	s.d.StartWithBusybox(testutil.GetContext(c), c, "--live-restore", "--storage-driver", "overlay2")
2542
+	testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon)
2543
+	s.d.StartWithBusybox(testutil.GetContext(c), c, "--live-restore")
2544 2544
 	out, err := s.d.Cmd("run", "-d", "--name=top", "busybox", "top")
2545 2545
 	assert.NilError(c, err, "Output: %s", out)
2546 2546
 
2547 2547
 	s.d.WaitRun("top")
2548 2548
 
2549 2549
 	// restart daemon.
2550
-	s.d.Restart(c, "--live-restore", "--storage-driver", "overlay2")
2550
+	s.d.Restart(c, "--live-restore")
2551 2551
 
2552 2552
 	out, err = s.d.Cmd("stop", "top")
2553 2553
 	assert.NilError(c, err, "Output: %s", out)
... ...
@@ -3,9 +3,7 @@
3 3
 package main
4 4
 
5 5
 import (
6
-	"bytes"
7 6
 	"os"
8
-	"os/exec"
9 7
 	"strings"
10 8
 
11 9
 	"github.com/docker/docker/pkg/sysinfo"
... ...
@@ -73,12 +71,3 @@ func unprivilegedUsernsClone() bool {
73 73
 	content, err := os.ReadFile("/proc/sys/kernel/unprivileged_userns_clone")
74 74
 	return err != nil || !strings.Contains(string(content), "0")
75 75
 }
76
-
77
-func overlayFSSupported() bool {
78
-	cmd := exec.Command(dockerBinary, "run", "--rm", "busybox", "/bin/sh", "-c", "cat /proc/filesystems")
79
-	out, err := cmd.CombinedOutput()
80
-	if err != nil {
81
-		return false
82
-	}
83
-	return bytes.Contains(out, []byte("overlay\n"))
84
-}