Merge pull request #9603 from metabase/ci-test-failure-fixes

Fix occasional test failures 

test/metabase/async/api_response_test.clj

@@ -186,12 +186,14 @@
 (expect
   (with-redefs [async-response/absolute-max-keepalive-ms 500]
     (tu.async/with-chans [input-chan]
-      (with-response [_ input-chan]
+      (with-response [{:keys [os-closed-chan]} input-chan]
+        (wait-for-close os-closed-chan)
         (wait-for-close input-chan)))))
 
 ;; output chan should get closed
 (expect
   (with-redefs [async-response/absolute-max-keepalive-ms 500]
     (tu.async/with-chans [input-chan]
-      (with-response [{:keys [output-chan]} input-chan]
+      (with-response [{:keys [output-chan os-closed-chan]} input-chan]
+        (wait-for-close os-closed-chan)
         (wait-for-close output-chan)))))

test/metabase/driver/sql_jdbc/execute_test.clj

@@ -7,6 +7,8 @@
   (:import java.sql.PreparedStatement))
 
 (defn- do-with-max-rows [f]
+  ;; force loading of the test data before swapping out `jdbc/query`, otherwise things might not sync correctly
+  (data/id)
   (let [orig-query jdbc/query
         max-rows   (atom nil)]
     (with-redefs [jdbc/query (fn [conn sql-params & [opts]]