Isolate image pulling time from container startup

mysql image test is timing out sporadically and it's hard to tell
where the slow down in coming from.

PiperOrigin-RevId: 207147237
Change-Id: I05a4d2c116292695d63cf861f3b89cd1c54b6106

3 files changed, 15 insertions, 0 deletions

diff --git a/runsc/test/image/image_test.go b/runsc/test/image/image_test.go
index 04c334d92..248934484 100644
--- a/runsc/test/image/image_test.go
+++ b/runsc/test/image/image_test.go
@@ -82,6 +82,9 @@ func testHTTPServer(port int) error {
 }
 
 func TestHttpd(t *testing.T) {
+	if out, err := testutil.Pull("httpd"); err != nil {
+		t.Fatalf("docker pull failed: %v\nout: %s", err, out)
+	}
 	d := testutil.MakeDocker("http-test")
 
 	dir, err := testutil.PrepareFiles("latin10k.txt")
@@ -112,6 +115,9 @@ func TestHttpd(t *testing.T) {
 }
 
 func TestNginx(t *testing.T) {
+	if out, err := testutil.Pull("nginx"); err != nil {
+		t.Fatalf("docker pull failed: %v\nout: %s", err, out)
+	}
 	d := testutil.MakeDocker("net-test")
 
 	dir, err := testutil.PrepareFiles("latin10k.txt")
@@ -142,6 +148,9 @@ func TestNginx(t *testing.T) {
 }
 
 func TestMysql(t *testing.T) {
+	if out, err := testutil.Pull("mysql"); err != nil {
+		t.Fatalf("docker pull failed: %v\nout: %s", err, out)
+	}
 	d := testutil.MakeDocker("mysql-test")
 
 	// Start the container.
diff --git a/runsc/test/image/python_test.go b/runsc/test/image/python_test.go
index e7324e83e..b77a6ec87 100644
--- a/runsc/test/image/python_test.go
+++ b/runsc/test/image/python_test.go
@@ -24,6 +24,9 @@ import (
 )
 
 func TestPythonHello(t *testing.T) {
+	if out, err := testutil.Pull("google/python-hello"); err != nil {
+		t.Fatalf("docker pull failed: %v\nout: %s", err, out)
+	}
 	d := testutil.MakeDocker("python-hello-test")
 	if out, err := d.Run("-p", "8080", "google/python-hello"); err != nil {
 		t.Fatalf("docker run failed: %v\nout: %s", err, out)
diff --git a/runsc/test/image/tomcat_test.go b/runsc/test/image/tomcat_test.go
index 578385ca7..dd47ab6da 100644
--- a/runsc/test/image/tomcat_test.go
+++ b/runsc/test/image/tomcat_test.go
@@ -24,6 +24,9 @@ import (
 )
 
 func TestTomcat(t *testing.T) {
+	if out, err := testutil.Pull("tomcat:8.0"); err != nil {
+		t.Fatalf("docker pull failed: %v\nout: %s", err, out)
+	}
 	d := testutil.MakeDocker("tomcat-test")
 	if out, err := d.Run("-p", "8080", "tomcat:8.0"); err != nil {
 		t.Fatalf("docker run failed: %v\nout: %s", err, out)