From 41d3e3b6ecbf05831842bb7311347cd5e10458f1 Mon Sep 17 00:00:00 2001 From: Ryan Richard Date: Wed, 12 May 2021 11:24:00 -0700 Subject: [PATCH] Fix lint error in e2e_test.go --- test/integration/e2e_test.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/test/integration/e2e_test.go b/test/integration/e2e_test.go index 59192796..b7f387e5 100644 --- a/test/integration/e2e_test.go +++ b/test/integration/e2e_test.go @@ -359,7 +359,7 @@ func TestE2EFullIntegration(t *testing.T) { }) } -func readFromFileUntilStringIsSeen(t *testing.T, f *os.File, until string) string { +func readFromFileUntilStringIsSeen(t *testing.T, f *os.File, until string) { readFromFile := "" library.RequireEventuallyWithoutError(t, func() (bool, error) { @@ -373,8 +373,6 @@ func readFromFileUntilStringIsSeen(t *testing.T, f *os.File, until string) strin } return false, nil // keep waiting and reading }, 1*time.Minute, 1*time.Second) - - return readFromFile } func readAvailableOutput(t *testing.T, r io.Reader) (string, bool) { @@ -383,9 +381,8 @@ func readAvailableOutput(t *testing.T, r io.Reader) (string, bool) { if err != nil { if err == io.EOF { return string(buf[:n]), true - } else { - require.NoError(t, err) } + require.NoError(t, err) } return string(buf[:n]), false }