Merge #138625

138625: pkg/cli: fix TestZipIncludeAndExcludeFilesDataDriven flakiness r=aa-joshi a=arjunmahishi Fixes #138538 Epic: none Release note: None Co-authored-by: Arjun Mahishi <[email protected]>
cockroachdb · Jan 8, 2025 · 1aba403 · 1aba403
2 parents 9da6ffe + 0437962
commit 1aba403
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/cli/zip_test.go b/pkg/cli/zip_test.go
@@ -1376,7 +1376,7 @@ func trimNonDeterministicZipOutputFiles(out string) string {
 	out = re.ReplaceAllString(out, ``)
 	re = regexp.MustCompile(`(?m).*job_status\.txt$` + "\n")
 	out = re.ReplaceAllString(out, ``)
-	re = regexp.MustCompile(`(?m).*(memprof|memstats|memmonitoring).*\.txt$` + "\n")
+	re = regexp.MustCompile(`(?m).*(memprof|memstats|memmonitoring).*\.(txt|pprof)$` + "\n")
 	out = re.ReplaceAllString(out, ``)
 	re = regexp.MustCompile(`(?m).*goroutine_dump.*\.txt\.gz$` + "\n")
 	out = re.ReplaceAllString(out, ``)