github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Revert "Merge pull request #1502 from crosbymichael/test-image"

Browse Source 
This reverts commit 558b46f26e, reversing
changes made to 0e616f4d7a.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
This commit is contained in:
Phil Estes 2017-09-21 15:25:34 -04:00
parent 2f5dda6229
commit cadee0374b
No known key found for this signature in database
GPG Key ID: 0F386284C03A1162
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client_unix_test.go
View File

@ -33,7 +33,6 @@ func init() {
case "s390x": case "s390x":
testImage = "docker.io/s390x/alpine:latest" testImage = "docker.io/s390x/alpine:latest"
default: default:
// FIXME: change this back after multiplatform support is added to pull testImage = "docker.io/library/alpine:latest"
testImage = "docker.io/amd64/alpine:latest"
} }
} }

4
container_linux_test.go
View File

@ -730,9 +730,7 @@ func TestShimSigkilled(t *testing.T) {
defer cancel() defer cancel()
// redis unset its PDeathSignal making it a good candidate // redis unset its PDeathSignal making it a good candidate
// image, err = client.Pull(ctx, "docker.io/library/redis:alpine", WithPullUnpack)
// FIXME: change this back after multiplatform support is added to pull
image, err = client.Pull(ctx, "docker.io/amd64/redis:alpine", WithPullUnpack)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }