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

Use waitRun in TestDockerNetworkHostModeUngracefulDaemonRestart

Browse source 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
This commit is contained in:
Madhu Venugopal 2016-02-03 13:03:32 -08:00
parent b2c162a0b3
commit 76a765140e
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
integration-cli/docker_cli_network_unix_test.go
View file

@ -1017,14 +1017,14 @@ func (s *DockerNetworkSuite) TestDockerNetworkHostModeUngracefulDaemonRestart(c
if err := s.d.cmd.Process.Kill(); err != nil {
c.Fatal(err)
}
s.d.Restart()
if err := s.d.Restart(); err != nil {
c.Fatal(err)
}
// make sure all the containers are up and running
for i := 0; i < 10; i++ {
cName := fmt.Sprintf("hostc-%d", i)
runningOut, err := s.d.Cmd("inspect", "--format='{{.State.Running}}'", cName)
err := s.d.waitRun(fmt.Sprintf("hostc-%d", i))
c.Assert(err, checker.IsNil)
c.Assert(strings.TrimSpace(runningOut), checker.Equals, "true")
}
}

12
integration-cli/docker_utils.go
View file

@ -458,6 +458,11 @@ func (d *Daemon) sock() string {
return fmt.Sprintf("unix://%s/docker.sock", d.folder)
}
func (d *Daemon) waitRun(contID string) error {
args := []string{"--host", d.sock()}
return waitInspectWithArgs(contID, "{{.State.Running}}", "true", 10*time.Second, args...)
}
// Cmd will execute a docker CLI command against this Daemon.
// Example: d.Cmd("version") will run docker -H unix://path/to/unix.sock version
func (d *Daemon) Cmd(name string, arg ...string) (string, error) {
@ -1685,10 +1690,15 @@ func waitExited(contID string, duration time.Duration) error {
// in the inspect output. It will wait until the specified timeout (in seconds)
// is reached.
func waitInspect(name, expr, expected string, timeout time.Duration) error {
return waitInspectWithArgs(name, expr, expected, timeout)
}
func waitInspectWithArgs(name, expr, expected string, timeout time.Duration, arg ...string) error {
after := time.After(timeout)
args := append(arg, "inspect", "-f", expr, name)
for {
cmd := exec.Command(dockerBinary, "inspect", "-f", expr, name)
cmd := exec.Command(dockerBinary, args...)
out, _, err := runCommandWithOutput(cmd)
if err != nil {
if !strings.Contains(out, "No such") {