Merge pull request #6774 from alrs/fix-client-test-goroutine

client: fix use of T.Fatalf() in test goroutine
hashicorp · Nov 26, 2019 · 830c0b1 · 830c0b1
2 parents f02f59d + 1c9a669
commit 830c0b1
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/client/fs_endpoint_test.go b/client/fs_endpoint_test.go
@@ -1884,13 +1884,14 @@ func TestFS_logsImpl_NoFollow(t *testing.T) {
 	}()
 
 	// Start streaming logs
-	go func() {
-		if err := c.endpoints.FileSystem.logsImpl(
-			context.Background(), false, false, 0,
-			OriginStart, task, logType, ad, frames); err != nil {
-			t.Fatalf("logs() failed: %v", err)
-		}
-	}()
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	defer cancel()
+
+	if err := c.endpoints.FileSystem.logsImpl(
+		ctx, false, false, 0,
+		OriginStart, task, logType, ad, frames); err != nil {
+		t.Fatalf("logsImpl failed: %v", err)
+	}
 
 	select {
 	case <-resultCh: