Merge pull request #38783 from Microsoft/jjh/restarthypertests

Windows: Disable 2 restart tests on Hyper-V isolation
This commit is contained in:
Sebastiaan van Stijn 2019-02-23 14:00:50 +01:00 committed by GitHub
commit 308438c1ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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)