Merge pull request #943 from Letty5411/0322

test: use stable image tag
AliyunContainerService · Mar 28, 2018 · 2f15bb9 · 2f15bb9
2 parents 8c443ac + 23215af
commit 2f15bb9
Show file tree

Hide file tree

Showing 39 changed files with 229 additions and 102 deletions.
diff --git a/hack/make.sh b/hack/make.sh
@@ -120,7 +120,7 @@ function target()
 			fi
 		done
 
-		pouch pull registry.hub.docker.com/library/busybox:latest >/dev/null
+		pouch pull registry.hub.docker.com/library/busybox:1.28 >/dev/null
 
 		echo "verify pouch version"
 		pouch version

diff --git a/test/api_container_attach_test.go b/test/api_container_attach_test.go
@@ -3,12 +3,10 @@ package main
 import (
 	"net/url"
 
-	"github.com/alibaba/pouch/test/command"
 	"github.com/alibaba/pouch/test/environment"
 	"github.com/alibaba/pouch/test/request"
 
 	"github.com/go-check/check"
-	"github.com/gotestyourself/gotestyourself/icmd"
 )
 
 // APIContainerAttachSuite is the test suite for container attach API.
@@ -22,7 +20,7 @@ func init() {
 func (suite *APIContainerAttachSuite) SetUpTest(c *check.C) {
 	SkipIfFalse(c, environment.IsLinux)
 
-	command.PouchRun("pull", busyboxImage).Assert(c, icmd.Success)
+	PullImage(c, busyboxImage)
 }
 
 // TestContainerAttachStdin tests attaching stdin is OK.

diff --git a/test/api_container_create_test.go b/test/api_container_create_test.go
@@ -4,12 +4,10 @@ import (
 	"net/url"
 
 	"github.com/alibaba/pouch/apis/types"
-	"github.com/alibaba/pouch/test/command"
 	"github.com/alibaba/pouch/test/environment"
 	"github.com/alibaba/pouch/test/request"
 
 	"github.com/go-check/check"
-	"github.com/gotestyourself/gotestyourself/icmd"
 )
 
 // APIContainerCreateSuite is the test suite for container create API.
@@ -22,7 +20,7 @@ func init() {
 // SetUpTest does common setup in the beginning of each test.
 func (suite *APIContainerCreateSuite) SetUpTest(c *check.C) {
 	SkipIfFalse(c, environment.IsLinux)
-	command.PouchRun("pull", busyboxImage).Assert(c, icmd.Success)
+	PullImage(c, busyboxImage)
 }
 
 // TestCreateOk test create api is ok with default parameters.

diff --git a/test/api_container_delete_test.go b/test/api_container_delete_test.go
@@ -1,12 +1,10 @@
 package main
 
 import (
-	"github.com/alibaba/pouch/test/command"
 	"github.com/alibaba/pouch/test/environment"
 	"github.com/alibaba/pouch/test/request"
 
 	"github.com/go-check/check"
-	"github.com/gotestyourself/gotestyourself/icmd"
 )
 
 // APIContainerDeleteSuite is the test suite for container delete API.
@@ -19,7 +17,7 @@ func init() {
 // SetUpTest does common setup in the beginning of each test.
 func (suite *APIContainerDeleteSuite) SetUpTest(c *check.C) {
 	SkipIfFalse(c, environment.IsLinux)
-	command.PouchRun("pull", busyboxImage).Assert(c, icmd.Success)
+	PullImage(c, busyboxImage)
 }
 
 // TestDeleteNonExisting tests deleting a non-existing container return error.

diff --git a/test/api_container_exec_start_test.go b/test/api_container_exec_start_test.go
@@ -5,12 +5,10 @@ import (
 	"io"
 	"net"
 
-	"github.com/alibaba/pouch/test/command"
 	"github.com/alibaba/pouch/test/environment"
 	"github.com/alibaba/pouch/test/request"
 
 	"github.com/go-check/check"
-	"github.com/gotestyourself/gotestyourself/icmd"
 )
 
 // APIContainerExecStartSuite is the test suite for container exec start API.
@@ -23,7 +21,7 @@ func init() {
 // SetUpTest does common setup in the beginning of each test.
 func (suite *APIContainerExecStartSuite) SetUpTest(c *check.C) {
 	SkipIfFalse(c, environment.IsLinux)
-	command.PouchRun("pull", busyboxImage).Assert(c, icmd.Success)
+	PullImage(c, busyboxImage)
 }
 
 func checkEchoSuccess(c *check.C, conn net.Conn, br *bufio.Reader, exp string) {

diff --git a/test/api_container_exec_test.go b/test/api_container_exec_test.go
@@ -1,12 +1,10 @@
 package main
 
 import (
-	"github.com/alibaba/pouch/test/command"
 	"github.com/alibaba/pouch/test/environment"
 	"github.com/alibaba/pouch/test/request"
 
 	"github.com/go-check/check"
-	"github.com/gotestyourself/gotestyourself/icmd"
 )
 
 // APIContainerExecSuite is the test suite for container exec API.
@@ -19,7 +17,7 @@ func init() {
 // SetUpTest does common setup in the beginning of each test.
 func (suite *APIContainerExecSuite) SetUpTest(c *check.C) {
 	SkipIfFalse(c, environment.IsLinux)
-	command.PouchRun("pull", busyboxImage).Assert(c, icmd.Success)
+	PullImage(c, busyboxImage)
 }
 
 // TestContainerCreateExecOk tests execing containers is OK.

diff --git a/test/api_container_inspect_test.go b/test/api_container_inspect_test.go
@@ -2,12 +2,10 @@ package main
 
 import (
 	"github.com/alibaba/pouch/apis/types"
-	"github.com/alibaba/pouch/test/command"
 	"github.com/alibaba/pouch/test/environment"
 	"github.com/alibaba/pouch/test/request"
 
 	"github.com/go-check/check"
-	"github.com/gotestyourself/gotestyourself/icmd"
 )
 
 // APIContainerInspectSuite is the test suite for container inspect API.
@@ -20,7 +18,7 @@ func init() {
 // SetUpTest does common setup in the beginning of each test.
 func (suite *APIContainerInspectSuite) SetUpTest(c *check.C) {
 	SkipIfFalse(c, environment.IsLinux)
-	command.PouchRun("pull", busyboxImage).Assert(c, icmd.Success)
+	PullImage(c, busyboxImage)
 }
 
 // TestInspectNoSuchContainer tests inspecting a container that doesn't exits return error.

diff --git a/test/api_container_list_test.go b/test/api_container_list_test.go
@@ -1,12 +1,10 @@
 package main
 
 import (
-	"github.com/alibaba/pouch/test/command"
 	"github.com/alibaba/pouch/test/environment"
 	"github.com/alibaba/pouch/test/request"
 
 	"github.com/go-check/check"
-	"github.com/gotestyourself/gotestyourself/icmd"
 )
 
 // APIContainerListSuite is the test suite for container list API.
@@ -19,7 +17,7 @@ func init() {
 // SetUpTest does common setup in the beginning of each test.
 func (suite *APIContainerListSuite) SetUpTest(c *check.C) {
 	SkipIfFalse(c, environment.IsLinux)
-	command.PouchRun("pull", busyboxImage).Assert(c, icmd.Success)
+	PullImage(c, busyboxImage)
 }
 
 // TestListOk test api is ok with default parameters.

diff --git a/test/api_container_pause_test.go b/test/api_container_pause_test.go
@@ -1,12 +1,10 @@
 package main
 
 import (
-	"github.com/alibaba/pouch/test/command"
 	"github.com/alibaba/pouch/test/environment"
 	"github.com/alibaba/pouch/test/request"
 
 	"github.com/go-check/check"
-	"github.com/gotestyourself/gotestyourself/icmd"
 )
 
 // APIContainerPauseSuite is the test suite for container pause/unpause API.
@@ -19,7 +17,7 @@ func init() {
 // SetUpTest does common setup in the beginning of each test.
 func (suite *APIContainerPauseSuite) SetUpTest(c *check.C) {
 	SkipIfFalse(c, environment.IsLinux)
-	command.PouchRun("pull", busyboxImage).Assert(c, icmd.Success)
+	PullImage(c, busyboxImage)
 }
 
 // TestPauseUnpauseOk tests a running container could be paused and unpaused.

diff --git a/test/api_container_rename_test.go b/test/api_container_rename_test.go
@@ -3,12 +3,10 @@ package main
 import (
 	"net/url"
 
-	"github.com/alibaba/pouch/test/command"
 	"github.com/alibaba/pouch/test/environment"
 	"github.com/alibaba/pouch/test/request"
 
 	"github.com/go-check/check"
-	"github.com/gotestyourself/gotestyourself/icmd"
 )
 
 // APIContainerRenameSuite is the test suite for container create API.
@@ -21,7 +19,7 @@ func init() {
 // SetUpTest does common setup in the beginning of each test.
 func (suite *APIContainerRenameSuite) SetUpTest(c *check.C) {
 	SkipIfFalse(c, environment.IsLinux)
-	command.PouchRun("pull", busyboxImage).Assert(c, icmd.Success)
+	PullImage(c, busyboxImage)
 }
 
 // TestRenameOk test create api is ok with default parameters.

diff --git a/test/api_container_resize.go b/test/api_container_resize.go
@@ -20,6 +20,7 @@ func init() {
 func (suite *APIContainerResizeSuite) SetUpTest(c *check.C) {
 	SkipIfFalse(c, environment.IsLinux)
 
+	PullImage(c, busyboxImage)
 }
 
 // TestContainerResizeOk is to verify resize container.

diff --git a/test/api_container_start_test.go b/test/api_container_start_test.go
@@ -3,12 +3,10 @@ package main
 import (
 	"net/url"
 
-	"github.com/alibaba/pouch/test/command"
 	"github.com/alibaba/pouch/test/environment"
 	"github.com/alibaba/pouch/test/request"
 
 	"github.com/go-check/check"
-	"github.com/gotestyourself/gotestyourself/icmd"
 )
 
 // APIContainerStartSuite is the test suite for container pause/unpause API.
@@ -21,7 +19,7 @@ func init() {
 // SetUpTest does common setup in the beginning of each test.
 func (suite *APIContainerStartSuite) SetUpTest(c *check.C) {
 	SkipIfFalse(c, environment.IsLinux)
-	command.PouchRun("pull", busyboxImage).Assert(c, icmd.Success)
+	PullImage(c, busyboxImage)
 }
 
 // TestStartOk tests starting container could work.

diff --git a/test/api_container_stop_test.go b/test/api_container_stop_test.go
@@ -3,12 +3,10 @@ package main
 import (
 	"net/url"
 
-	"github.com/alibaba/pouch/test/command"
 	"github.com/alibaba/pouch/test/environment"
 	"github.com/alibaba/pouch/test/request"
 
 	"github.com/go-check/check"
-	"github.com/gotestyourself/gotestyourself/icmd"
 )
 
 // APIContainerStopSuite is the test suite for container stop API.
@@ -21,7 +19,7 @@ func init() {
 // SetUpTest does common setup in the beginning of each test.
 func (suite *APIContainerStopSuite) SetUpTest(c *check.C) {
 	SkipIfFalse(c, environment.IsLinux)
-	command.PouchRun("pull", busyboxImage).Assert(c, icmd.Success)
+	PullImage(c, busyboxImage)
 }
 
 // TestStopOk tests a running container could be stopped.

diff --git a/test/api_image_create_test.go b/test/api_image_create_test.go
@@ -26,8 +26,8 @@ func (suite *APIImageCreateSuite) SetUpTest(c *check.C) {
 // TestImageCreateOk tests creating an image is OK.
 func (suite *APIImageCreateSuite) TestImageCreateOk(c *check.C) {
 	q := url.Values{}
-	q.Add("fromImage", helloworldImage)
-	q.Add("tag", "latest")
+	q.Add("fromImage", environment.HelloworldRepo)
+	q.Add("tag", "linux")
 	query := request.WithQuery(q)
 	resp, err := request.Post("/images/create", query)
 	c.Assert(err, check.IsNil)
@@ -36,7 +36,7 @@ func (suite *APIImageCreateSuite) TestImageCreateOk(c *check.C) {
 	// TODO: add a waituntil func to check the exsitence of image
 	time.Sleep(5000 * time.Millisecond)
 
-	resp, err = request.Delete("/images/" + helloworldImage + ":latest")
+	resp, err = request.Delete("/images/" + environment.HelloworldRepo + ":linux")
 	c.Assert(err, check.IsNil)
 	CheckRespStatus(c, resp, 204)
 }
@@ -56,15 +56,15 @@ func (suite *APIImageCreateSuite) TestImageCreateNil(c *check.C) {
 // TestImageCreateWithoutTag tests creating an image without tag, will use "latest" by default.
 func (suite *APIImageCreateSuite) TestImageCreateWithoutTag(c *check.C) {
 	q := url.Values{}
-	q.Add("fromImage", helloworldImage)
+	q.Add("fromImage", environment.HelloworldRepo)
 	query := request.WithQuery(q)
 	resp, err := request.Post("/images/create", query)
 	c.Assert(err, check.IsNil)
 	CheckRespStatus(c, resp, 200)
 
 	time.Sleep(5000 * time.Millisecond)
 
-	resp, err = request.Delete("/images/" + helloworldImage + ":latest")
+	resp, err = request.Delete("/images/" + environment.HelloworldRepo + ":latest")
 	c.Assert(err, check.IsNil)
 	CheckRespStatus(c, resp, 204)
 }

diff --git a/test/api_image_inspect_test.go b/test/api_image_inspect_test.go
@@ -2,12 +2,10 @@ package main
 
 import (
 	"github.com/alibaba/pouch/apis/types"
-	"github.com/alibaba/pouch/test/command"
 	"github.com/alibaba/pouch/test/environment"
 	"github.com/alibaba/pouch/test/request"
 
 	"github.com/go-check/check"
-	"github.com/gotestyourself/gotestyourself/icmd"
 )
 
 // APIImageInspectSuite is the test suite for image inspect API.
@@ -20,7 +18,7 @@ func init() {
 // SetUpTest does common setup in the beginning of each test.
 func (suite *APIImageInspectSuite) SetUpTest(c *check.C) {
 	SkipIfFalse(c, environment.IsLinux)
-	command.PouchRun("pull", busyboxImage).Assert(c, icmd.Success)
+	PullImage(c, busyboxImage)
 }
 
 // TestImageInspectOk tests inspecting images is OK.

diff --git a/test/cli_alikernel_test.go b/test/cli_alikernel_test.go
@@ -25,7 +25,7 @@ func (suite *PouchAliKernelSuite) SetUpSuite(c *check.C) {
 
 	environment.PruneAllContainers(apiClient)
 
-	command.PouchRun("pull", busyboxImage).Assert(c, icmd.Success)
+	PullImage(c, busyboxImage)
 }
 
 // TearDownTest does cleanup work in the end of each test.

diff --git a/test/cli_create_test.go b/test/cli_create_test.go
@@ -26,7 +26,7 @@ func (suite *PouchCreateSuite) SetUpSuite(c *check.C) {
 
 	environment.PruneAllContainers(apiClient)
 
-	command.PouchRun("pull", busyboxImage).Assert(c, icmd.Success)
+	PullImage(c, busyboxImage)
 }
 
 // TearDownTest does cleanup work in the end of each test.

diff --git a/test/cli_exec_test.go b/test/cli_exec_test.go
@@ -23,7 +23,7 @@ func (suite *PouchExecSuite) SetUpSuite(c *check.C) {
 
 	environment.PruneAllContainers(apiClient)
 
-	command.PouchRun("pull", busyboxImage).Assert(c, icmd.Success)
+	PullImage(c, busyboxImage)
 }
 
 // TearDownTest does cleanup work in the end of each test.

diff --git a/test/cli_images_test.go b/test/cli_images_test.go
@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"strings"
 
 	"github.com/alibaba/pouch/apis/types"
@@ -30,7 +31,7 @@ func (suite *PouchImagesSuite) SetUpSuite(c *check.C) {
 
 	environment.PruneAllContainers(apiClient)
 
-	command.PouchRun("pull", busyboxImage).Assert(c, icmd.Success)
+	PullImage(c, busyboxImage)
 }
 
 // TestImagesWorks tests "pouch image" work.
@@ -52,7 +53,8 @@ func (suite *PouchImagesSuite) TestImagesWorks(c *check.C) {
 		resQuiet := command.PouchRun("images", "--quiet").Assert(c, icmd.Success)
 
 		c.Assert(resQ.Combined(), check.Equals, resQuiet.Combined())
-		c.Assert(strings.TrimSpace(resQ.Combined()), check.Equals, utils.TruncateID(image.ID))
+		err := util.PartialEqual(strings.TrimSpace(resQ.Combined()), utils.TruncateID(image.ID))
+		c.Assert(err, check.IsNil)
 	}
 
 	// with --digest
@@ -106,9 +108,7 @@ func (suite *PouchImagesSuite) TestInspectImage(c *check.C) {
 
 	// inspect image name
 	output = command.PouchRun("image", "inspect", "-f", "{{.RepoTags}}", busyboxImage).Stdout()
-	if !strings.Contains(output, busyboxImage) {
-		c.Fatalf("output %s should contains %s", output, busyboxImage)
-	}
+	c.Assert(output, check.Equals, fmt.Sprintf("[%s]\n", busyboxImage))
 }
 
 // TestLoginAndLogout is to test login and logout command

diff --git a/test/cli_inspect_test.go b/test/cli_inspect_test.go
@@ -26,7 +26,7 @@ func (suite *PouchInspectSuite) SetUpSuite(c *check.C) {
 
 	environment.PruneAllContainers(apiClient)
 
-	command.PouchRun("pull", busyboxImage).Assert(c, icmd.Success)
+	PullImage(c, busyboxImage)
 }
 
 // TearDownTest does cleanup work in the end of each test.