try tweaking some times to reduce flakiness

observIQ · Feb 16, 2022 · 92c9be3 · 92c9be3
1 parent 55abccb
commit 92c9be3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/operator/builtin/input/file/rotation_test.go b/operator/builtin/input/file/rotation_test.go
@@ -285,23 +285,23 @@ func TestRotation(t *testing.T) {
 			maxLinesPerFile: 10,
 			maxBackupFiles:  1,
 			writeInterval:   time.Millisecond,
-			pollInterval:    20 * time.Millisecond,
+			pollInterval:    10 * time.Millisecond,
 		},
 		{
 			name:            "Fast/NoDeletion",
 			totalLines:      20,
 			maxLinesPerFile: 10,
 			maxBackupFiles:  1,
 			writeInterval:   time.Millisecond,
-			pollInterval:    20 * time.Millisecond,
+			pollInterval:    10 * time.Millisecond,
 		},
 		{
 			name:            "Fast/Deletion",
 			totalLines:      30,
 			maxLinesPerFile: 10,
 			maxBackupFiles:  1,
 			writeInterval:   time.Millisecond,
-			pollInterval:    20 * time.Millisecond,
+			pollInterval:    10 * time.Millisecond,
 			ephemeralLines:  true,
 		},
 		{
@@ -310,7 +310,7 @@ func TestRotation(t *testing.T) {
 			maxLinesPerFile: 100,
 			maxBackupFiles:  1,
 			writeInterval:   time.Millisecond,
-			pollInterval:    20 * time.Millisecond,
+			pollInterval:    10 * time.Millisecond,
 			ephemeralLines:  true,
 		},
 		{
@@ -319,31 +319,31 @@ func TestRotation(t *testing.T) {
 			maxLinesPerFile: 10,
 			maxBackupFiles:  1,
 			writeInterval:   3 * time.Millisecond,
-			pollInterval:    20 * time.Millisecond,
+			pollInterval:    10 * time.Millisecond,
 		},
 		{
 			name:            "Slow/NoDeletion",
 			totalLines:      20,
 			maxLinesPerFile: 10,
 			maxBackupFiles:  1,
 			writeInterval:   3 * time.Millisecond,
-			pollInterval:    20 * time.Millisecond,
+			pollInterval:    10 * time.Millisecond,
 		},
 		{
 			name:            "Slow/Deletion",
 			totalLines:      30,
 			maxLinesPerFile: 10,
 			maxBackupFiles:  1,
 			writeInterval:   3 * time.Millisecond,
-			pollInterval:    20 * time.Millisecond,
+			pollInterval:    10 * time.Millisecond,
 		},
 		{
 			name:            "Slow/Deletion/ExceedFingerprint",
 			totalLines:      100,
 			maxLinesPerFile: 25, // ~20 is just enough to exceed 1000 bytes fingerprint at 50 chars per line
 			maxBackupFiles:  2,
 			writeInterval:   3 * time.Millisecond,
-			pollInterval:    20 * time.Millisecond,
+			pollInterval:    10 * time.Millisecond,
 		},
 	}
 

diff --git a/operator/flusher/flusher_test.go b/operator/flusher/flusher_test.go
@@ -44,7 +44,7 @@ func TestFlusher(t *testing.T) {
 func TestMaxElapsedTime(t *testing.T) {
 
 	// Override setting for test
-	maxElapsedTime = 100 * time.Millisecond
+	maxElapsedTime = 1 * time.Second
 
 	flusherCfg := NewConfig()
 	flusher := flusherCfg.Build(zaptest.NewLogger(t).Sugar())
@@ -55,3 +55,7 @@ func TestMaxElapsedTime(t *testing.T) {
 	})
 	require.WithinDuration(t, start.Add(maxElapsedTime), time.Now(), maxElapsedTime)
 }
+
+func TestTime(t *testing.T) {
+	require.WithinDuration(t, time.Now(), time.Now().Add(10*time.Second), time.Second)
+}