diff --git a/integration-cli/docker_cli_start_volume_driver_unix_test.go b/integration-cli/docker_cli_start_volume_driver_unix_test.go index dc24627055..caa7834b87 100644 --- a/integration-cli/docker_cli_start_volume_driver_unix_test.go +++ b/integration-cli/docker_cli_start_volume_driver_unix_test.go @@ -14,6 +14,7 @@ import ( "strings" "time" + "github.com/docker/docker/pkg/integration/checker" "github.com/go-check/check" ) @@ -125,114 +126,95 @@ func (s *DockerExternalVolumeSuite) SetUpSuite(c *check.C) { fmt.Fprintln(w, `{}`) }) - if err := os.MkdirAll("/etc/docker/plugins", 0755); err != nil { - c.Fatal(err) - } + err := os.MkdirAll("/etc/docker/plugins", 0755) + c.Assert(err, checker.IsNil) - if err := ioutil.WriteFile("/etc/docker/plugins/test-external-volume-driver.spec", []byte(s.server.URL), 0644); err != nil { - c.Fatal(err) - } + err = ioutil.WriteFile("/etc/docker/plugins/test-external-volume-driver.spec", []byte(s.server.URL), 0644) + c.Assert(err, checker.IsNil) } func (s *DockerExternalVolumeSuite) TearDownSuite(c *check.C) { s.server.Close() - if err := os.RemoveAll("/etc/docker/plugins"); err != nil { - c.Fatal(err) - } + err := os.RemoveAll("/etc/docker/plugins") + c.Assert(err, checker.IsNil) } func (s *DockerExternalVolumeSuite) TestStartExternalNamedVolumeDriver(c *check.C) { - if err := s.d.StartWithBusybox(); err != nil { - c.Fatal(err) - } + err := s.d.StartWithBusybox() + c.Assert(err, checker.IsNil) out, err := s.d.Cmd("run", "--rm", "--name", "test-data", "-v", "external-volume-test:/tmp/external-volume-test", "--volume-driver", "test-external-volume-driver", "busybox:latest", "cat", "/tmp/external-volume-test/test") - if err != nil { - c.Fatal(out, err) - } + c.Assert(err, checker.IsNil) - if !strings.Contains(out, s.server.URL) { - c.Fatalf("External volume mount failed. Output: %s\n", out) - } + c.Assert(out, checker.Contains, s.server.URL) p := hostVolumePath("external-volume-test") _, err = os.Lstat(p) - if err == nil { - c.Fatalf("Expected error checking volume path in host: %s\n", p) - } + c.Assert(err, checker.NotNil) if !os.IsNotExist(err) { c.Fatalf("Expected volume path in host to not exist: %s, %v\n", p, err) } - c.Assert(s.ec.activations, check.Equals, 1) - c.Assert(s.ec.creations, check.Equals, 1) - c.Assert(s.ec.removals, check.Equals, 1) - c.Assert(s.ec.mounts, check.Equals, 1) - c.Assert(s.ec.unmounts, check.Equals, 1) + c.Assert(s.ec.activations, checker.Equals, 1) + c.Assert(s.ec.creations, checker.Equals, 1) + c.Assert(s.ec.removals, checker.Equals, 1) + c.Assert(s.ec.mounts, checker.Equals, 1) + c.Assert(s.ec.unmounts, checker.Equals, 1) } func (s *DockerExternalVolumeSuite) TestStartExternalVolumeUnnamedDriver(c *check.C) { - if err := s.d.StartWithBusybox(); err != nil { - c.Fatal(err) - } + err := s.d.StartWithBusybox() + c.Assert(err, checker.IsNil) out, err := s.d.Cmd("run", "--rm", "--name", "test-data", "-v", "/tmp/external-volume-test", "--volume-driver", "test-external-volume-driver", "busybox:latest", "cat", "/tmp/external-volume-test/test") - if err != nil { - c.Fatal(err) - } + c.Assert(err, checker.IsNil) - if !strings.Contains(out, s.server.URL) { - c.Fatalf("External volume mount failed. Output: %s\n", out) - } + c.Assert(out, checker.Contains, s.server.URL) - c.Assert(s.ec.activations, check.Equals, 1) - c.Assert(s.ec.creations, check.Equals, 1) - c.Assert(s.ec.removals, check.Equals, 1) - c.Assert(s.ec.mounts, check.Equals, 1) - c.Assert(s.ec.unmounts, check.Equals, 1) + c.Assert(s.ec.activations, checker.Equals, 1) + c.Assert(s.ec.creations, checker.Equals, 1) + c.Assert(s.ec.removals, checker.Equals, 1) + c.Assert(s.ec.mounts, checker.Equals, 1) + c.Assert(s.ec.unmounts, checker.Equals, 1) } func (s DockerExternalVolumeSuite) TestStartExternalVolumeDriverVolumesFrom(c *check.C) { - if err := s.d.StartWithBusybox(); err != nil { - c.Fatal(err) - } + err := s.d.StartWithBusybox() + c.Assert(err, checker.IsNil) out, err := s.d.Cmd("run", "-d", "--name", "vol-test1", "-v", "/foo", "--volume-driver", "test-external-volume-driver", "busybox:latest") - c.Assert(err, check.IsNil, check.Commentf(out)) + c.Assert(err, checker.IsNil, check.Commentf(out)) out, err = s.d.Cmd("run", "--rm", "--volumes-from", "vol-test1", "--name", "vol-test2", "busybox", "ls", "/tmp") - c.Assert(err, check.IsNil, check.Commentf(out)) + c.Assert(err, checker.IsNil, check.Commentf(out)) out, err = s.d.Cmd("rm", "-fv", "vol-test1") - c.Assert(err, check.IsNil, check.Commentf(out)) + c.Assert(err, checker.IsNil, check.Commentf(out)) - c.Assert(s.ec.activations, check.Equals, 1) - c.Assert(s.ec.creations, check.Equals, 1) - c.Assert(s.ec.removals, check.Equals, 1) - c.Assert(s.ec.mounts, check.Equals, 2) - c.Assert(s.ec.unmounts, check.Equals, 2) + c.Assert(s.ec.activations, checker.Equals, 1) + c.Assert(s.ec.creations, checker.Equals, 1) + c.Assert(s.ec.removals, checker.Equals, 1) + c.Assert(s.ec.mounts, checker.Equals, 2) + c.Assert(s.ec.unmounts, checker.Equals, 2) } func (s DockerExternalVolumeSuite) TestStartExternalVolumeDriverDeleteContainer(c *check.C) { - if err := s.d.StartWithBusybox(); err != nil { - c.Fatal(err) - } + err := s.d.StartWithBusybox() + c.Assert(err, checker.IsNil) - if out, err := s.d.Cmd("run", "-d", "--name", "vol-test1", "-v", "/foo", "--volume-driver", "test-external-volume-driver", "busybox:latest"); err != nil { - c.Fatal(out, err) - } + out, err := s.d.Cmd("run", "-d", "--name", "vol-test1", "-v", "/foo", "--volume-driver", "test-external-volume-driver", "busybox:latest") + c.Assert(err, checker.IsNil, check.Commentf(out)) - if out, err := s.d.Cmd("rm", "-fv", "vol-test1"); err != nil { - c.Fatal(out, err) - } + out, err = s.d.Cmd("rm", "-fv", "vol-test1") + c.Assert(err, checker.IsNil, check.Commentf(out)) - c.Assert(s.ec.activations, check.Equals, 1) - c.Assert(s.ec.creations, check.Equals, 1) - c.Assert(s.ec.removals, check.Equals, 1) - c.Assert(s.ec.mounts, check.Equals, 1) - c.Assert(s.ec.unmounts, check.Equals, 1) + c.Assert(s.ec.activations, checker.Equals, 1) + c.Assert(s.ec.creations, checker.Equals, 1) + c.Assert(s.ec.removals, checker.Equals, 1) + c.Assert(s.ec.mounts, checker.Equals, 1) + c.Assert(s.ec.unmounts, checker.Equals, 1) } func hostVolumePath(name string) string { @@ -240,9 +222,8 @@ func hostVolumePath(name string) string { } func (s *DockerExternalVolumeSuite) TestStartExternalNamedVolumeDriverCheckBindLocalVolume(c *check.C) { - if err := s.d.StartWithBusybox(); err != nil { - c.Fatal(err) - } + err := s.d.StartWithBusybox() + c.Assert(err, checker.IsNil) expected := s.server.URL @@ -253,28 +234,26 @@ func (s *DockerExternalVolumeSuite) TestStartExternalNamedVolumeDriverCheckBindL img := "test-checkbindlocalvolume" - _, err := buildImageWithOutInDamon(s.d.sock(), img, dockerfile, true) - c.Assert(err, check.IsNil) + _, err = buildImageWithOutInDamon(s.d.sock(), img, dockerfile, true) + c.Assert(err, checker.IsNil) out, err := s.d.Cmd("run", "--rm", "--name", "test-data-nobind", "-v", "external-volume-test:/tmp/external-volume-test", "--volume-driver", "test-external-volume-driver", img, "cat", "/nobindthenlocalvol/test") - c.Assert(err, check.IsNil) + c.Assert(err, checker.IsNil) - if !strings.Contains(out, expected) { - c.Fatalf("External volume mount failed. Output: %s\n", out) - } + c.Assert(out, checker.Contains, expected) - c.Assert(s.ec.activations, check.Equals, 1) - c.Assert(s.ec.creations, check.Equals, 1) - c.Assert(s.ec.removals, check.Equals, 1) - c.Assert(s.ec.mounts, check.Equals, 1) - c.Assert(s.ec.unmounts, check.Equals, 1) + c.Assert(s.ec.activations, checker.Equals, 1) + c.Assert(s.ec.creations, checker.Equals, 1) + c.Assert(s.ec.removals, checker.Equals, 1) + c.Assert(s.ec.mounts, checker.Equals, 1) + c.Assert(s.ec.unmounts, checker.Equals, 1) } // Make sure a request to use a down driver doesn't block other requests func (s *DockerExternalVolumeSuite) TestStartExternalVolumeDriverLookupNotBlocked(c *check.C) { specPath := "/etc/docker/plugins/down-driver.spec" err := ioutil.WriteFile("/etc/docker/plugins/down-driver.spec", []byte("tcp://127.0.0.7:9999"), 0644) - c.Assert(err, check.IsNil) + c.Assert(err, checker.IsNil) defer os.RemoveAll(specPath) chCmd1 := make(chan struct{}) @@ -282,10 +261,10 @@ func (s *DockerExternalVolumeSuite) TestStartExternalVolumeDriverLookupNotBlocke cmd1 := exec.Command(dockerBinary, "volume", "create", "-d", "down-driver") cmd2 := exec.Command(dockerBinary, "volume", "create") - c.Assert(cmd1.Start(), check.IsNil) + c.Assert(cmd1.Start(), checker.IsNil) defer cmd1.Process.Kill() time.Sleep(100 * time.Millisecond) // ensure API has been called - c.Assert(cmd2.Start(), check.IsNil) + c.Assert(cmd2.Start(), checker.IsNil) go func() { cmd1.Wait() @@ -300,7 +279,7 @@ func (s *DockerExternalVolumeSuite) TestStartExternalVolumeDriverLookupNotBlocke cmd2.Process.Kill() c.Fatalf("volume create with down driver finished unexpectedly") case err := <-chCmd2: - c.Assert(err, check.IsNil, check.Commentf("error creating volume")) + c.Assert(err, checker.IsNil) case <-time.After(5 * time.Second): c.Fatal("volume creates are blocked by previous create requests when previous driver is down") cmd2.Process.Kill() @@ -308,9 +287,8 @@ func (s *DockerExternalVolumeSuite) TestStartExternalVolumeDriverLookupNotBlocke } func (s *DockerExternalVolumeSuite) TestStartExternalVolumeDriverRetryNotImmediatelyExists(c *check.C) { - if err := s.d.StartWithBusybox(); err != nil { - c.Fatal(err) - } + err := s.d.StartWithBusybox() + c.Assert(err, checker.IsNil) specPath := "/etc/docker/plugins/test-external-volume-driver-retry.spec" os.RemoveAll(specPath) @@ -333,18 +311,16 @@ func (s *DockerExternalVolumeSuite) TestStartExternalVolumeDriverRetryNotImmedia select { case err := <-errchan: - if err != nil { - c.Fatal(err) - } + c.Assert(err, checker.IsNil) case <-time.After(8 * time.Second): c.Fatal("volume creates fail when plugin not immediately available") } - c.Assert(s.ec.activations, check.Equals, 1) - c.Assert(s.ec.creations, check.Equals, 1) - c.Assert(s.ec.removals, check.Equals, 1) - c.Assert(s.ec.mounts, check.Equals, 1) - c.Assert(s.ec.unmounts, check.Equals, 1) + c.Assert(s.ec.activations, checker.Equals, 1) + c.Assert(s.ec.creations, checker.Equals, 1) + c.Assert(s.ec.removals, checker.Equals, 1) + c.Assert(s.ec.mounts, checker.Equals, 1) + c.Assert(s.ec.unmounts, checker.Equals, 1) } func (s *DockerExternalVolumeSuite) TestStartExternalVolumeDriverBindExternalVolume(c *check.C) { @@ -356,9 +332,9 @@ func (s *DockerExternalVolumeSuite) TestStartExternalVolumeDriverBindExternalVol Driver string } out, err := inspectFieldJSON("testing", "Mounts") - c.Assert(err, check.IsNil) - c.Assert(json.NewDecoder(strings.NewReader(out)).Decode(&mounts), check.IsNil) - c.Assert(len(mounts), check.Equals, 1, check.Commentf(out)) - c.Assert(mounts[0].Name, check.Equals, "foo") - c.Assert(mounts[0].Driver, check.Equals, "test-external-volume-driver") + c.Assert(err, checker.IsNil) + c.Assert(json.NewDecoder(strings.NewReader(out)).Decode(&mounts), checker.IsNil) + c.Assert(len(mounts), checker.Equals, 1, check.Commentf(out)) + c.Assert(mounts[0].Name, checker.Equals, "foo") + c.Assert(mounts[0].Driver, checker.Equals, "test-external-volume-driver") }