Merge branch 'main' into dependabot/go_modules/github.com/stretchr/te…

…stify-1.8.4
xorcare · Jan 26, 2024 · 75fe8e4 · 75fe8e4
2 parents 9e3867b + 42e518b
commit 75fe8e4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/example_test.go b/example_test.go
@@ -131,8 +131,8 @@ func (t *T) Logf(format string, args ...interface{}) {
 	msg := fmt.Sprintf(format, args...)
 	// Removed the trace, it contains line numbers and changes dynamically,
 	// it is not convenient to see in the examples.
-	re := regexp.MustCompile(`(?im)Error Trace:([\w\s:.]+)Error:`)
-	msg = re.ReplaceAllString(msg, "Error Trace:\n\tError:")
+	re := regexp.MustCompile(`(?im)^\t?Error\ Trace\:([\S\s\n]+)^\t?Error\:`)
+	msg = re.ReplaceAllString(msg, "\tError Trace:\n\tError:")
 
 	msg = strings.Replace(msg, "\t", "", -1)
 

diff --git a/testing_test.go b/testing_test.go
@@ -51,8 +51,8 @@ func (m *bufferTB) Helper() {
 
 func (m *bufferTB) Logf(format string, args ...interface{}) {
 	msg := fmt.Sprintf(format, args...)
-	re := regexp.MustCompile(`(?im)Error Trace:([\w\s:.]+)Error:`)
-	msg = re.ReplaceAllString(msg, "Error Trace:\n\tError:")
+	re := regexp.MustCompile(`(?im)^\t?Error\ Trace\:([\S\s\n]+)^\t?Error\:`)
+	msg = re.ReplaceAllString(msg, "\tError Trace:\n\tError:")
 	m.logs = append(m.logs, msg)
 }