Jelajahi Sumber

Merge pull request #43636 from thaJeztah/integration_dont_use_deprecated_overlay

integration-cli: TestRemoveContainerAfterLiveRestore use overlay2
Sebastiaan van Stijn 3 tahun lalu
induk
melakukan
b01dd1e8c2
1 mengubah file dengan 2 tambahan dan 2 penghapusan
  1. 2 2
      integration-cli/docker_cli_daemon_test.go

+ 2 - 2
integration-cli/docker_cli_daemon_test.go

@@ -2690,14 +2690,14 @@ func (s *DockerDaemonSuite) TestExecWithUserAfterLiveRestore(c *testing.T) {
 
 
 func (s *DockerDaemonSuite) TestRemoveContainerAfterLiveRestore(c *testing.T) {
 func (s *DockerDaemonSuite) TestRemoveContainerAfterLiveRestore(c *testing.T) {
 	testRequires(c, DaemonIsLinux, overlayFSSupported, testEnv.IsLocalDaemon)
 	testRequires(c, DaemonIsLinux, overlayFSSupported, testEnv.IsLocalDaemon)
-	s.d.StartWithBusybox(c, "--live-restore", "--storage-driver", "overlay")
+	s.d.StartWithBusybox(c, "--live-restore", "--storage-driver", "overlay2")
 	out, err := s.d.Cmd("run", "-d", "--name=top", "busybox", "top")
 	out, err := s.d.Cmd("run", "-d", "--name=top", "busybox", "top")
 	assert.NilError(c, err, "Output: %s", out)
 	assert.NilError(c, err, "Output: %s", out)
 
 
 	s.d.WaitRun("top")
 	s.d.WaitRun("top")
 
 
 	// restart daemon.
 	// restart daemon.
-	s.d.Restart(c, "--live-restore", "--storage-driver", "overlay")
+	s.d.Restart(c, "--live-restore", "--storage-driver", "overlay2")
 
 
 	out, err = s.d.Cmd("stop", "top")
 	out, err = s.d.Cmd("stop", "top")
 	assert.NilError(c, err, "Output: %s", out)
 	assert.NilError(c, err, "Output: %s", out)