Skip to content

Commit 5d2ce71

Browse files
committed
backup: deflake TestFullClusterRestoreWithUserIDs
Fixes #154006 Release note: none
1 parent 7dd1a80 commit 5d2ce71

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

pkg/backup/full_cluster_backup_restore_test.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,29 +1189,29 @@ func TestFullClusterRestoreWithUserIDs(t *testing.T) {
11891189
sqlDB.Exec(t, `CREATE USER test2`)
11901190
sqlDB.Exec(t, `BACKUP INTO $1`, localFoo)
11911191

1192-
sqlDB.CheckQueryResults(t, `SELECT username, "hashedPassword", "isRole", user_id FROM system.users ORDER BY user_id`, [][]string{
1193-
{"root", "", "false", "1"},
1194-
{"admin", "", "true", "2"},
1195-
{"test1", "NULL", "false", "100"},
1196-
{"test2", "NULL", "false", "101"},
1192+
sqlDB.CheckQueryResults(t, `SELECT username, "hashedPassword", "isRole" FROM system.users ORDER BY user_id`, [][]string{
1193+
{"root", "", "false"},
1194+
{"admin", "", "true"},
1195+
{"test1", "NULL", "false"},
1196+
{"test2", "NULL", "false"},
11971197
})
11981198
// Ensure that the new backup succeeds.
11991199
sqlDBRestore.Exec(t, `RESTORE FROM LATEST IN $1`, localFoo)
12001200

1201-
sqlDBRestore.CheckQueryResults(t, `SELECT username, "hashedPassword", "isRole", user_id FROM system.users ORDER BY user_id`, [][]string{
1202-
{"root", "", "false", "1"},
1203-
{"admin", "", "true", "2"},
1204-
{"test1", "NULL", "false", "100"},
1205-
{"test2", "NULL", "false", "101"},
1201+
sqlDBRestore.CheckQueryResults(t, `SELECT username, "hashedPassword", "isRole" FROM system.users ORDER BY user_id`, [][]string{
1202+
{"root", "", "false"},
1203+
{"admin", "", "true"},
1204+
{"test1", "NULL", "false"},
1205+
{"test2", "NULL", "false"},
12061206
})
12071207

12081208
sqlDBRestore.Exec(t, `CREATE USER test3`)
12091209

1210-
sqlDBRestore.CheckQueryResults(t, `SELECT username, "hashedPassword", "isRole", user_id FROM system.users ORDER BY user_id`, [][]string{
1211-
{"root", "", "false", "1"},
1212-
{"admin", "", "true", "2"},
1213-
{"test1", "NULL", "false", "100"},
1214-
{"test2", "NULL", "false", "101"},
1215-
{"test3", "NULL", "false", "102"},
1210+
sqlDBRestore.CheckQueryResults(t, `SELECT username, "hashedPassword", "isRole" FROM system.users ORDER BY user_id`, [][]string{
1211+
{"root", "", "false"},
1212+
{"admin", "", "true"},
1213+
{"test1", "NULL", "false"},
1214+
{"test2", "NULL", "false"},
1215+
{"test3", "NULL", "false"},
12161216
})
12171217
}

0 commit comments

Comments
 (0)