Merge pull request #1856 from tkatila/labeler-fix-false-failure

mythi · web-flow · commit 4410cd329812 · 2024-10-01T11:22:17.000+03:00
labeler: fix false-failure with nfd file removal test
diff --git a/cmd/internal/labeler/labeler_test.go b/cmd/internal/labeler/labeler_test.go
@@ -773,7 +773,11 @@ func TestCreateAndRun(t *testing.T) {
 
 		// Wait for the labeling timeout to trigger
 		if !waitForFileOp(root, nfdLabelBase, fsnotify.Remove, time.Second*2) {
-			t.Error("Run didn't remove label file")
+			// It's possible that removal happened before we started waiting.
+			// Only fail the test if the file still exists.
+			if _, err := os.Stat(nfdLabelFile); err == nil {
+				t.Error("Run didn't remove label file")
+			}
 		}
 	})
 }

Original file line number	Diff line number	Diff line change
`@@ -773,7 +773,11 @@ func TestCreateAndRun(t *testing.T) {`
`773`	`773`
`774`	`774`	`// Wait for the labeling timeout to trigger`
`775`	`775`	`if !waitForFileOp(root, nfdLabelBase, fsnotify.Remove, time.Second*2) {`
`776`		`- t.Error("Run didn't remove label file")`
	`776`	`+ // It's possible that removal happened before we started waiting.`
	`777`	`+ // Only fail the test if the file still exists.`
	`778`	`+ if _, err := os.Stat(nfdLabelFile); err == nil {`
	`779`	`+ t.Error("Run didn't remove label file")`
	`780`	`+ }`
`777`	`781`	`}`
`778`	`782`	`})`
`779`	`783`	`}`