Skip to content

Commit

Permalink
Merge pull request moby#17343 from fgimenez/16756-refactor-docker_cli…
Browse files Browse the repository at this point in the history
…_external_graphdriver_unix_test-to-use-checker

Use checker assert for docker_cli_external_graphdriver_unix_test.go
  • Loading branch information
cpuguy83 committed Oct 26, 2015
2 parents 74b9d89 + 7058ec2 commit b21f95c
Showing 1 changed file with 7 additions and 12 deletions.
19 changes: 7 additions & 12 deletions integration-cli/docker_cli_external_graphdriver_unix_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,7 @@ func (s *DockerExternalGraphdriverSuite) SetUpSuite(c *check.C) {
base, err := ioutil.TempDir("", "external-graph-test")
c.Assert(err, check.IsNil)
vfsProto, err := vfs.Init(base, []string{}, nil, nil)
if err != nil {
c.Fatalf("error initializing graph driver: %v", err)
}
c.Assert(err, check.IsNil, check.Commentf("error initializing graph driver"))
driver := graphdriver.NewNaiveDiffDriver(vfsProto, nil, nil)

mux.HandleFunc("/Plugin.Activate", func(w http.ResponseWriter, r *http.Request) {
Expand Down Expand Up @@ -285,21 +283,18 @@ func (s *DockerExternalGraphdriverSuite) SetUpSuite(c *check.C) {
respond(w, &graphDriverResponse{Size: size})
})

if err := os.MkdirAll("/etc/docker/plugins", 0755); err != nil {
c.Fatal(err)
}
err = os.MkdirAll("/etc/docker/plugins", 0755)
c.Assert(err, check.IsNil, check.Commentf("error creating /etc/docker/plugins"))

if err := ioutil.WriteFile("/etc/docker/plugins/test-external-graph-driver.spec", []byte(s.server.URL), 0644); err != nil {
c.Fatal(err)
}
err = ioutil.WriteFile("/etc/docker/plugins/test-external-graph-driver.spec", []byte(s.server.URL), 0644)
c.Assert(err, check.IsNil, check.Commentf("error writing to /etc/docker/plugins/test-external-graph-driver.spec"))
}

func (s *DockerExternalGraphdriverSuite) 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, check.IsNil, check.Commentf("error removing /etc/docker/plugins"))
}

func (s *DockerExternalGraphdriverSuite) TestExternalGraphDriver(c *check.C) {
Expand Down

0 comments on commit b21f95c

Please sign in to comment.