Merge pull request #2520 from dmcgowan/use-pause-multiplatform-test

estesp · web-flow · commit b8f4c7a9bdc0 · 2018-08-01T16:49:52.000-04:00
Update multi-arch image tests
diff --git a/client_test.go b/client_test.go
@@ -201,7 +201,7 @@ func TestImagePullAllPlatforms(t *testing.T) {
 	defer cancel()
 
 	cs := client.ContentStore()
-	img, err := client.Fetch(ctx, testImage)
+	img, err := client.Fetch(ctx, "docker.io/library/busybox:latest")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -249,7 +249,7 @@ func TestImagePullSomePlatforms(t *testing.T) {
 		opts = append(opts, WithPlatform(platform))
 	}
 
-	img, err := client.Fetch(ctx, "docker.io/library/busybox:latest", opts...)
+	img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.1", opts...)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/image_test.go b/image_test.go
@@ -45,7 +45,7 @@ func TestImageIsUnpacked(t *testing.T) {
 	}
 
 	// By default pull does not unpack an image
-	image, err := client.Pull(ctx, imageName)
+	image, err := client.Pull(ctx, imageName, WithPlatform("linux/amd64"))
 	if err != nil {
 		t.Fatal(err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ func TestImagePullAllPlatforms(t *testing.T) {`
`201`	`201`	`defer cancel()`
`202`	`202`
`203`	`203`	`cs := client.ContentStore()`
`204`		`- img, err := client.Fetch(ctx, testImage)`
	`204`	`+ img, err := client.Fetch(ctx, "docker.io/library/busybox:latest")`
`205`	`205`	`if err != nil {`
`206`	`206`	`t.Fatal(err)`
`207`	`207`	`}`
`@@ -249,7 +249,7 @@ func TestImagePullSomePlatforms(t *testing.T) {`
`249`	`249`	`opts = append(opts, WithPlatform(platform))`
`250`	`250`	`}`
`251`	`251`
`252`		`- img, err := client.Fetch(ctx, "docker.io/library/busybox:latest", opts...)`
	`252`	`+ img, err := client.Fetch(ctx, "k8s.gcr.io/pause:3.1", opts...)`
`253`	`253`	`if err != nil {`
`254`	`254`	`t.Fatal(err)`
`255`	`255`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ func TestImageIsUnpacked(t *testing.T) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`// By default pull does not unpack an image`
`48`		`- image, err := client.Pull(ctx, imageName)`
	`48`	`+ image, err := client.Pull(ctx, imageName, WithPlatform("linux/amd64"))`
`49`	`49`	`if err != nil {`
`50`	`50`	`t.Fatal(err)`
`51`	`51`	`}`