From 32f6aeee8ada6407e3e93383f031f007c0f882c3 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Sun, 13 Jan 2019 21:36:25 +0000 Subject: [PATCH] Replace t.Fatal(err) with assert.NilError(err) so that they are consistent with other places Signed-off-by: Yong Tang --- integration/image/import_test.go | 12 +++++------- integration/system/event_test.go | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/integration/image/import_test.go b/integration/image/import_test.go index 6198c2048f..bce55de0cf 100644 --- a/integration/image/import_test.go +++ b/integration/image/import_test.go @@ -11,6 +11,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/internal/test/daemon" "github.com/docker/docker/internal/testutil" + "gotest.tools/assert" "gotest.tools/skip" ) @@ -34,16 +35,13 @@ func TestImportExtremelyLargeImageWorks(t *testing.T) { var tarBuffer bytes.Buffer tw := tar.NewWriter(&tarBuffer) - if err := tw.Close(); err != nil { - t.Fatal(err) - } + err := tw.Close() + assert.NilError(t, err) imageRdr := io.MultiReader(&tarBuffer, io.LimitReader(testutil.DevZero, 8*1024*1024*1024)) - _, err := client.ImageImport(context.Background(), + _, err = client.ImageImport(context.Background(), types.ImageImportSource{Source: imageRdr, SourceName: "-"}, "test1234:v42", types.ImageImportOptions{}) - if err != nil { - t.Fatal(err) - } + assert.NilError(t, err) } diff --git a/integration/system/event_test.go b/integration/system/event_test.go index 4d47c79440..c7548a61a8 100644 --- a/integration/system/event_test.go +++ b/integration/system/event_test.go @@ -63,7 +63,7 @@ func TestEventsExecDie(t *testing.T) { assert.Equal(t, m.Actor.Attributes["execID"], id.ID) assert.Equal(t, m.Actor.Attributes["exitCode"], "0") case err = <-errors: - t.Fatal(err) + assert.NilError(t, err) case <-time.After(time.Second * 3): t.Fatal("timeout hit") } @@ -109,7 +109,7 @@ func TestEventsBackwardsCompatible(t *testing.T) { if err == io.EOF { break } - t.Fatal(err) + assert.NilError(t, err) } if event.Status == "create" && event.ID == cID { containerCreateEvent = &event