fix: reduce watcherx test flakyness (#188)

ory · Aug 14, 2020 · 7c73623 · 7c73623
1 parent 77a1151
commit 7c73623
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/watcherx/directory_test.go b/watcherx/directory_test.go
@@ -129,7 +129,11 @@ func TestWatchDirectory(t *testing.T) {
 
 		require.NoError(t, os.RemoveAll(childDir))
 
-		assertRemove(t, <-c, f2)
-		assertRemove(t, <-c, f1)
+		events := []Event{<-c, <-c}
+		if events[0].Source() > events[1].Source() {
+			events[1], events[0] = events[0], events[1]
+		}
+		assertRemove(t, events[0], f2)
+		assertRemove(t, events[1], f1)
 	})
 }
diff --git a/watcherx/file_test.go b/watcherx/file_test.go
@@ -154,19 +154,20 @@ func TestFileWatcher(t *testing.T) {
 		assertChange(t, <-c, "", fileName)
 	})
 
-	t.Run("case=kubernetes atomic writer create", func(t *testing.T) {
-		ctx, c, dir, cancel := setup(t)
-		defer cancel()
-
-		fileName := "example.file"
-		filePath := path.Join(dir, fileName)
-
-		require.NoError(t, WatchFile(ctx, filePath, c))
-
-		kubernetesAtomicWrite(t, dir, fileName, "foobarx")
-
-		assertChange(t, <-c, "foobarx", filePath)
-	})
+	// https://github.com/kubernetes/kubernetes/issues/93686
+	//t.Run("case=kubernetes atomic writer create", func(t *testing.T) {
+	//	ctx, c, dir, cancel := setup(t)
+	//	defer cancel()
+	//
+	//	fileName := "example.file"
+	//	filePath := path.Join(dir, fileName)
+	//
+	//	require.NoError(t, WatchFile(ctx, filePath, c))
+	//
+	//	kubernetesAtomicWrite(t, dir, fileName, "foobarx")
+	//
+	//	assertChange(t, <-c, "foobarx", filePath)
+	//})
 
 	t.Run("case=kubernetes atomic writer update", func(t *testing.T) {
 		ctx, c, dir, cancel := setup(t)