tests: reduce number of rounds for race tests

As long as we require a minimum number of successes (to verify that the
success cases have the right values), it is not necessary to do 50k
rounds. With the new resolver for procfs, the increase in syscalls
results in the tests taking too long.

Signed-off-by: Aleksa Sarai <[email protected]>

Author: cyphar

lookup_linux_test.go

@@ -558,20 +558,34 @@ func TestPartialLookup_RacingRename(t *testing.T) {
 				go doRenameExchangeLoop(pauseCh, exitCh, rootDir, test.subPathA, test.subPathB)
 
 				// Do several runs to try to catch bugs.
-				const testRuns = 50000
+				const (
+					testRuns     = 3000
+					minPassCount = 10
+				)
 				m := newRacingLookupMeta(pauseCh)
-				for i := 0; i < testRuns; i++ {
+				doneRuns := 0
+				for ; doneRuns < testRuns || m.passOkCount < minPassCount; doneRuns++ {
 					m.checkPartialLookup(t, rootDir, test.unsafePath, test.skipErrs, test.allowedResults)
+					// Make sure we don't infinite loop here.
+					if doneRuns >= 50*testRuns {
+						break
+					}
 				}
 
 				pct := func(count int) string {
-					return fmt.Sprintf("%d(%.3f%%)", count, 100.0*float64(count)/float64(testRuns))
+					return fmt.Sprintf("%d(%.3f%%)", count, 100.0*float64(count)/float64(doneRuns))
+				}
+
+				// No passing runs is a bit unfortunate, but some of our tests
+				// can do that and failing here would just lead to flaky tests.
+				if m.passOkCount == 0 {
+					t.Logf("WARNING: NO PASSING RUNS!")
 				}
 
 				// Output some stats.
 				t.Logf("after %d runs: passOk=%s passErr=%s skip=%s fail=%s (+badErr=%s)",
 					// runs and breakdown of path-related (pass, fail) as well as skipped runs
-					testRuns, pct(m.passOkCount), pct(m.passErrCount), pct(m.skipCount), pct(m.failCount),
+					doneRuns, pct(m.passOkCount), pct(m.passErrCount), pct(m.skipCount), pct(m.failCount),
 					// failures due to incorrect errors (rather than bad paths)
 					pct(m.badErrCount))
 				t.Logf("  badHandleName=%s fixRemainingPath=%s",

mkdir_linux_test.go

@@ -404,9 +404,13 @@ func TestMkdirAllHandle_RacingRename(t *testing.T) { //nolint:revive // undersco
 				}(rootCh)
 
 				// Do several runs to try to catch bugs.
-				const testRuns = 2000
+				const (
+					testRuns     = 800
+					minPassCount = 10
+				)
 				m := newRacingMkdirMeta()
-				for i := 0; i < testRuns; i++ {
+				doneRuns := 0
+				for ; doneRuns < testRuns || m.passOkCount < minPassCount; doneRuns++ {
 					root := createTree(t, treeSpec...)
 
 					rootCh <- root
@@ -417,15 +421,26 @@ func TestMkdirAllHandle_RacingRename(t *testing.T) { //nolint:revive // undersco
 					// Clean up the root after each run so we don't exhaust all
 					// space in the tmpfs.
 					_ = os.RemoveAll(root)
+
+					// Make sure we don't infinite loop here.
+					if doneRuns >= 50*testRuns {
+						break
+					}
 				}
 
 				pct := func(count int) string {
-					return fmt.Sprintf("%d(%.3f%%)", count, 100.0*float64(count)/float64(testRuns))
+					return fmt.Sprintf("%d(%.3f%%)", count, 100.0*float64(count)/float64(doneRuns))
+				}
+
+				// No passing runs is a bit unfortunate, but some of our tests
+				// can do that and failing here would just lead to flaky tests.
+				if m.passOkCount == 0 {
+					t.Logf("WARNING: NO PASSING RUNS!")
 				}
 
 				// Output some stats.
 				t.Logf("after %d runs: passOk=%s passErr=%s fail=%s",
-					testRuns, pct(m.passOkCount), pct(m.passErrCount), pct(m.failCount))
+					doneRuns, pct(m.passOkCount), pct(m.passErrCount), pct(m.failCount))
 				if len(m.passErrCounts) > 0 {
 					t.Logf("  passErr breakdown:")
 					for err, count := range m.passErrCounts {
@@ -475,9 +490,13 @@ func TestMkdirAllHandle_RacingDelete(t *testing.T) { //nolint:revive // undersco
 				}(rootCh)
 
 				// Do several runs to try to catch bugs.
-				const testRuns = 2000
+				const (
+					testRuns     = 800
+					minPassCount = 10
+				)
 				m := newRacingMkdirMeta()
-				for i := 0; i < testRuns; i++ {
+				doneRuns := 0
+				for ; doneRuns < testRuns; doneRuns++ {
 					root := createTree(t, treeSpec...)
 
 					rootCh <- root
@@ -487,15 +506,26 @@ func TestMkdirAllHandle_RacingDelete(t *testing.T) { //nolint:revive // undersco
 					// Clean up the root after each run so we don't exhaust all
 					// space in the tmpfs.
 					_ = os.RemoveAll(root + "/..")
+
+					// Make sure we don't infinite loop here.
+					if doneRuns >= 50*testRuns {
+						break
+					}
 				}
 
 				pct := func(count int) string {
-					return fmt.Sprintf("%d(%.3f%%)", count, 100.0*float64(count)/float64(testRuns))
+					return fmt.Sprintf("%d(%.3f%%)", count, 100.0*float64(count)/float64(doneRuns))
+				}
+
+				// No passing runs is a bit unfortunate, but some of our tests
+				// can do that and failing here would just lead to flaky tests.
+				if m.passOkCount == 0 {
+					t.Logf("WARNING: NO PASSING RUNS!")
 				}
 
 				// Output some stats.
 				t.Logf("after %d runs: passOk=%s passErr=%s fail=%s",
-					testRuns, pct(m.passOkCount), pct(m.passErrCount), pct(m.failCount))
+					doneRuns, pct(m.passOkCount), pct(m.passErrCount), pct(m.failCount))
 				if len(m.passErrCounts) > 0 {
 					t.Logf("  passErr breakdown:")
 					for err, count := range m.passErrCounts {