[backport] Mitigate redshift flakes by not dropping view in test (#42044)

modules/drivers/redshift/test/metabase/driver/redshift_test.clj

@@ -255,28 +255,24 @@
         (t2.with-temp/with-temp [Database database {:engine :redshift, :details db-details}]
           (let [view-nm      (tx/db-qualified-table-name (:name database) "lbv")
                 qual-view-nm (format "\"%s\".\"%s\"" (redshift.test/unique-session-schema) view-nm)]
-            (try
-              (execute!
-               (str "CREATE OR REPLACE VIEW %1$s AS ("
-                    "WITH test_data AS (SELECT 'open' AS shop_status UNION ALL SELECT 'closed' AS shop_status) "
-                    "SELECT NULL as raw_null, "
-                    "'hello' as raw_var, "
-                    "CASE WHEN shop_status = 'open' THEN 11387.133 END AS case_when_numeric_inc_nulls "
-                    "FROM test_data) WITH NO SCHEMA BINDING;")
-               qual-view-nm)
-              (sync/sync-database! database {:scan :schema})
-              (is (contains?
-                   (t2/select-fn-set :name Table :db_id (u/the-id database)) ; the new view should have been synced without errors
-                   view-nm))
-              (let [table-id (t2/select-one-pk Table :db_id (u/the-id database), :name view-nm)]
+            (execute!
+             (str "CREATE OR REPLACE VIEW %1$s AS ("
+                  "WITH test_data AS (SELECT 'open' AS shop_status UNION ALL SELECT 'closed' AS shop_status) "
+                  "SELECT NULL as raw_null, "
+                  "'hello' as raw_var, "
+                  "CASE WHEN shop_status = 'open' THEN 11387.133 END AS case_when_numeric_inc_nulls "
+                  "FROM test_data) WITH NO SCHEMA BINDING;")
+             qual-view-nm)
+            (sync/sync-database! database {:scan :schema})
+            (is (contains?
+                 (t2/select-fn-set :name Table :db_id (u/the-id database)) ; the new view should have been synced without errors
+                 view-nm))
+            (let [table-id (t2/select-one-pk Table :db_id (u/the-id database), :name view-nm)]
               ;; and its columns' :base_type should have been identified correctly
-                (is (= [{:name "case_when_numeric_inc_nulls", :database_type "numeric",           :base_type :type/Decimal}
-                        {:name "raw_null",                    :database_type "character varying", :base_type :type/Text}
-                        {:name "raw_var",                     :database_type "character varying", :base_type :type/Text}]
-                       (t2/select [Field :name :database_type :base_type] :table_id table-id {:order-by [:name]}))))
-              (finally
-                (execute! (str "DROP VIEW IF EXISTS %s;")
-                          qual-view-nm)))))))))
+              (is (= [{:name "case_when_numeric_inc_nulls", :database_type "numeric",           :base_type :type/Decimal}
+                      {:name "raw_null",                    :database_type "character varying", :base_type :type/Text}
+                      {:name "raw_var",                     :database_type "character varying", :base_type :type/Text}]
+                     (t2/select [Field :name :database_type :base_type] :table_id table-id {:order-by [:name]}))))))))))
 
 (deftest filtered-syncable-schemas-test
   (mt/test-driver :redshift