Merge cockroachdb#54486

54486: sql: deflake TestTemporarySchemaDropDatabase r=arulajmani a=otan The job looks like it can race with the check, so hide this behind a SucceedsSoon. Resolves cockroachdb#54467. Release note: None Co-authored-by: Oliver Tan <[email protected]>
irfansharif · Sep 17, 2020 · c37cff8 · c37cff8
2 parents cb3ecbc + 1e4b20a
commit c37cff8
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/pkg/sql/temporary_schema_test.go b/pkg/sql/temporary_schema_test.go
@@ -327,12 +327,17 @@ func TestTemporarySchemaDropDatabase(t *testing.T) {
 		sqlDB := sqlutils.MakeSQLRunner(db)
 		sqlDB.Exec(t, `DROP DATABASE drop_me CASCADE`)
 
-		var tempObjectCount int
-		sqlDB.QueryRow(
-			t,
-			`SELECT count(1) FROM system.namespace WHERE name LIKE 'pg_temp%' OR name IN ('t', 't2')`,
-		).Scan(&tempObjectCount)
-		assert.Equal(t, 0, tempObjectCount)
+		testutils.SucceedsSoon(t, func() error {
+			var tempObjectCount int
+			sqlDB.QueryRow(
+				t,
+				`SELECT count(1) FROM system.namespace WHERE name LIKE 'pg_temp%' OR name IN ('t', 't2')`,
+			).Scan(&tempObjectCount)
+			if tempObjectCount == 0 {
+				return nil
+			}
+			return errors.AssertionFailedf("expected count 0, got %d", tempObjectCount)
+		})
 	}
 }