Skip to content

Commit 4b3c782

Browse files
craig[bot]msbutler
andcommitted
Merge #152967
152967: backup: skip TestRegistryLifecycle and TestShowBackupPathIsCollectionRoot r=msbutler a=msbutler These were flaking CI. - remove TestDataDriven/show_backups which was testing a 22.2 fixture - skip TestShowbackupPathIsCollectionRoot - skip TestRegistryLifecycle Informs #152542 Release note: none Co-authored-by: Michael Butler <[email protected]>
2 parents 2b821ef + 9c2b839 commit 4b3c782

File tree

3 files changed

+2
-65
lines changed

3 files changed

+2
-65
lines changed

pkg/backup/show_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,7 @@ func TestShowBackupWithDebugIDs(t *testing.T) {
705705
func TestShowBackupPathIsCollectionRoot(t *testing.T) {
706706
defer leaktest.AfterTest(t)()
707707
defer log.Scope(t).Close(t)
708+
skip.WithIssue(t, 152935)
708709

709710
const numAccounts = 11
710711

pkg/backup/testdata/backup-restore/show_backup

Lines changed: 0 additions & 65 deletions
This file was deleted.

pkg/jobs/jobs_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,7 @@ func (rts *registryTestSuite) idb() isql.DB {
392392
func TestRegistryLifecycle(t *testing.T) {
393393
defer leaktest.AfterTest(t)()
394394
defer log.Scope(t).Close(t)
395+
skip.WithIssue(t, 152542)
395396

396397
t.Run("normal success", func(t *testing.T) {
397398
rts := registryTestSuite{}

0 commit comments

Comments
 (0)