kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #23579 from tonistiigi/fix-ci-hang

Browse source 
Fix hanging integration tests
This commit is contained in:
Brian Goff 2016-06-15 14:49:54 -04:00 committed by GitHub
commit 8510adf8c8
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
integration-cli/docker_cli_network_unix_test.go
View file

@ -1634,7 +1634,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartRestoreBridgeNetwork(t *check.C) {
t.Fatal(err) t.Fatal(err)
} }
// start a new container try to publist port 80:80 will failed // start a new container, trying to publish port 80:80 should fail
out, err := s.d.Cmd("run", "-p", "80:80", "-d", "busybox", "top") out, err := s.d.Cmd("run", "-p", "80:80", "-d", "busybox", "top")
if err == nil || !strings.Contains(out, "Bind for 0.0.0.0:80 failed: port is already allocated") { if err == nil || !strings.Contains(out, "Bind for 0.0.0.0:80 failed: port is already allocated") {
t.Fatalf("80 port is allocated to old running container, it should failed on allocating to new container") t.Fatalf("80 port is allocated to old running container, it should failed on allocating to new container")
@ -1645,7 +1645,17 @@ func (s *DockerDaemonSuite) TestDaemonRestartRestoreBridgeNetwork(t *check.C) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
_, err = s.d.Cmd("run", "-p", "80:80", "-d", "busybox", "top") id, err := s.d.Cmd("run", "-p", "80:80", "-d", "busybox", "top")
if err != nil {
t.Fatal(err)
}
// Cleanup because these containers will not be shut down by daemon
out, err = s.d.Cmd("stop", newCon)
if err != nil {
t.Fatalf("err: %v %v", err, string(out))
}
_, err = s.d.Cmd("stop", strings.TrimSpace(id))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }