Merge #55526

55526: backupccl: deflake a test r=yuzefovich a=yuzefovich I've just hit a test flake on one of my branches because the order of the schemas in the output was different from the expected one which appears to be due to the queries not having an ORDER BY clause. That is now fixed which should make the test output deterministic. Release note: None Co-authored-by: Yahor Yuzefovich <[email protected]>
cockroachdb · Oct 13, 2020 · e8757eb · e8757eb
2 parents 1ec2c45 + 5da8b87
commit e8757eb
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pkg/ccl/backupccl/backup_test.go b/pkg/ccl/backupccl/backup_test.go
@@ -6479,7 +6479,7 @@ func TestCleanupDoesNotDeleteParentsWithChildObjects(t *testing.T) {
 
 		// Check that the restored database still exists, but only contains the new
 		// schema we added.
-		sqlDB.CheckQueryResults(t, `SELECT schema_name FROM [SHOW SCHEMAS FROM d]`, [][]string{
+		sqlDB.CheckQueryResults(t, `SELECT schema_name FROM [SHOW SCHEMAS FROM d] ORDER BY 1`, [][]string{
 			{"crdb_internal"}, {"information_schema"}, {"new_schema"}, {"pg_catalog"}, {"pg_extension"}, {"public"},
 		})
 		sqlDB.CheckQueryResults(t, `SHOW TABLES FROM d`, [][]string{})
@@ -6537,7 +6537,7 @@ func TestCleanupDoesNotDeleteParentsWithChildObjects(t *testing.T) {
 
 		// Check that the restored database still exists, but only contains the new
 		// table we added.
-		sqlDB.CheckQueryResults(t, `SELECT schema_name FROM [SHOW SCHEMAS FROM d]`, [][]string{
+		sqlDB.CheckQueryResults(t, `SELECT schema_name FROM [SHOW SCHEMAS FROM d] ORDER BY 1`, [][]string{
 			{"crdb_internal"}, {"information_schema"}, {"pg_catalog"}, {"pg_extension"}, {"public"},
 		})
 		sqlDB.CheckQueryResults(t, `SELECT schema_name, table_name FROM [SHOW TABLES FROM d]`, [][]string{
@@ -6606,7 +6606,7 @@ func TestCleanupDoesNotDeleteParentsWithChildObjects(t *testing.T) {
 		require.NoError(t, g.Wait())
 
 		sqlDB.Exec(t, `USE newdb`)
-		sqlDB.CheckQueryResults(t, `SELECT schema_name from [SHOW SCHEMAS FROM newdb]`, [][]string{
+		sqlDB.CheckQueryResults(t, `SELECT schema_name from [SHOW SCHEMAS FROM newdb] ORDER BY 1`, [][]string{
 			{"crdb_internal"}, {"information_schema"}, {"pg_catalog"}, {"pg_extension"}, {"public"}, {"sc"},
 		})
 		sqlDB.CheckQueryResults(t, `SELECT schema_name, table_name FROM [SHOW TABLES FROM sc]`, [][]string{