Merge cockroachdb#126923

126923: cli: update TestZipSpecialNames test execution conditions r=aa-joshi a=aa-joshi Previously, `TestZipSpecialNames` test was timing it out after 15m. This change adds a low timeout for test & mark test as skipped during timeout. Task: CRDB-39949 Fixes: cockroachdb#126501 Release note: None Co-authored-by: Akshay Joshi <[email protected]>
lyang24 · Jul 12, 2024 · 903fd71 · 903fd71
2 parents 272308f + 25a70c9
commit 903fd71
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/pkg/cli/zip_test.go b/pkg/cli/zip_test.go
@@ -435,6 +435,9 @@ func TestZipSpecialNames(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
+	skip.UnderShort(t)
+	skip.UnderRace(t)
+
 	dir, cleanupFn := testutils.TempDir(t)
 	defer cleanupFn()