[integration-test] clear resource before test

Author: Jimmy-Xu

integration-cli/README.md

@@ -345,7 +345,7 @@ $ docker run -it --rm \
 $ docker run -it --rm \
     -e ACCESS_KEY=${ACCESS_KEY} \
     -e SECRET_KEY=${SECRET_KEY} \
-		-e BRANCH="#221" \
+    -e BRANCH="#221" \
     hyperhq/hypercli-auto-test:qa go test -check.f TestCli -timeout 180m
 
 

integration-cli/check_test.go

@@ -35,13 +35,23 @@ func (s *DockerSuite) TearDownTest(c *check.C) {
 	deleteAllImages()
 	deleteAllSnapshots()
 	deleteAllVolumes()
+	deleteAllFips()
 	//deleteAllNetworks()
 }
 
 func init() {
 	check.Suite(&DockerRegistrySuite{
 		ds: &DockerSuite{},
 	})
+
+	fmt.Printf("INFO: clear resources(containers, images, snapshots, volumes, fips)\n")
+	deleteAllContainers()
+	deleteAllImages()
+	deleteAllSnapshots()
+	deleteAllVolumes()
+	deleteAllFips()
+
+	fmt.Println("INFO: finish init")
 }
 
 type DockerRegistrySuite struct {

integration-cli/docker_utils.go

@@ -114,7 +114,6 @@ func init() {
 	if os.Getenv("DOCKER_HOST") != "" {
 		flag_host = "--host=" + os.Getenv("DOCKER_HOST")
 	}
-	fmt.Println("finish init")
 }
 
 // Daemon represents a Docker daemon for the testing framework.
@@ -845,6 +844,44 @@ func deleteAllImages() error {
 	return nil
 }
 
+func deleteAllFips() error {
+	fips, err := getAllFips()
+	if err != nil {
+		return err
+	}
+
+	for _, v := range strings.Split(fips,"\n") {
+		if v == "" {
+			continue
+		}
+		fip := strings.Trim(v, " ")
+		releaseFipCmd := exec.Command(dockerBinary, flag_host, "fip", "release", fip)
+		out, exitCode, err := runCommandWithOutput(releaseFipCmd)
+		if exitCode != 0 && err == nil {
+			err = fmt.Errorf("failed to release fip: %v\n", out)
+			return err
+		}
+	}
+	return nil
+}
+
+func getAllFips() (string, error) {
+	//load via pipe
+	getFipsCmd := exec.Command(dockerBinary, flag_host, "fip", "ls")
+	grepCmd := exec.Command("grep", "-v", "^Floating IP")
+
+	getFipOut, err := getFipsCmd.StdoutPipe()
+	getFipsCmd.Start()
+
+	grepCmd.Stdin = getFipOut
+	output, err := grepCmd.Output()
+
+	if err != nil {
+		err = fmt.Errorf("failed to get a list of fips: %v\n", output)
+	}
+	return string(output), err
+}
+
 //status only support : created, restarting, running, exited (https://github.com/getdvm/hyper-api-router/blob/master/pkg/apiserver/router/local/container.go#L204)
 /*
 func getPausedContainers() (string, error) {

integration-cli/hyper_cli_links_test.go

@@ -192,6 +192,7 @@ func (s *DockerSuite) TestCliLinksEnvs(c *check.C) {
 	testRequires(c, DaemonIsLinux)
 	printTestCaseName()
 	defer printTestDuration(time.Now())
+	pullImageIfNotExist("busybox")
 	dockerCmd(c, "run", "-d", "-e", "e1=", "-e", "e2=v2", "-e", "e3=v3=v3", "--name=first", "busybox", "top")
 	out, _ := dockerCmd(c, "run", "--name=second", "--link=first:first", "busybox", "env")
 	/* FIXME

integration-cli/hyper_cli_logs_test.go

@@ -208,7 +208,7 @@ func (s *DockerSuite) TestCliLogsSince(c *check.C) {
 	pullImageIfNotExist("busybox")
 	name := "testlogssince"
 	dockerCmd(c, "run", "--name="+name, "-d", "busybox", "/bin/sh", "-c", "for i in $(seq 1 30); do sleep 2; echo log$i; done")
-	time.Sleep(5*time.Second)
+	time.Sleep(10*time.Second)
 
 	out, _ := dockerCmd(c, "logs", "-t", name)
 
@@ -249,7 +249,7 @@ func (s *DockerSuite) TestCliLogsSinceFutureFollow(c *check.C) {
 	testRequires(c, DaemonIsLinux)
 	pullImageIfNotExist("busybox")
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", `for i in $(seq 1 50); do date +%s; sleep 1; done`)
-	time.Sleep(5 * time.Second)
+	time.Sleep(20 * time.Second)
 	id := strings.TrimSpace(out)
 
 	now := daemonTime(c).Unix()

integration-cli/hyper_cli_ps_test.go

@@ -117,8 +117,6 @@ func (s *DockerSuite) TestCliPsListContainersBase(c *check.C) {
 }
 
 func assertContainerList(out string, expected []string) bool {
-	printTestCaseName()
-	defer printTestDuration(time.Now())
 
 	lines := strings.Split(strings.Trim(out, "\n "), "\n")
 	if len(lines)-1 != len(expected) {

integration-cli/hyper_cli_run_test.go

@@ -1110,8 +1110,8 @@ func (s *DockerSuite) TestCliRunRestartMaxRetries(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
 	pullImageIfNotExist("busybox")
-	out, _ := dockerCmd(c, "run", "-d", "--restart=on-failure:3", "busybox", "sh", "-c", "sleep 15; false")
-	timeout := 90 * time.Second
+	out, _ := dockerCmd(c, "run", "-d", "--restart=on-failure:3", "busybox", "sh", "-c", "sleep 20; false")
+	timeout := 100 * time.Second
 	if daemonPlatform == "windows" {
 		timeout = 45 * time.Second
 	}