[markup-basic-test-case] markup basic test case

Author: Jimmy-Xu

integration-cli/hyper_cli_config_test.go

@@ -15,7 +15,7 @@ func (s *DockerSuite) TestCliConfigAndRewrite(c *check.C) {
 	defer printTestDuration(time.Now())
 
 	out, _ := dockerCmd(c, "config", "--accesskey", "xx", "--secretkey", "xxxx", "tcp://127.0.0.1:6443")
-	c.Assert(out, checker.Contains, "WARNING: Your login credentials has been saved in " + homedir.Get() + "/.hyper/config.json")
+	c.Assert(out, checker.Contains, "WARNING: Your login credentials has been saved in "+homedir.Get()+"/.hyper/config.json")
 
 	configDir := filepath.Join(homedir.Get(), ".hyper")
 	conf, err := cliconfig.Load(configDir)
@@ -24,20 +24,20 @@ func (s *DockerSuite) TestCliConfigAndRewrite(c *check.C) {
 	c.Assert(conf.CloudConfig["tcp://127.0.0.1:6443"].SecretKey, checker.Equals, "xxxx", check.Commentf("Should get xxxx, but get %s\n", conf.CloudConfig["tcp://127.0.0.1:6443"].SecretKey))
 
 	out, _ = dockerCmd(c, "config", "--accesskey", "yy", "--secretkey", "yyyy", "tcp://127.0.0.1:6443")
-	c.Assert(out, checker.Contains, "WARNING: Your login credentials has been saved in " + homedir.Get() + "/.hyper/config.json")
+	c.Assert(out, checker.Contains, "WARNING: Your login credentials has been saved in "+homedir.Get()+"/.hyper/config.json")
 
 	conf, err = cliconfig.Load(configDir)
 	c.Assert(err, checker.IsNil)
 	c.Assert(conf.CloudConfig["tcp://127.0.0.1:6443"].AccessKey, checker.Equals, "yy", check.Commentf("Should get yy, but get %s\n", conf.CloudConfig["tcp://127.0.0.1:6443"].AccessKey))
 	c.Assert(conf.CloudConfig["tcp://127.0.0.1:6443"].SecretKey, checker.Equals, "yyyy", check.Commentf("Should get yyyy, but get %s\n", conf.CloudConfig["tcp://127.0.0.1:6443"].SecretKey))
 }
 
-func (s *DockerSuite) TestCliConfigMultiHost(c *check.C) {
+func (s *DockerSuite) TestCliConfigMultiHostBasic(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
 
 	out, _ := dockerCmd(c, "config", "--accesskey", "xx", "--secretkey", "xxxx", "tcp://127.0.0.1:6443")
-	c.Assert(out, checker.Contains, "WARNING: Your login credentials has been saved in " + homedir.Get() + "/.hyper/config.json")
+	c.Assert(out, checker.Contains, "WARNING: Your login credentials has been saved in "+homedir.Get()+"/.hyper/config.json")
 
 	configDir := filepath.Join(homedir.Get(), ".hyper")
 	conf, err := cliconfig.Load(configDir)
@@ -46,7 +46,7 @@ func (s *DockerSuite) TestCliConfigMultiHost(c *check.C) {
 	c.Assert(conf.CloudConfig["tcp://127.0.0.1:6443"].SecretKey, checker.Equals, "xxxx", check.Commentf("Should get xxxx, but get %s\n", conf.CloudConfig["tcp://127.0.0.1:6443"].SecretKey))
 
 	out, _ = dockerCmd(c, "config", "--accesskey", "yy", "--secretkey", "yyyy", "tcp://127.0.0.1:6444")
-	c.Assert(out, checker.Contains, "WARNING: Your login credentials has been saved in " + homedir.Get() + "/.hyper/config.json")
+	c.Assert(out, checker.Contains, "WARNING: Your login credentials has been saved in "+homedir.Get()+"/.hyper/config.json")
 
 	conf, err = cliconfig.Load(configDir)
 	c.Assert(err, checker.IsNil)

integration-cli/hyper_cli_create_test.go

@@ -58,7 +58,7 @@ func (s *DockerSuite) TestCliCreateArgs(c *check.C) {
 }
 
 // Make sure we can set hostconfig options too
-func (s *DockerSuite) TestCliCreateHostConfig(c *check.C) {
+func (s *DockerSuite) TestCliCreateHostConfigBasic(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
 	pullImageIfNotExist("busybox")
@@ -84,7 +84,7 @@ func (s *DockerSuite) TestCliCreateHostConfig(c *check.C) {
 }
 
 // "test123" should be printed by docker create + start
-func (s *DockerSuite) TestCliCreateEchoStdout(c *check.C) {
+func (s *DockerSuite) TestCliCreateEchoStdoutBasic(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
 	pullImageIfNotExist("busybox")

integration-cli/hyper_cli_exec_test.go

@@ -23,6 +23,7 @@ func (s *DockerSuite) TestCliExecBasic(c *check.C) {
 	defer printTestDuration(time.Now())
 
 	testRequires(c, DaemonIsLinux)
+	pullImageIfNotExist("busybox")
 	dockerCmd(c, "run", "-d", "--name", "test", "busybox", "sh", "-c", "echo test > /tmp/file && top")
 
 	out, _ := dockerCmd(c, "exec", "test", "cat", "/tmp/file")

integration-cli/hyper_cli_exec_unix_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/go-check/check"
 )
 
-func (s *DockerSuite) TestCliFipAssociateUsedIP(c *check.C) {
+func (s *DockerSuite) TestCliFipAssociateUsedIPBasic(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
 

integration-cli/hyper_cli_fip_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/go-check/check"
 )
 
-func (s *DockerSuite) TestCliHelpTextVerify(c *check.C) {
+func (s *DockerSuite) TestCliHelpTextVerifyBasic(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
 

integration-cli/hyper_cli_help_test.go

@@ -63,12 +63,13 @@ RUN echo "Z"`,
 
 }*/
 
-func (s *DockerSuite) TestCliHistoryExistentImage(c *check.C) {
+func (s *DockerSuite) TestCliHistoryExistentImageBasic(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
 
 	pullImageIfNotExist("busybox")
-	dockerCmd(c, "history", "busybox")
+	_, _, err := dockerCmdWithError("history", "busybox")
+	c.Assert(err, check.IsNil, check.Commentf("history on a existent image should not fail."))
 }
 
 func (s *DockerSuite) TestCliHistoryNonExistentImage(c *check.C) {

integration-cli/hyper_cli_history_test.go

@@ -2,18 +2,17 @@ package main
 
 import (
 	"fmt"
-//	"net"
 	"strings"
 	"time"
 
 	"github.com/docker/docker/pkg/integration/checker"
-//	"github.com/docker/docker/utils"
 	"github.com/go-check/check"
 )
 
 // ensure docker info succeeds
-func (s *DockerSuite) TestCliInfoEnsureSucceeds(c *check.C) {
-	printTestCaseName(); defer printTestDuration(time.Now())
+func (s *DockerSuite) TestCliInfoEnsureSucceedsBasic(c *check.C) {
+	printTestCaseName()
+	defer printTestDuration(time.Now())
 	out, _ := dockerCmd(c, "info")
 
 	// always shown fields
@@ -47,7 +46,6 @@ func (s *DockerSuite) TestCliInfoEnsureSucceeds(c *check.C) {
 	}
 }
 
-
 //comment: not support discoveryBackend
 //// TestInfoDiscoveryBackend verifies that a daemon run with `--cluster-advertise` and
 //// `--cluster-store` properly show the backend's endpoint in info output.
@@ -68,7 +66,6 @@ func (s *DockerSuite) TestCliInfoEnsureSucceeds(c *check.C) {
 //	c.Assert(out, checker.Contains, fmt.Sprintf("Cluster advertise: %s\n", discoveryAdvertise))
 //}
 
-
 //comment: not support discoveryBackend
 //// TestInfoDiscoveryInvalidAdvertise verifies that a daemon run with
 //// an invalid `--cluster-advertise` configuration
@@ -88,7 +85,6 @@ func (s *DockerSuite) TestCliInfoEnsureSucceeds(c *check.C) {
 //	c.Assert(err, checker.Not(checker.IsNil))
 //}
 
-
 //comment: not support discoveryBackend
 //// TestInfoDiscoveryAdvertiseInterfaceName verifies that a daemon run with `--cluster-advertise`
 //// configured with interface name properly show the advertise ip-address in info output.
@@ -118,10 +114,12 @@ func (s *DockerSuite) TestCliInfoEnsureSucceeds(c *check.C) {
 //	c.Assert(out, checker.Contains, fmt.Sprintf("Cluster advertise: %s:2375\n", ip.String()))
 //}
 
-func (s *DockerSuite) TestCliInfoDisplaysRunningContainers(c *check.C) {
-	printTestCaseName(); defer printTestDuration(time.Now())
+func (s *DockerSuite) TestCliInfoDisplaysRunningContainersBasic(c *check.C) {
+	printTestCaseName()
+	defer printTestDuration(time.Now())
 	testRequires(c, DaemonIsLinux)
 
+	pullImageIfNotExist("busybox")
 	dockerCmd(c, "run", "-d", "busybox", "top")
 	out, _ := dockerCmd(c, "info")
 	c.Assert(out, checker.Contains, fmt.Sprintf("Containers: %d\n", 1))
@@ -148,12 +146,14 @@ func (s *DockerSuite) TestCliInfoDisplaysRunningContainers(c *check.C) {
 //}
 
 func (s *DockerSuite) TestCliInfoDisplaysStoppedContainers(c *check.C) {
-	printTestCaseName(); defer printTestDuration(time.Now())
+	printTestCaseName()
+	defer printTestDuration(time.Now())
 	testRequires(c, DaemonIsLinux)
 
+	pullImageIfNotExist("busybox")
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
 	outAry := strings.Split(out, "\n")
-	c.Assert(len(outAry), checker.GreaterOrEqualThan,2)
+	c.Assert(len(outAry), checker.GreaterOrEqualThan, 2)
 	cleanedContainerID := outAry[len(outAry)-2]
 
 	dockerCmd(c, "stop", cleanedContainerID)

integration-cli/hyper_cli_info_test.go

@@ -1,13 +1,19 @@
 package main
 
 import (
+	"time"
+
 	"github.com/docker/docker/pkg/integration/checker"
 	"github.com/docker/engine-api/types"
 	"github.com/go-check/check"
 )
 
-func (s *DockerSuite) TestCliInspectNamedMountPoint(c *check.C) {
+func (s *DockerSuite) TestCliInspectNamedMountPointBasic(c *check.C) {
+	printTestCaseName()
+	defer printTestDuration(time.Now())
 	testRequires(c, DaemonIsLinux)
+
+	pullImageIfNotExist("busybox")
 	dockerCmd(c, "run", "-d", "--name", "test", "-v", "data:/data", "busybox", "cat")
 
 	vol := inspectFieldJSON(c, "test", "Mounts")

integration-cli/hyper_cli_inspect_experimental_test.go

@@ -18,10 +18,11 @@ func checkValidGraphDriver(c *check.C, name string) {
 	}
 }
 
-func (s *DockerSuite) TestCliInspectImage(c *check.C) {
+func (s *DockerSuite) TestCliInspectImageBasic(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
 	testRequires(c, DaemonIsLinux)
+
 	imageTest := "busybox:1.26.2"
 	ensureImageExist(c, imageTest)
 	// It is important that this ID remain stable. If a code change causes
@@ -41,6 +42,7 @@ func (s *DockerSuite) TestCliInspectInt64(c *check.C) {
 	defer printTestDuration(time.Now())
 	testRequires(c, DaemonIsLinux)
 
+	pullImageIfNotExist("busybox")
 	dockerCmd(c, "run", "-d", "--name", "inspect-test", "busybox", "true")
 	inspectOut := inspectField(c, "inspect-test", "HostConfig.Memory")
 	c.Assert(inspectOut, checker.Equals, "0")
@@ -53,18 +55,21 @@ func (s *DockerSuite) TestCliInspectDefault(c *check.C) {
 	//Both the container and image are named busybox. docker inspect will fetch the container JSON.
 	//If the container JSON is not available, it will go for the image JSON.
 
+	pullImageIfNotExist("busybox")
 	out, _ := dockerCmd(c, "run", "--name=busybox", "-d", "busybox", "true")
 	containerID := getIDfromOutput(c, out)
 
 	inspectOut := inspectField(c, "busybox", "Id")
 	c.Assert(strings.TrimSpace(inspectOut), checker.Equals, containerID)
 }
 
-func (s *DockerSuite) TestCliInspectStatus(c *check.C) {
+func (s *DockerSuite) TestCliInspectStatusBasic(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
 	//	defer unpauseAllContainers()
 	testRequires(c, DaemonIsLinux)
+
+	pullImageIfNotExist("busybox")
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
 	out = getIDfromOutput(c, out)
 
@@ -84,6 +89,7 @@ func (s *DockerSuite) TestCliInspectTypeFlagContainer(c *check.C) {
 	//Both the container and image are named busybox. docker inspect will fetch container
 	//JSON State.Running field. If the field is true, it's a container.
 
+	pullImageIfNotExist("busybox")
 	dockerCmd(c, "run", "--name=busybox", "-d", "busybox", "top")
 
 	formatStr := "--format='{{.State.Running}}'"
@@ -99,6 +105,7 @@ func (s *DockerSuite) TestCliInspectTypeFlagWithNoContainer(c *check.C) {
 	//JSON. Since there is no container named busybox and --type=container, docker inspect will
 	//not try to get the image JSON. It will throw an error.
 
+	pullImageIfNotExist("busybox")
 	dockerCmd(c, "run", "-d", "busybox", "true")
 
 	_, _, err := dockerCmdWithError("inspect", "--type=container", "busybox")
@@ -114,6 +121,7 @@ func (s *DockerSuite) TestCliInspectTypeFlagWithImage(c *check.C) {
 	//JSON as --type=image. if there is no image with name busybox, docker inspect
 	//will throw an error.
 
+	pullImageIfNotExist("busybox")
 	dockerCmd(c, "run", "--name=busybox", "-d", "busybox", "true")
 
 	out, _ := dockerCmd(c, "inspect", "--type=image", "busybox")
@@ -127,6 +135,7 @@ func (s *DockerSuite) TestCliInspectTypeFlagWithInvalidValue(c *check.C) {
 	//Both the container and image are named busybox. docker inspect will fail
 	//as --type=foobar is not a valid value for the flag.
 
+	pullImageIfNotExist("busybox")
 	dockerCmd(c, "run", "--name=busybox", "-d", "busybox", "true")
 
 	out, exitCode, err := dockerCmdWithError("inspect", "--type=foobar", "busybox")
@@ -139,6 +148,7 @@ func (s *DockerSuite) TestCliInspectImageFilterInt(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
 	testRequires(c, DaemonIsLinux)
+
 	imageTest := "busybox"
 	ensureImageExist(c, imageTest)
 	out := inspectField(c, imageTest, "Size")
@@ -154,10 +164,12 @@ func (s *DockerSuite) TestCliInspectImageFilterInt(c *check.C) {
 	c.Assert(result, checker.Equals, true)
 }
 
-func (s *DockerSuite) TestCliInspectContainerFilterInt(c *check.C) {
+func (s *DockerSuite) TestCliInspectContainerFilterIntBasic(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
 	testRequires(c, DaemonIsLinux)
+
+	pullImageIfNotExist("busybox")
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
 	id := getIDfromOutput(c, out)
 
@@ -178,6 +190,7 @@ func (s *DockerSuite) TestCliInspectImageGraphDriver(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
 	testRequires(c, DaemonIsLinux)
+
 	imageTest := "busybox"
 	ensureImageExist(c, imageTest)
 	name := inspectField(c, imageTest, "GraphDriver.Name")
@@ -204,6 +217,8 @@ func (s *DockerSuite) TestCliInspectTimesAsRFC3339Nano(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
 	testRequires(c, DaemonIsLinux)
+
+	pullImageIfNotExist("busybox")
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "true")
 	id := getIDfromOutput(c, out)
 
@@ -229,6 +244,8 @@ func (s *DockerSuite) TestCliInspectLogConfigNoType(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
 	testRequires(c, DaemonIsLinux)
+
+	pullImageIfNotExist("busybox")
 	dockerCmd(c, "create", "--name=test", "busybox")
 	var logConfig container.LogConfig
 
@@ -248,6 +265,7 @@ func (s *DockerSuite) TestCliInspectNoSizeFlagContainer(c *check.C) {
 	//Both the container and image are named busybox. docker inspect will fetch container
 	//JSON SizeRw and SizeRootFs field. If there is no flag --size/-s, there are no size fields.
 
+	pullImageIfNotExist("busybox")
 	dockerCmd(c, "run", "--name=busybox", "-d", "busybox", "top")
 
 	formatStr := "--format='{{.SizeRw}},{{.SizeRootFs}}'"
@@ -258,6 +276,8 @@ func (s *DockerSuite) TestCliInspectNoSizeFlagContainer(c *check.C) {
 func (s *DockerSuite) TestCliInspectSizeFlagContainer(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
+
+	pullImageIfNotExist("busybox")
 	dockerCmd(c, "run", "--name=busybox", "-d", "busybox", "top")
 
 	formatStr := "--format='{{.SizeRw}},{{.SizeRootFs}}'"
@@ -271,6 +291,8 @@ func (s *DockerSuite) TestCliInspectSizeFlagContainer(c *check.C) {
 func (s *DockerSuite) TestCliInspectSizeFlagImage(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
+
+	pullImageIfNotExist("busybox")
 	dockerCmd(c, "run", "--name=busybox", "-d", "busybox", "top")
 
 	formatStr := "--format='{{.SizeRw}},{{.SizeRootFs}}'"
@@ -285,8 +307,9 @@ func (s *DockerSuite) TestCliInspectSizeFlagImage(c *check.C) {
 func (s *DockerSuite) TestCliInspectTempateError(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
-	// Template parsing error for both the container and image.
 
+	// Template parsing error for both the container and image.
+	pullImageIfNotExist("busybox")
 	dockerCmd(c, "run", "--name=container1", "-d", "busybox", "top")
 
 	out, _, err := dockerCmdWithError("inspect", "--type=container", "--format='Format container: {{.ThisDoesNotExist}}'", "container1")
@@ -301,6 +324,8 @@ func (s *DockerSuite) TestCliInspectTempateError(c *check.C) {
 func (s *DockerSuite) TestCliInspectJSONFields(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
+
+	pullImageIfNotExist("busybox")
 	dockerCmd(c, "run", "--name=busybox", "-d", "busybox", "top")
 	out, _, err := dockerCmdWithError("inspect", "--type=container", "--format='{{.HostConfig.Dns}}'", "busybox")
 
@@ -311,6 +336,7 @@ func (s *DockerSuite) TestCliInspectJSONFields(c *check.C) {
 func (s *DockerSuite) TestCliInspectByPrefix(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
+
 	imageTest := "busybox"
 	ensureImageExist(c, imageTest)
 	id := inspectField(c, imageTest, "Id")
@@ -326,6 +352,8 @@ func (s *DockerSuite) TestCliInspectByPrefix(c *check.C) {
 func (s *DockerSuite) TestCliInspectStopWhenNotFound(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
+
+	pullImageIfNotExist("busybox")
 	dockerCmd(c, "run", "--name=busybox", "-d", "busybox", "top")
 	dockerCmd(c, "run", "--name=not-shown", "-d", "busybox", "top")
 	out, _, err := dockerCmdWithError("inspect", "--type=container", "--format='{{.Name}}'", "busybox", "missing", "not-shown")