diff options
| author | Fabricio Voznika <fvoznika@google.com> | 2018-08-07 13:47:16 -0700 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2018-08-07 13:48:35 -0700 |
| commit | cb23232c37c092b60d7e3ee91cb8dd8bed855028 (patch) | |
| tree | f0390f71cea833c3ac7214d5ec30c1862a4e6a95 /runsc/test/image/tomcat_test.go | |
| parent | c036da5dffdf6cad912abe2723e69c04b59430b7 (diff) | |
Fix build break in test
integration_test runs manually and breakage wasn't detected. Added test to
kokoro to ensure breakages are detected in the future.
PiperOrigin-RevId: 207772835
Change-Id: Iada81b579b558477d4db3516b38366ef6a2e933d
Diffstat (limited to 'runsc/test/image/tomcat_test.go')
| -rw-r--r-- | runsc/test/image/tomcat_test.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/runsc/test/image/tomcat_test.go b/runsc/test/image/tomcat_test.go index dd47ab6da..97cf95834 100644 --- a/runsc/test/image/tomcat_test.go +++ b/runsc/test/image/tomcat_test.go @@ -24,12 +24,12 @@ 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) + if err := testutil.Pull("tomcat:8.0"); err != nil { + t.Fatalf("docker pull failed: %v", err) } 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) + if _, err := d.Run("-p", "8080", "tomcat:8.0"); err != nil { + t.Fatalf("docker run failed: %v", err) } defer d.CleanUp() @@ -40,8 +40,8 @@ func TestTomcat(t *testing.T) { } // Wait until it's up and running. - if err := d.WaitForHTTP(port, 10*time.Second); err != nil { - t.Fatalf("docker.WaitForHTTP() timeout: %v", err) + if err := testutil.WaitForHTTP(port, 10*time.Second); err != nil { + t.Fatalf("WaitForHTTP() timeout: %v", err) } // Ensure that content is being served. |