diff options
| author | Fabricio Voznika <fvoznika@google.com> | 2018-09-28 17:47:22 -0700 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2018-09-28 17:48:14 -0700 |
| commit | cfdd418fe23880cad88639596c1171cbe7ad6ffb (patch) | |
| tree | f060daffa70d7b2733a6a59214850d1c4321a67c /runsc/test/integration/integration_test.go | |
| parent | f21dde566641ee9d80730cc04f16d75df8b05036 (diff) | |
Made a few changes to make testutil.Docker easier to use
PiperOrigin-RevId: 215023376
Change-Id: I139569bd15c013e5dd0f60d0c98a64eaa0ba9e8e
Diffstat (limited to 'runsc/test/integration/integration_test.go')
| -rw-r--r-- | runsc/test/integration/integration_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runsc/test/integration/integration_test.go b/runsc/test/integration/integration_test.go index 59df5bd7c..457b5fbf5 100644 --- a/runsc/test/integration/integration_test.go +++ b/runsc/test/integration/integration_test.go @@ -98,8 +98,8 @@ func TestPauseResume(t *testing.T) { t.Fatal("docker pull failed:", err) } d := testutil.MakeDocker("pause-resume-test") - if out, err := d.Run("-p", "8080", "google/python-hello"); err != nil { - t.Fatalf("docker run failed: %v\nout: %s", err, out) + if err := d.Run("-p", "8080", "google/python-hello"); err != nil { + t.Fatalf("docker run failed: %v", err) } defer d.CleanUp() @@ -157,7 +157,7 @@ func TestConnectToSelf(t *testing.T) { // Creates server that replies "server" and exists. Sleeps at the end because // 'docker exec' gets killed if the init process exists before it can finish. - if _, err := d.Run("ubuntu:trusty", "/bin/sh", "-c", "echo server | nc -l -p 8080 && sleep 1"); err != nil { + if err := d.Run("ubuntu:trusty", "/bin/sh", "-c", "echo server | nc -l -p 8080 && sleep 1"); err != nil { t.Fatal("docker run failed:", err) } defer d.CleanUp() |