Skip to content

Commit

Permalink
backupccl: deflake TestShowBackup
Browse files Browse the repository at this point in the history
This patch updates the regex used in TestShowBackup to match on stringed
timestamps that contain any number of decimals after the second. I.e. both of
these timestamps match: "2023-09-21 01:13:25.3+00" and "2023-09-21
01:13:25.30+00".

Fixes: #111015

Release note: none
  • Loading branch information
msbutler committed Oct 3, 2023
1 parent 1268ef1 commit 64ec09a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/ccl/backupccl/show_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ ORDER BY object_type, object_name`, full)
// Truncate decimal places so Go's very rigid parsing will work.
// TODO(bardin): Consider using a third-party library for this, or some kind
// of time-freezing on the test cluster.
truncateBackupTimeRE := regexp.MustCompile(`^(.*\.[0-9]{2})[0-9]*\+00$`)
truncateBackupTimeRE := regexp.MustCompile(`^(.*\.\d{2})?[0-9]*\+00$`)
matchResult := truncateBackupTimeRE.FindStringSubmatch(beforeTS)
require.NotNil(t, matchResult, "%s does not match %s", beforeTS, truncateBackupTimeRE)
backupTime, err := time.Parse("2006-01-02 15:04:05.00", matchResult[1])
Expand Down

0 comments on commit 64ec09a

Please sign in to comment.