kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #30777 from Microsoft/jjh/testexecwindowsopenhandles 

Avoid TestExecWindowsOpenHandles timing out
This commit is contained in:
Vincent Demeester 2017-03-16 14:55:24 +01:00 committed by GitHub
parent 1b2edb1ff6 f8821202c6
commit ad7cc722d7
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
integration-cli/docker_cli_exec_test.go
View File

@ -541,6 +541,7 @@ func (s *DockerSuite) TestExecWindowsOpenHandles(c *check.C) {
exec <- true
}()
count := 0
for {
top := make(chan string)
var out string
@ -551,7 +552,7 @@ func (s *DockerSuite) TestExecWindowsOpenHandles(c *check.C) {
select {
case <-time.After(time.Second * 5):
c.Error("timed out waiting for top while exec is exiting")
c.Fatal("timed out waiting for top while exec is exiting")
case out = <-top:
break
}
@ -560,6 +561,10 @@ func (s *DockerSuite) TestExecWindowsOpenHandles(c *check.C) {
// The initial exec process (cmd.exe) has exited, and both sleeps are currently running
break
}
count++
if count >= 30 {
c.Fatal("too many retries")
}
time.Sleep(1 * time.Second)
}
@ -571,7 +576,7 @@ func (s *DockerSuite) TestExecWindowsOpenHandles(c *check.C) {
select {
case <-time.After(time.Second * 5):
c.Error("timed out waiting for inspect while exec is exiting")
c.Fatal("timed out waiting for inspect while exec is exiting")
case <-inspect:
break
}
@ -583,7 +588,7 @@ func (s *DockerSuite) TestExecWindowsOpenHandles(c *check.C) {
// The exec should exit when the background sleep exits
select {
case <-time.After(time.Second * 15):
c.Error("timed out waiting for async exec to exit")
c.Fatal("timed out waiting for async exec to exit")
case <-exec:
// Ensure the background sleep has actually exited
out, _ := dockerCmd(c, "top", "test")