Skip to content

Commit 50f50b7

Browse files
committed
fix error parsing in metrics unit test
1 parent d35a1ee commit 50f50b7

File tree

1 file changed

+6
-24
lines changed

1 file changed

+6
-24
lines changed

connection/connection_test.go

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -499,32 +499,14 @@ func TestConnectMetrics(t *testing.T) {
499499
}
500500

501501
func verifyMetricsError(t *testing.T, err error, metricToIgnore string) error {
502-
errStringArr := strings.Split(err.Error(), "got:")
502+
errStringLines := strings.Split(err.Error(), "\n")
503503

504-
if len(errStringArr) != 2 {
505-
return err
506-
}
507-
508-
want := errStringArr[0]
509-
got := strings.TrimSpace(errStringArr[1])
510-
511-
if want == "" || got == "" {
512-
return err
513-
}
514-
515-
wantArr := strings.Split(err.Error(), "want")
516-
if len(wantArr) != 2 {
517-
return err
518-
}
519-
520-
want = strings.TrimSpace(wantArr[1])
521-
want = strings.ReplaceAll(want, "+++ got:", "")
522-
523-
if matchErr := metrics.VerifyMetricsMatch(want, got, metricToIgnore); matchErr != nil {
524-
t.Errorf("%v", matchErr)
525-
return err
504+
for _, line := range errStringLines {
505+
// Return the original error if we find a diff that doesn't include the metricToIgnore.
506+
if (strings.HasPrefix(line, "+") || strings.HasPrefix(line, "-")) && !strings.Contains(line, metricToIgnore) {
507+
return err
508+
}
526509
}
527-
528510
return nil
529511
}
530512

0 commit comments

Comments
 (0)