Fix existing tests for log streaming

hashicorp · Dec 22, 2021 · 3c245b8 · 3c245b8
1 parent e6cc358
commit 3c245b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/client/fs_endpoint.go b/client/fs_endpoint.go
@@ -826,7 +826,6 @@ func blockUntilNextLog(ctx context.Context, fs allocdir.AllocDirFS, logPath, tas
 				// waiting for.
 				for _, entry := range indexes {
 					if entry.idx >= nextIndex {
-						//<-time.NewTicker(5 * time.Second).C
 						next <- nil
 						close(next)
 						return

diff --git a/client/fs_endpoint_test.go b/client/fs_endpoint_test.go
@@ -1568,7 +1568,7 @@ func TestFS_streamFile_NoFile(t *testing.T) {
 	defer framer.Destroy()
 
 	err := c.endpoints.FileSystem.streamFile(
-		context.Background(), 0, "foo", 0, ad, framer, nil)
+		context.Background(), 0, "foo", 0, ad, framer, nil, nil)
 	require.Error(t, err)
 	if runtime.GOOS == "windows" {
 		require.Contains(t, err.Error(), "cannot find the file")
@@ -1629,7 +1629,7 @@ func TestFS_streamFile_Modify(t *testing.T) {
 	// Start streaming
 	go func() {
 		if err := c.endpoints.FileSystem.streamFile(
-			context.Background(), 0, streamFile, 0, ad, framer, nil); err != nil {
+			context.Background(), 0, streamFile, 0, ad, framer, nil, nil); err != nil {
 			t.Fatalf("stream() failed: %v", err)
 		}
 	}()
@@ -1704,7 +1704,7 @@ func TestFS_streamFile_Truncate(t *testing.T) {
 	// Start streaming
 	go func() {
 		if err := c.endpoints.FileSystem.streamFile(
-			context.Background(), 0, streamFile, 0, ad, framer, nil); err != nil {
+			context.Background(), 0, streamFile, 0, ad, framer, nil, nil); err != nil {
 			t.Fatalf("stream() failed: %v", err)
 		}
 	}()
@@ -1808,7 +1808,7 @@ func TestFS_streamImpl_Delete(t *testing.T) {
 	// Start streaming
 	go func() {
 		if err := c.endpoints.FileSystem.streamFile(
-			context.Background(), 0, streamFile, 0, ad, framer, nil); err != nil {
+			context.Background(), 0, streamFile, 0, ad, framer, nil, nil); err != nil {
 			t.Fatalf("stream() failed: %v", err)
 		}
 	}()