@@ -4538,3 +4538,22 @@ func (s *DockerSuite) TestRunCredentialSpecFailures(c *check.C) {

 		c.Assert(err.Error(), checker.Contains, attempt.expectedError, check.Commentf("%s expected %s got %s", attempt.value, attempt.expectedError, err))

 	}

 }

+

+// Windows specific test to ensure that a servicing app container is started

+// if necessary once a container exits. It does this by forcing a no-op

+// servicing event and verifying the event from Hyper-V-Compute

+func (s *DockerSuite) TestRunServicingContainer(c *check.C) {

+	testRequires(c, DaemonIsWindows, SameHostDaemon)

+

+	out, _ := dockerCmd(c, "run", "-d", WindowsBaseImage, "cmd", "/c", "mkdir c:\\programdata\\Microsoft\\Windows\\ContainerUpdates\\000_000_d99f45d0-ffc8-4af7-bd9c-ea6a62e035c9_200 && sc control cexecsvc 255")

+	containerID := strings.TrimSpace(out)

+	err := waitExited(containerID, 60*time.Second)

+	c.Assert(err, checker.IsNil)

+

+	cmd := exec.Command("powershell", "echo", `(Get-WinEvent -ProviderName "Microsoft-Windows-Hyper-V-Compute" -FilterXPath 'Event[System[EventID=2010]]' -MaxEvents 1).Message`)

+	out2, _, err := runCommandWithOutput(cmd)

+	c.Assert(err, checker.IsNil)

+	c.Assert(out2, checker.Contains, `"Servicing":true`, check.Commentf("Servicing container does not appear to have been started: %s", out2))

+	c.Assert(out2, checker.Contains, `Windows Container (Servicing)`, check.Commentf("Didn't find 'Windows Container (Servicing): %s", out2))

+	c.Assert(out2, checker.Contains, containerID+"_servicing", check.Commentf("Didn't find '%s_servicing': %s", containerID+"_servicing", out2))

+}