Added pre-cleanup function call and addressed GCA suggestions

Author: NirajNandre

tests/common.go

@@ -1143,23 +1143,23 @@ func CleanupSpannerResources(t *testing.T, ctx context.Context, adminClient *dat
 	if err := gIter.Do(func(row *spanner.Row) error {
 		var name string
 		if err := row.Column(0, &name); err == nil {
-			ddlStatements = append(ddlStatements, fmt.Sprintf("DROP PROPERTY GRAPH `%s` ", name))
+			ddlStatements = append(ddlStatements, fmt.Sprintf("DROP PROPERTY GRAPH IF EXISTS %s", name))
 		}
 		return nil
 	}); err != nil {
 		t.Errorf("Cleanup: failed to iterate graphs: %v", err)
 	}
 
 	//Identify Tables
-	tableQuery := `SELECT table_name FROM INFORMATION_SCHEMA.TABLES WHERE table_schema = '' AND table_name LIKE @pattern`
+	tableQuery := `SELECT table_name FROM INFORMATION_SCHEMA.TABLES WHERE table_schema = '' AND table_name LIKE @pattern ORDER BY PARENT_TABLE_NAME DESC`
 	tIter := dataClient.Single().Query(ctx, spanner.Statement{
 		SQL:    tableQuery,
 		Params: map[string]any{"pattern": pattern},
 	})
 	if err := tIter.Do(func(row *spanner.Row) error {
 		var name string
 		if err := row.Column(0, &name); err == nil {
-			ddlStatements = append(ddlStatements, fmt.Sprintf("DROP TABLE `%s` ", name))
+			ddlStatements = append(ddlStatements, fmt.Sprintf("DROP TABLE IF EXISTS %s", name))
 		}
 		return nil
 	}); err != nil {

tests/spanner/spanner_integration_test.go

@@ -102,8 +102,13 @@ func TestSpannerToolEndpoints(t *testing.T) {
 		SpannerDatabase,
 	)
 
+	t.Log("Wiping stale test resources from database...")
+	tests.CleanupSpannerResources(t, ctx, adminClient, dataClient, dbString, "")
+
 	t.Cleanup(func() {
-		tests.CleanupSpannerResources(t, context.Background(), adminClient, dataClient, dbString, uniqueID)
+		cleanupCtx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
+		defer cancel()
+		tests.CleanupSpannerResources(t, cleanupCtx, adminClient, dataClient, dbString, uniqueID)
 	})
 
 	t.Logf("DEBUG: Starting test run with isolated ID: %s", uniqueID)