Merge pull request #3229 from estesp/fix-appveyor

crosbymichael · web-flow · commit 56a655285c61 · 2019-04-18T14:45:21.000-04:00
[release/1.2] cherry-pick: Appveyor fixes from master
diff --git a/client_test.go b/client_test.go
@@ -111,10 +111,11 @@ func TestMain(m *testing.M) {
 	}).Info("running tests against containerd")
 
 	// pull a seed image
+	log.G(ctx).Info("start to pull seed image")
 	if _, err = client.Pull(ctx, testImage, WithPullUnpack); err != nil {
-		ctrd.Stop()
-		ctrd.Wait()
 		fmt.Fprintf(os.Stderr, "%s: %s\n", err, buf.String())
+		ctrd.Kill()
+		ctrd.Wait()
 		os.Exit(1)
 	}
 
diff --git a/client_windows_test.go b/client_windows_test.go
@@ -23,7 +23,7 @@ import (
 
 const (
 	defaultAddress = `\\.\pipe\containerd-containerd-test`
-	testImage      = "docker.io/microsoft/nanoserver:latest"
+	testImage      = "docker.io/microsoft/nanoserver@sha256:8f78a4a7da4464973a5cd239732626141aec97e69ba3e4023357628630bc1ee2"
 )
 
 var (

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import (`
`23`	`23`
`24`	`24`	`const (`
`25`	`25`	defaultAddress = `\\.\pipe\containerd-containerd-test`
`26`		`- testImage = "docker.io/microsoft/nanoserver:latest"`
	`26`	`+ testImage = "docker.io/microsoft/nanoserver@sha256:8f78a4a7da4464973a5cd239732626141aec97e69ba3e4023357628630bc1ee2"`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`var (`