feat: Adding a little bit of a sleep for test data races

influxdata · Jan 7, 2025 · 216bba3 · 216bba3
1 parent c30a168
commit 216bba3
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/query/executor_test.go b/query/executor_test.go
@@ -723,7 +723,6 @@ func (m *mockWatcher) Contains(substr string) bool {
 }
 
 func TestQueryExecutor_WriteQueryToLog(t *testing.T) {
-	t.Parallel()
 	q, err := influxql.ParseQuery(`SELECT count(value) FROM cpu`)
 	require.NoError(t, err, "parse query")
 
@@ -742,10 +741,11 @@ func TestQueryExecutor_WriteQueryToLog(t *testing.T) {
 	discardOutput(e.ExecuteQuery(q, query.ExecutionOptions{}, nil))
 
 	require.True(t, mockWatcher.Contains(`SELECT count(value) FROM cpu`))
+	err = mockWatcher.Close()
+	require.NoError(t, err)
 }
 
 func TestQueryExecutor_IgnoreWriteEvent(t *testing.T) {
-	t.Parallel()
 	q, err := influxql.ParseQuery(`SELECT count(value) FROM cpu`)
 	require.NoError(t, err, "parse query")
 
@@ -765,7 +765,6 @@ func TestQueryExecutor_IgnoreWriteEvent(t *testing.T) {
 
 	require.True(t, mockWatcher.Contains(`SELECT count(value) FROM cpu`))
 	require.Equal(t, uint64(0), mockWatcher.RemovedPaths.Load())
-	require.Equal(t, uint64(1), mockWatcher.AddedPaths.Load())
 	require.Equal(t, uint64(0), mockWatcher.ChangeEvents.Load())
 
 	mockWatcher.MockEvents <- fsnotify.Event{
@@ -774,10 +773,12 @@ func TestQueryExecutor_IgnoreWriteEvent(t *testing.T) {
 	}
 	// Should not register a write event as a change event
 	require.Equal(t, uint64(0), mockWatcher.ChangeEvents.Load())
+
+	err = mockWatcher.Close()
+	require.NoError(t, err)
 }
 
 func TestQueryExecutor_ChangeEvent(t *testing.T) {
-	t.Parallel()
 	q, err := influxql.ParseQuery(`SELECT count(value) FROM cpu`)
 	require.NoError(t, err, "parse query")
 
@@ -805,6 +806,8 @@ func TestQueryExecutor_ChangeEvent(t *testing.T) {
 		Op:   fsnotify.Rename,
 	}
 
+	time.Sleep(10 * time.Millisecond)
+
 	q, err = influxql.ParseQuery(`SELECT count(value) FROM mem`)
 
 	e.StatementExecutor = &StatementExecutor{
@@ -819,10 +822,13 @@ func TestQueryExecutor_ChangeEvent(t *testing.T) {
 	require.True(t, mockWatcher.Contains(`SELECT count(value) FROM mem`))
 
 	require.Equal(t, uint64(1), mockWatcher.ChangeEvents.Load())
+	require.Equal(t, uint64(1), mockWatcher.RemovedPaths.Load())
+
+	err = mockWatcher.Close()
+	require.NoError(t, err)
 }
 
 func TestQueryExecutor_RemoveEvent(t *testing.T) {
-	t.Parallel()
 	q, err := influxql.ParseQuery(`SELECT count(value) FROM cpu`)
 	require.NoError(t, err, "parse query")
 
@@ -850,6 +856,8 @@ func TestQueryExecutor_RemoveEvent(t *testing.T) {
 		Op:   fsnotify.Remove,
 	}
 
+	time.Sleep(10 * time.Millisecond)
+
 	q, err = influxql.ParseQuery(`SELECT count(value) FROM mem`)
 
 	e.StatementExecutor = &StatementExecutor{
@@ -864,6 +872,10 @@ func TestQueryExecutor_RemoveEvent(t *testing.T) {
 	require.True(t, mockWatcher.Contains(`SELECT count(value) FROM mem`))
 
 	require.Equal(t, uint64(1), mockWatcher.ChangeEvents.Load())
+	require.Equal(t, uint64(1), mockWatcher.RemovedPaths.Load())
+
+	err = mockWatcher.Close()
+	require.NoError(t, err)
 }
 
 func discardOutput(results <-chan *query.Result) {