diff options
| author | Sebastiaan van Stijn <thaJeztah@users.noreply.github.com> | 2019-02-23 14:00:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-23 14:00:50 +0100 |
| commit | 308438c1ec8520eef7967cc97ae31bde2cbd3177 (patch) | |
| tree | 3d82ba0309e901ff0012a0a5ce5d505dd3b9b0af | |
| parent | cbb885b07af59225eef12a8159e70d1485616d57 (diff) | |
| parent | faaffd5d6d7f143619c2bbefc818c40ffbf92523 (diff) | |
| download | docker-308438c1ec8520eef7967cc97ae31bde2cbd3177.tar.gz | |
Merge pull request #38783 from Microsoft/jjh/restarthypertests
Windows: Disable 2 restart tests on Hyper-V isolation
| -rw-r--r-- | integration-cli/docker_cli_restart_test.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/integration-cli/docker_cli_restart_test.go b/integration-cli/docker_cli_restart_test.go index 7df6981709..4b6c66c88e 100644 --- a/integration-cli/docker_cli_restart_test.go +++ b/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) |