[integration-test] 1.fix some test case 2.support automated build docker image 'hyperhq/hypercli-auto-test'

Author: Jimmy-Xu

Dockerfile.centos

@@ -49,7 +49,7 @@ ENTRYPOINT ["hack/generate-hyper-conf.sh"]
 # install on-my-zsh
 RUN yum install -y zsh
 RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
-RUN sed -i "s/^ZSH_THEME=.*/ZSH_THEME=agnoster/g" /root/.zshrc
+RUN sed -i "s/^ZSH_THEME=.*/ZSH_THEME=\"gianu\"/g" /root/.zshrc
 RUN echo alias hypercli=\"hyper -H \${DOCKER_HOST}\" >> /root/.zshrc
 
 # config git
@@ -66,4 +66,3 @@ RUN git config --global color.ui true; \
     git config --global alias.cm '!sh -c "br_name=`git symbolic-ref HEAD|sed s#refs/heads/##`; git commit -em \"[\${br_name}] \""'; \
     git config --global alias.lg "log --graph --pretty=format:'[%ci] %Cgreen(%cr) %Cred%h%Creset -%x09%C(yellow)%Creset %C(cyan)[%an]%Creset %x09 %s%Creset' --abbrev-commit --date=short"; \
     git config --global push.default current
-

integration-cli/README.md

@@ -244,11 +244,11 @@ $ ./util.sh test all
 $ ./util.sh test all -timout 20m
 
 // run specified test case
-$ ./util.sh test -check.f ^TestLoadFromLocalTar$
+$ ./util.sh test -check.f ^TestCliLoadFromLocalTar$
 
 // run test cases start with specified prefix
-$ ./util.sh test -check.f TestLoadFromLocalTar
+$ ./util.sh test -check.f TestCliLoadFromLocalTar
 
 // combined use
-$ ./util.sh test -check.f 'TestLoadFromLocalTarEmpty|TestLoadFromLocalPullAndLoad' -timeout 20m
+$ ./util.sh test -check.f 'TestCliLoadFromLocalTarEmpty|TestCliLoadFromLocalPullAndLoad' -timeout 20m
 ```

integration-cli/docker_utils.go

@@ -1854,6 +1854,14 @@ func getInspectBody(c *check.C, version, id string) []byte {
 	return body
 }
 
+func getInspectBodyWithoutVersion(c *check.C, id string) []byte {
+	endpoint := fmt.Sprintf("/containers/%s/json", id)
+	status, body, err := sockRequest("GET", endpoint, nil)
+	c.Assert(err, check.IsNil)
+	c.Assert(status, check.Equals, http.StatusOK)
+	return body
+}
+
 // Run a long running idle task in a background container using the
 // system-specific default image and command.
 func runSleepingContainer(c *check.C, extraArgs ...string) (string, int) {

integration-cli/hyper_api_create_test.go

@@ -3,12 +3,16 @@ package main
 import (
 	"net/http"
 	"strings"
+	"time"
 
 	"github.com/docker/docker/pkg/integration/checker"
 	"github.com/go-check/check"
 )
 
 func (s *DockerSuite) TestApiCreateWithNotExistImage(c *check.C) {
+	printTestCaseName()
+	defer printTestDuration(time.Now())
+
 	name := "test"
 	config := map[string]interface{}{
 		"Image":   "test456:v1",

integration-cli/hyper_api_exec_test.go renamed to integration-cli/hyper_api_exec_basic_test.go

@@ -15,7 +15,7 @@ import (
 )
 
 // Regression test for #9414
-func (s *DockerSuite) TestApiExecCreateNoCmd(c *check.C) {
+func (s *DockerSuite) TestApiExecBasicCreateNoCmd(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
 
@@ -30,7 +30,7 @@ func (s *DockerSuite) TestApiExecCreateNoCmd(c *check.C) {
 	c.Assert(string(body), checker.Contains, "No exec command specified", comment)
 }
 
-func (s *DockerSuite) TestApiExecCreateNoValidContentType(c *check.C) {
+func (s *DockerSuite) TestApiExecBasicCreateNoValidContentType(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
 
@@ -54,7 +54,7 @@ func (s *DockerSuite) TestApiExecCreateNoValidContentType(c *check.C) {
 }
 
 //TODO: fix #86
-/*func (s *DockerSuite) TestApiExecApiStart(c *check.C) {
+/*func (s *DockerSuite) TestApiExecBasicApiStart(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
 
@@ -73,7 +73,7 @@ func (s *DockerSuite) TestApiExecCreateNoValidContentType(c *check.C) {
 	startExec(c, id, http.StatusNotFound)
 }
 
-func (s *DockerSuite) TestApiExecApiStartMultipleTimesError(c *check.C) {
+func (s *DockerSuite) TestApiExecBasicApiStartMultipleTimesError(c *check.C) {
 	printTestCaseName()
 	defer printTestDuration(time.Now())
 

integration-cli/hyper_api_images_test.go

@@ -36,7 +36,7 @@ func (s *DockerSuite) TestApiImagesLoad(c *check.C) {
 	c.Assert(err, check.IsNil)
 	c.Assert(status, check.Equals, http.StatusOK)
 
-	expected := "{\"status\":\"Start to download and load the image archive, please wait...\"}"
+	expected := "{\"status\":\"Starting to download and load the image archive, please wait...\"}"
 	c.Assert(strings.TrimSpace(string(resp)), checker.Contains, expected)
 
 	expected = "has been loaded.\"}"

integration-cli/hyper_api_inspect_test.go

@@ -3,12 +3,17 @@ package main
 import (
 	"encoding/json"
 	"strings"
+	"time"
 
 	"github.com/docker/docker/pkg/integration/checker"
 	"github.com/go-check/check"
 )
 
 func (s *DockerSuite) TestApiInspectContainerResponse(c *check.C) {
+	printTestCaseName()
+	defer printTestDuration(time.Now())
+
+	ensureImageExist(c, "busybox")
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "true")
 
 	cleanedContainerID := strings.TrimSpace(out)

integration-cli/util.sh

@@ -28,6 +28,7 @@ EOF
 }
 
 #############################################################################
+IMAGE_NAME="hyperhq/hypercli-auto-test:latest"
 WORKDIR=$(cd `dirname $0`; pwd)
 cd ${WORKDIR}
 
@@ -53,13 +54,13 @@ fi
 case $1 in
   build)
     cd ${WORKDIR}/..
-    docker build -t hyperhq/hypercli -f Dockerfile.centos .
+    docker build -t ${IMAGE_NAME} -f Dockerfile.centos .
     ;;
   make)
     echo "Start compile hyper client, please wait..."
     docker run -it --rm \
         -v $(pwd)/../:/go/src/github.com/hyperhq/hypercli \
-        hyperhq/hypercli ./build.sh
+        ${IMAGE_NAME} ./build.sh
     ;;
   enter)
     docker run -it --rm \
@@ -71,7 +72,7 @@ case $1 in
         -e URL_WITH_BASIC_AUTH=${URL_WITH_BASIC_AUTH} \
         -e MONGODB_URL=${MONGODB_URL} \
         -v $(pwd)/../:/go/src/github.com/hyperhq/hypercli \
-        hyperhq/hypercli bash
+        ${IMAGE_NAME} zsh
     ;;
   test)
     export DOCKER_HOST=${HYPER_HOST}