Merge pull request #1406 from fuweid/cherrypick_issue_1397

bugfix: use busybox:1.25 instead of busybox:1.28 in cli_tag_test
AliyunContainerService · May 24, 2018 · 52fd8e0 · 52fd8e0
2 parents 15ab49d + aa62efe
commit 52fd8e0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/test/cli_tag_test.go b/test/cli_tag_test.go
@@ -21,14 +21,14 @@ func init() {
 func (suite *PouchTagSuite) SetUpTest(c *check.C) {
 	SkipIfFalse(c, environment.IsLinux)
 
-	PullImage(c, busyboxImage)
+	PullImage(c, busyboxImage125)
 }
 
 // TestImageTagOKWithSourceImageName tests OK.
 func (suite *PouchTagSuite) TestImageTagOKWithSourceImageName(c *check.C) {
 	repo, tag := "localhost:5000/testimagetagok/pouch", "source.name"
 	tagRef := fmt.Sprintf("%s:%s", repo, tag)
-	command.PouchRun("tag", busyboxImage, tagRef).Assert(c, icmd.Success)
+	command.PouchRun("tag", busyboxImage125, tagRef).Assert(c, icmd.Success)
 	defer forceDeleteImage(c, tagRef)
 
 	command.PouchRun("image", "inspect", tagRef).Assert(c, icmd.Success)
@@ -39,7 +39,7 @@ func (suite *PouchTagSuite) TestImageTagOKWithSourceImageID(c *check.C) {
 	repo, tag := "localhost:5000/testimagetagok/pouch", "source.id"
 	tagRef := fmt.Sprintf("%s:%s", repo, tag)
 
-	command.PouchRun("tag", environment.BusyboxID, tagRef).Assert(c, icmd.Success)
+	command.PouchRun("tag", busyboxImage125ID, tagRef).Assert(c, icmd.Success)
 	defer forceDeleteImage(c, tagRef)
 
 	command.PouchRun("image", "inspect", tagRef).Assert(c, icmd.Success)
@@ -50,7 +50,7 @@ func (suite *PouchTagSuite) TestImageTagOKTargetWithoutTag(c *check.C) {
 	repo, tag := "localhost:5000/testimagetagok/pouch", "latest"
 	tagRef := fmt.Sprintf("%s:%s", repo, tag)
 
-	command.PouchRun("tag", busyboxImage, repo).Assert(c, icmd.Success)
+	command.PouchRun("tag", busyboxImage125, repo).Assert(c, icmd.Success)
 	defer forceDeleteImage(c, tagRef)
 
 	command.PouchRun("image", "inspect", tagRef).Assert(c, icmd.Success)
@@ -62,7 +62,7 @@ func (suite *PouchTagSuite) TestImageTagFailToUseDigest(c *check.C) {
 	dig := "sha256:1ac48589692a53a9b8c2d1ceaa6b402665aa7fe667ba51ccc03002300856d8c7"
 
 	tagRef := fmt.Sprintf("%s:%s@%s", repo, tag, dig)
-	got := command.PouchRun("tag", busyboxImage, tagRef).Stderr()
+	got := command.PouchRun("tag", busyboxImage125, tagRef).Stderr()
 	c.Assert(got, check.NotNil)
 
 	expectedErr := "refusing to create a tag with a digest reference"
@@ -76,7 +76,7 @@ func (suite *PouchTagSuite) TestImageTagFailToUseSha256AsName(c *check.C) {
 	repo, tag := "localhost:5000/testimagetagfail/sha256", "1.25"
 
 	tagRef := fmt.Sprintf("%s:%s", repo, tag)
-	got := command.PouchRun("tag", busyboxImage, tagRef).Stderr()
+	got := command.PouchRun("tag", busyboxImage125, tagRef).Stderr()
 	c.Assert(got, check.NotNil)
 
 	expectedErr := "refusing to create an reference using digest algorithm as name"

diff --git a/test/utils.go b/test/utils.go
@@ -22,10 +22,11 @@ var (
 )
 
 const (
-	busyboxImage125 = "registry.hub.docker.com/library/busybox:1.25"
-	testHubAddress  = "registry.hub.docker.com"
-	testHubUser     = "pouchcontainertest"
-	testHubPasswd   = "pouchcontainertest"
+	busyboxImage125   = "registry.hub.docker.com/library/busybox:1.25"
+	busyboxImage125ID = "sha256:e02e811dd08fd49e7f6032625495118e63f597eb150403d02e3238af1df240ba"
+	testHubAddress    = "registry.hub.docker.com"
+	testHubUser       = "pouchcontainertest"
+	testHubPasswd     = "pouchcontainertest"
 
 	testDaemonHTTPSAddr = "tcp://0.0.0.0:2000"
 	serverCa            = "/tmp/tls/server/ca.pem"