From d1ed5f62adadac202e34d11d513a9c7bc946ab27 Mon Sep 17 00:00:00 2001 From: liaoqingwei Date: Thu, 22 Oct 2015 07:32:16 +0800 Subject: [PATCH] Use of checkers on docker_cli_config_test.go. Signed-off-by: liaoqingwei --- integration-cli/docker_cli_config_test.go | 70 +++++++++-------------- 1 file changed, 28 insertions(+), 42 deletions(-) diff --git a/integration-cli/docker_cli_config_test.go b/integration-cli/docker_cli_config_test.go index 908a8fde33..8c66c7b53e 100644 --- a/integration-cli/docker_cli_config_test.go +++ b/integration-cli/docker_cli_config_test.go @@ -11,6 +11,7 @@ import ( "github.com/docker/docker/autogen/dockerversion" "github.com/docker/docker/pkg/homedir" + "github.com/docker/docker/pkg/integration/checker" "github.com/go-check/check" ) @@ -31,7 +32,7 @@ func (s *DockerSuite) TestConfigHttpHeader(c *check.C) { homeKey := homedir.Key() homeVal := homedir.Get() tmpDir, err := ioutil.TempDir("", "fake-home") - c.Assert(err, check.IsNil) + c.Assert(err, checker.IsNil) defer os.RemoveAll(tmpDir) dotDocker := filepath.Join(tmpDir, ".docker") @@ -46,46 +47,34 @@ func (s *DockerSuite) TestConfigHttpHeader(c *check.C) { }` err = ioutil.WriteFile(tmpCfg, []byte(data), 0600) - if err != nil { - c.Fatalf("Err creating file(%s): %v", tmpCfg, err) - } + c.Assert(err, checker.IsNil) cmd := exec.Command(dockerBinary, "-H="+server.URL[7:], "ps") out, _, _ := runCommandWithOutput(cmd) - if headers["User-Agent"] == nil { - c.Fatalf("Missing User-Agent: %q\nout:%v", headers, out) - } + c.Assert(headers["User-Agent"], checker.NotNil, check.Commentf("Missing User-Agent")) - if headers["User-Agent"][0] != "Docker-Client/"+dockerversion.VERSION+" ("+runtime.GOOS+")" { - c.Fatalf("Badly formatted User-Agent: %q\nout:%v", headers, out) - } + c.Assert(headers["User-Agent"][0], checker.Equals, "Docker-Client/"+dockerversion.VERSION+" ("+runtime.GOOS+")", check.Commentf("Badly formatted User-Agent,out:%v", out)) + + c.Assert(headers["Myheader"], checker.NotNil) + c.Assert(headers["Myheader"][0], checker.Equals, "MyValue", check.Commentf("Missing/bad header,out:%v", out)) - if headers["Myheader"] == nil || headers["Myheader"][0] != "MyValue" { - c.Fatalf("Missing/bad header: %q\nout:%v", headers, out) - } } func (s *DockerSuite) TestConfigDir(c *check.C) { cDir, err := ioutil.TempDir("", "fake-home") - c.Assert(err, check.IsNil) + c.Assert(err, checker.IsNil) defer os.RemoveAll(cDir) // First make sure pointing to empty dir doesn't generate an error - out, rc := dockerCmd(c, "--config", cDir, "ps") - - if rc != 0 { - c.Fatalf("ps1 didn't work:\nrc:%d\nout%s", rc, out) - } + dockerCmd(c, "--config", cDir, "ps") // Test with env var too cmd := exec.Command(dockerBinary, "ps") cmd.Env = append(os.Environ(), "DOCKER_CONFIG="+cDir) - out, rc, err = runCommandWithOutput(cmd) + out, _, err := runCommandWithOutput(cmd) - if rc != 0 || err != nil { - c.Fatalf("ps2 didn't work:\nrc:%d\nout%s\nerr:%v", rc, out, err) - } + c.Assert(err, checker.IsNil, check.Commentf("ps2 didn't work,out:%v", out)) // Start a server so we can check to see if the config file was // loaded properly @@ -104,36 +93,34 @@ func (s *DockerSuite) TestConfigDir(c *check.C) { tmpCfg := filepath.Join(cDir, "config.json") err = ioutil.WriteFile(tmpCfg, []byte(data), 0600) - if err != nil { - c.Fatalf("Err creating file(%s): %v", tmpCfg, err) - } + c.Assert(err, checker.IsNil, check.Commentf("Err creating file")) cmd = exec.Command(dockerBinary, "--config", cDir, "-H="+server.URL[7:], "ps") - out, _, _ = runCommandWithOutput(cmd) + out, _, err = runCommandWithOutput(cmd) - if headers["Myheader"] == nil || headers["Myheader"][0] != "MyValue" { - c.Fatalf("ps3 - Missing header: %q\nout:%v", headers, out) - } + c.Assert(err, checker.NotNil, check.Commentf("out:%v", out)) + c.Assert(headers["Myheader"], checker.NotNil) + c.Assert(headers["Myheader"][0], checker.Equals, "MyValue", check.Commentf("ps3 - Missing header,out:%v", out)) // Reset headers and try again using env var this time headers = map[string][]string{} cmd = exec.Command(dockerBinary, "-H="+server.URL[7:], "ps") cmd.Env = append(os.Environ(), "DOCKER_CONFIG="+cDir) - out, _, _ = runCommandWithOutput(cmd) + out, _, err = runCommandWithOutput(cmd) - if headers["Myheader"] == nil || headers["Myheader"][0] != "MyValue" { - c.Fatalf("ps4 - Missing header: %q\nout:%v", headers, out) - } + c.Assert(err, checker.NotNil, check.Commentf("%v", out)) + c.Assert(headers["Myheader"], checker.NotNil) + c.Assert(headers["Myheader"][0], checker.Equals, "MyValue", check.Commentf("ps4 - Missing header,out:%v", out)) // Reset headers and make sure flag overrides the env var headers = map[string][]string{} cmd = exec.Command(dockerBinary, "--config", cDir, "-H="+server.URL[7:], "ps") cmd.Env = append(os.Environ(), "DOCKER_CONFIG=MissingDir") - out, _, _ = runCommandWithOutput(cmd) + out, _, err = runCommandWithOutput(cmd) - if headers["Myheader"] == nil || headers["Myheader"][0] != "MyValue" { - c.Fatalf("ps5 - Missing header: %q\nout:%v", headers, out) - } + c.Assert(err, checker.NotNil, check.Commentf("out:%v", out)) + c.Assert(headers["Myheader"], checker.NotNil) + c.Assert(headers["Myheader"][0], checker.Equals, "MyValue", check.Commentf("ps5 - Missing header,out:%v", out)) // Reset headers and make sure flag overrides the env var. // Almost same as previous but make sure the "MissingDir" isn't @@ -141,10 +128,9 @@ func (s *DockerSuite) TestConfigDir(c *check.C) { headers = map[string][]string{} cmd = exec.Command(dockerBinary, "--config", "MissingDir", "-H="+server.URL[7:], "ps") cmd.Env = append(os.Environ(), "DOCKER_CONFIG="+cDir) - out, _, _ = runCommandWithOutput(cmd) + out, _, err = runCommandWithOutput(cmd) - if headers["Myheader"] != nil { - c.Fatalf("ps6 - Headers are there but shouldn't be: %q\nout:%v", headers, out) - } + c.Assert(err, checker.NotNil, check.Commentf("out:%v", out)) + c.Assert(headers["Myheader"], checker.IsNil, check.Commentf("ps6 - Headers shouldn't be the expected value,out:%v", out)) }