Ver código fonte

Merge pull request #38783 from Microsoft/jjh/restarthypertests

Windows: Disable 2 restart tests on Hyper-V isolation
Sebastiaan van Stijn 6 anos atrás
pai
commit
308438c1ec
1 arquivos alterados com 8 adições e 2 exclusões
  1. 8 2
      integration-cli/docker_cli_restart_test.go

+ 8 - 2
integration-cli/docker_cli_restart_test.go

@@ -164,7 +164,10 @@ func (s *DockerSuite) TestRestartContainerwithGoodContainer(c *check.C) {
 }
 
 func (s *DockerSuite) TestRestartContainerSuccess(c *check.C) {
-	testRequires(c, testEnv.IsLocalDaemon)
+	// Skipped for Hyper-V isolated containers. Test is currently written
+	// such that it assumes there is a host process to kill. In Hyper-V
+	// containers, the process is inside the utility VM, not on the host.
+	testRequires(c, testEnv.IsLocalDaemon, IsolationIsProcess)
 
 	out := runSleepingContainer(c, "-d", "--restart=always")
 	id := strings.TrimSpace(out)
@@ -234,7 +237,10 @@ func (s *DockerSuite) TestRestartWithPolicyUserDefinedNetwork(c *check.C) {
 }
 
 func (s *DockerSuite) TestRestartPolicyAfterRestart(c *check.C) {
-	testRequires(c, testEnv.IsLocalDaemon)
+	// Skipped for Hyper-V isolated containers. Test is currently written
+	// such that it assumes there is a host process to kill. In Hyper-V
+	// containers, the process is inside the utility VM, not on the host.
+	testRequires(c, testEnv.IsLocalDaemon, IsolationIsProcess)
 
 	out := runSleepingContainer(c, "-d", "--restart=always")
 	id := strings.TrimSpace(out)