fixup! Watch for config file changes in fileprovider

open-telemetry · Aug 23, 2022 · f947437 · f947437
1 parent 9df0776
commit f947437
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/confmap/provider/fileprovider/filewatcher_test.go b/confmap/provider/fileprovider/filewatcher_test.go
@@ -78,12 +78,12 @@ func TestEventIfFileContentChanged(t *testing.T) {
 
 	watcher := newPollingFileWatcher(f.Name(), pollInterval)
 	require.NoError(t, watcher.Start())
-	assert.Nil(t, getEventWithTimeout(watcher.Events, pollInterval*2))
+	assert.Nil(t, getEventWithTimeout(watcher.Events, pollInterval*100))
 
 	// write to the file, we should get an event
 	_, err = f.WriteString("\n")
 	require.NoError(t, err)
-	event := getEventWithTimeout(watcher.Events, pollInterval*2)
+	event := getEventWithTimeout(watcher.Events, pollInterval*100)
 	require.NotNil(t, event)
 	require.Nil(t, event.Error)
 }
@@ -98,12 +98,12 @@ func TestEventIfFileRemoved(t *testing.T) {
 
 	watcher := newPollingFileWatcher(f.Name(), pollInterval)
 	require.NoError(t, watcher.Start())
-	assert.Nil(t, getEventWithTimeout(watcher.Events, pollInterval*2))
+	assert.Nil(t, getEventWithTimeout(watcher.Events, pollInterval*100))
 
 	// remove the file, we should get an error event
 	err = os.Remove(f.Name())
 	require.NoError(t, err)
-	event := getEventWithTimeout(watcher.Events, pollInterval*2)
+	event := getEventWithTimeout(watcher.Events, pollInterval*100)
 	require.NotNil(t, event)
 	require.NotNil(t, event.Error)
 }

diff --git a/confmap/provider/fileprovider/provider_test.go b/confmap/provider/fileprovider/provider_test.go
@@ -132,14 +132,16 @@ func TestWatcherConfigChange(t *testing.T) {
 	// change the file, we should get an update event
 	_, err = testFile.WriteString("\n")
 	require.NoError(t, err)
-	event := getEventWithTimeout(events, fp.filePollInterval*2)
+	event := getEventWithTimeout(events, fp.filePollInterval*100)
 	require.NotNil(t, event)
 	assert.Nil(t, event.Error)
 
 	// delete the file, we should get an error
+	err = testFile.Close()
+	require.NoError(t, err)
 	err = os.Remove(testFile.Name())
 	require.NoError(t, err)
-	event = getEventWithTimeout(events, fp.filePollInterval*2)
+	event = getEventWithTimeout(events, fp.filePollInterval*100)
 	require.NotNil(t, event)
 	assert.Error(t, event.Error)