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 #24072 from anusha-ragunathan/fix-tests

Browse source 
Fix daemon tests.
This commit is contained in:
Vincent Demeester 2016-06-29 07:52:21 +02:00 • committed by GitHub
commit 3d231c78e8
2 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
integration-cli/docker_cli_daemon_experimental_test.go
View file

@ -19,6 +19,15 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithPluginEnabled(c *check.C) {
c.Fatalf("Could not install plugin: %v %s", err, out) c.Fatalf("Could not install plugin: %v %s", err, out)
} }
defer func() {
if out, err := s.d.Cmd("plugin", "disable", pluginName); err != nil {
c.Fatalf("Could not disable plugin: %v %s", err, out)
}
if out, err := s.d.Cmd("plugin", "remove", pluginName); err != nil {
c.Fatalf("Could not remove plugin: %v %s", err, out)
}
}()
if err := s.d.Restart(); err != nil { if err := s.d.Restart(); err != nil {
c.Fatalf("Could not restart daemon: %v", err) c.Fatalf("Could not restart daemon: %v", err)
} }
@ -41,6 +50,12 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithPluginDisabled(c *check.C) {
c.Fatalf("Could not install plugin: %v %s", err, out) c.Fatalf("Could not install plugin: %v %s", err, out)
} }
defer func() {
if out, err := s.d.Cmd("plugin", "remove", pluginName); err != nil {
c.Fatalf("Could not remove plugin: %v %s", err, out)
}
}()
if err := s.d.Restart(); err != nil { if err := s.d.Restart(); err != nil {
c.Fatalf("Could not restart daemon: %v", err) c.Fatalf("Could not restart daemon: %v", err)
} }

16
integration-cli/docker_cli_daemon_test.go
View file

@ -2106,6 +2106,10 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithKilledRunningContainer(t *check
} }
cid = strings.TrimSpace(cid) cid = strings.TrimSpace(cid)
pid, err := s.d.Cmd("inspect", "-f", "{{.State.Pid}}", cid)
t.Assert(err, check.IsNil)
pid = strings.TrimSpace(pid)
// Kill the daemon // Kill the daemon
if err := s.d.Kill(); err != nil { if err := s.d.Kill(); err != nil {
t.Fatal(err) t.Fatal(err)
@ -2119,10 +2123,10 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithKilledRunningContainer(t *check
// Give time to containerd to process the command if we don't // Give time to containerd to process the command if we don't
// the exit event might be received after we do the inspect // the exit event might be received after we do the inspect
pidCmd := exec.Command("pidof", "top") pidCmd := exec.Command("kill", "-0", pid)
_, ec, _ := runCommandWithOutput(pidCmd) _, ec, _ := runCommandWithOutput(pidCmd)
for ec == 0 { for ec == 0 {
time.Sleep(3 * time.Second) time.Sleep(1 * time.Second)
_, ec, _ = runCommandWithOutput(pidCmd) _, ec, _ = runCommandWithOutput(pidCmd)
} }
@ -2200,6 +2204,10 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithUnpausedRunningContainer(t *che
} }
cid = strings.TrimSpace(cid) cid = strings.TrimSpace(cid)
pid, err := s.d.Cmd("inspect", "-f", "{{.State.Pid}}", cid)
t.Assert(err, check.IsNil)
pid = strings.TrimSpace(pid)
// pause the container // pause the container
if _, err := s.d.Cmd("pause", cid); err != nil { if _, err := s.d.Cmd("pause", cid); err != nil {
t.Fatal(cid, err) t.Fatal(cid, err)
@ -2218,10 +2226,10 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithUnpausedRunningContainer(t *che
// Give time to containerd to process the command if we don't // Give time to containerd to process the command if we don't
// the resume event might be received after we do the inspect // the resume event might be received after we do the inspect
pidCmd := exec.Command("pidof", "top") pidCmd := exec.Command("kill", "-0", pid)
_, ec, _ := runCommandWithOutput(pidCmd) _, ec, _ := runCommandWithOutput(pidCmd)
for ec == 0 { for ec == 0 {
time.Sleep(3 * time.Second) time.Sleep(1 * time.Second)
_, ec, _ = runCommandWithOutput(pidCmd) _, ec, _ = runCommandWithOutput(pidCmd)
} }