[integration-test] add test case for load local

Author: Jimmy-Xu

integration-cli/README.md

@@ -33,6 +33,8 @@ Integration test for hyper cli
 	- [if test case will be supported in the future](#if-test-case-will-be-supported-in-the-future)
 - [After issues fixed](#after-issues-fixed)
 
+- [Run test on localhost](#run-test-on-localhost)
+
 <!-- /TOC -->
 
 # Project status
@@ -292,3 +294,51 @@ ok      github.com/hyperhq/hypercli/integration-cli    ?s
 
 - move the test case from `integration-cli/issue` to `integration-cli` dir
 - go to [start test](#start-test)
+
+
+# Run test on localhost
+
+## prepare
+
+```
+// ensure hyperhq and docker dir
+mkdir -p $GOPATH/src/github.com/{hyperhq,docker}
+
+// clone and build hypercli
+cd $GOPATH/src/github.com/hyperhq
+git clone git@github.com:hyperhq/hypercli.git
+cd hypercli
+./build.sh
+
+// copy hyper binary to /usr/bin/hyper
+sudo cp hyper/hyper /usr/bin/hyper
+
+// create link
+cd $GOPATH/src/github.com/docker
+ln -s ../hyperhq/hypercli docker
+
+// generate util.conf
+$ cd $GOPATH/src/github.com/hyperhq/hypercli
+$ git checkout integration-test
+$ cd integration-cli
+$ ./util.sh
+
+// config util.conf
+$ vi util.conf
+HYPER_CONFIG=<$HOME/.hyper>
+ACCESS_KEY="<hyper access key>"
+SECRET_KEY="<hyper secret key>"
+```
+
+## run test case
+
+```
+// run all test cases
+$ ./util.sh test
+
+// run specified test case
+$ ./util.sh test TestLoadFromLocalTar$
+
+// run test cases start with specified prefix
+$ ./util.sh test TestLoadFromLocalTar
+```

integration-cli/docker_utils.go

@@ -23,19 +23,19 @@ import (
 	"strings"
 	"time"
 
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/docker/docker/opts"
 	"github.com/docker/docker/pkg/integration"
+	"github.com/docker/docker/pkg/integration/checker"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/docker/pkg/stringutils"
 	HyperCli "github.com/docker/engine-api/client"
 	"github.com/docker/engine-api/types"
 	"github.com/docker/go-connections/sockets"
 	"github.com/docker/go-connections/tlsconfig"
 	"github.com/go-check/check"
-	"github.com/aws/aws-sdk-go/service/s3"
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/docker/docker/pkg/integration/checker"
 )
 
 var flag_host = ""
@@ -622,7 +622,7 @@ func newRequestClient(method, endpoint string, data io.Reader, ct string) (*http
 	client := httputil.NewClientConn(c, nil)
 
 	//save to postData
-	postData := fmt.Sprintf("%v",data)
+	postData := fmt.Sprintf("%v", data)
 
 	req, err := http.NewRequest(method, fmt.Sprintf("/v1.23%s", endpoint), data)
 	if err != nil {
@@ -644,13 +644,13 @@ func newRequestClient(method, endpoint string, data io.Reader, ct string) (*http
 	if endpoint == debugEndpoint {
 		//output curl command line
 		fmt.Println("\n--------------------------------------------------------------------------------------------")
-		fmt.Printf("debugEndpoint: %v (expired after 5min)\n",debugEndpoint)
+		fmt.Printf("debugEndpoint: %v (expired after 5min)\n", debugEndpoint)
 		fmt.Println("--------------------------------------------------------------------------------------------")
 		fmt.Println("curl -v -k \\")
 		for k, v := range req.Header {
 			fmt.Printf("  -H \"%v: %v\" \\\n", k, v[0])
 		}
-		fmt.Printf("  -X %v \\\n",  method )
+		fmt.Printf("  -X %v \\\n", method)
 		if req.Body != nil {
 			fmt.Printf("  -d '%v' \\\n", postData)
 		}
@@ -778,7 +778,6 @@ func getAllSnapshots() ([]*types.Snapshot, error) {
 	return snapshots.Snapshots, nil
 }
 
-
 func deleteAllVolumes() error {
 	volumes, err := getAllVolumes()
 	if err != nil {
@@ -934,6 +933,14 @@ func pullImageIfNotExist(image string) error {
 	return nil
 }
 
+func pathExist(_path string) bool {
+	_, err := os.Stat(_path)
+	if err != nil && os.IsNotExist(err) {
+		return false
+	}
+	return true
+}
+
 func dockerCmdWithError(args ...string) (string, int, error) {
 	arg := []string{"--host=" + os.Getenv("DOCKER_HOST")}
 	args = append(arg, args...)
@@ -1881,7 +1888,7 @@ func printTestDuration(start time.Time) {
 	fmt.Printf(" - %.6f sec\n", duration)
 }
 
-func generateS3PreSignedURL(region,s3bucket,s3key string) (string, error) {
+func generateS3PreSignedURL(region, s3bucket, s3key string) (string, error) {
 
 	accessKey := os.Getenv("AWS_ACCESS_KEY")
 	secretKey := os.Getenv("AWS_SECRET_KEY")
@@ -1892,7 +1899,7 @@ func generateS3PreSignedURL(region,s3bucket,s3key string) (string, error) {
 
 	s3cli := s3.New(&aws.Config{
 		Credentials: credentials.NewStaticCredentials(accessKey, secretKey, ""),
-		Region: &region,
+		Region:      &region,
 	})
 
 	r, _ := s3cli.GetObjectRequest(&s3.GetObjectInput{
@@ -1917,30 +1924,29 @@ func getImageInspect(c *check.C, imageName string) *types.ImageInspect {
 	return &image
 }
 
-func ensureImageExist(c *check.C, imageName string){
+func ensureImageExist(c *check.C, imageName string) {
 	for i := 0; i < 3; i++ {
 		if _err := pullImageIfNotExist(imageName); _err != nil {
-			c.Logf("couldn't find the %s image locally and failed to pull it, try againt\n",imageName)
+			c.Logf("couldn't find the %s image locally and failed to pull it, try againt\n", imageName)
 		} else {
 			break
 		}
 	}
 }
 
 //get containerId or imageId from hyper command output
-func getIDfromOutput(c *check.C, output string)(string){
+func getIDfromOutput(c *check.C, output string) string {
 	outAry := strings.Split(output, "\n")
-	c.Assert(len(outAry), checker.GreaterOrEqualThan,2)
+	c.Assert(len(outAry), checker.GreaterOrEqualThan, 2)
 	id := outAry[len(outAry)-2]
 	return strings.TrimSpace(id)
 }
 
-
 func checkImage(c *check.C, shouldExist bool, imageName string) {
 	images, _ := dockerCmd(c, "images", imageName)
 	if shouldExist {
 		c.Assert(images, checker.Contains, imageName)
 	} else {
 		c.Assert(images, check.Not(checker.Contains), imageName)
 	}
-}
+}