kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Use checker assert for integration-cli/docker_cli_external_graphdriver_unix_test.go 

Signed-off-by: Federico Gimenez <fgimenez@coit.es>
This commit is contained in:
Federico Gimenez 2015-10-25 10:41:41 +01:00
parent c10ef20ed8
commit 7058ec278d
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
integration-cli/docker_cli_external_graphdriver_unix_test.go
View File

@ -102,9 +102,7 @@ func (s *DockerExternalGraphdriverSuite) SetUpSuite(c *check.C) {
base, err := ioutil.TempDir("", "external-graph-test") base, err := ioutil.TempDir("", "external-graph-test")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
vfsProto, err := vfs.Init(base, []string{}, nil, nil) vfsProto, err := vfs.Init(base, []string{}, nil, nil)
if err != nil { c.Assert(err, check.IsNil, check.Commentf("error initializing graph driver"))
c.Fatalf("error initializing graph driver: %v", err)
}
driver := graphdriver.NewNaiveDiffDriver(vfsProto, nil, nil) driver := graphdriver.NewNaiveDiffDriver(vfsProto, nil, nil)
mux.HandleFunc("/Plugin.Activate", func(w http.ResponseWriter, r *http.Request) { mux.HandleFunc("/Plugin.Activate", func(w http.ResponseWriter, r *http.Request) {
@ -285,21 +283,18 @@ func (s *DockerExternalGraphdriverSuite) SetUpSuite(c *check.C) {
respond(w, &graphDriverResponse{Size: size}) respond(w, &graphDriverResponse{Size: size})
}) })
if err := os.MkdirAll("/etc/docker/plugins", 0755); err != nil { err = os.MkdirAll("/etc/docker/plugins", 0755)
c.Fatal(err) 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 { err = ioutil.WriteFile("/etc/docker/plugins/test-external-graph-driver.spec", []byte(s.server.URL), 0644)
c.Fatal(err) 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) { func (s *DockerExternalGraphdriverSuite) TearDownSuite(c *check.C) {
s.server.Close() s.server.Close()
if err := os.RemoveAll("/etc/docker/plugins"); err != nil { err := os.RemoveAll("/etc/docker/plugins")
c.Fatal(err) c.Assert(err, check.IsNil, check.Commentf("error removing /etc/docker/plugins"))
}
} }
func (s *DockerExternalGraphdriverSuite) TestExternalGraphDriver(c *check.C) { func (s *DockerExternalGraphdriverSuite) TestExternalGraphDriver(c *check.C) {