Merge #158033

craig[bot] · Abhinav1299 · craig[bot] · commit 1f1ee11a76ef · 2025-11-20T10:25:05.000Z
158033: cli: filter standalone NOTICE lines in debug zip test output r=Abhinav1299 a=Abhinav1299 Remove intermittent license-related NOTICE messages from zip output in tests. Resolves: #157888, #157889 Epic: None Release note: None Co-authored-by: Abhinav1299 <abhinav.gupta@cockroachlabs.com>
diff --git a/pkg/cli/zip_test.go b/pkg/cli/zip_test.go
@@ -698,6 +698,10 @@ func eraseNonDeterministicZipOutput(out string) string {
 	re = regexp.MustCompile(`(?m)^\[node \d+\] \d+ execution traces found$`)
 	out = re.ReplaceAllString(out, `[node ?] ? execution traces found`)
 
+	// Remove license-related NOTICE messages that may appear intermittently.
+	re = regexp.MustCompile(`(?m)^NOTICE: No license is installed.*\n?`)
+	out = re.ReplaceAllString(out, ``)
+
 	return out
 }
 

Original file line number	Diff line number	Diff line change
`@@ -698,6 +698,10 @@ func eraseNonDeterministicZipOutput(out string) string {`
`698`	`698`	re = regexp.MustCompile(`(?m)^\[node \d+\] \d+ execution traces found$`)
`699`	`699`	out = re.ReplaceAllString(out, `[node ?] ? execution traces found`)
`700`	`700`
	`701`	`+ // Remove license-related NOTICE messages that may appear intermittently.`
	`702`	+ re = regexp.MustCompile(`(?m)^NOTICE: No license is installed.*\n?`)
	`703`	+ out = re.ReplaceAllString(out, ``)
	`704`	`+`
`701`	`705`	`return out`
`702`	`706`	`}`
`703`	`707`