Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Fix flaky schema-change integration test (follow-up to #70863) (#71339)

Ngoc Khuate2f1a1a31546
diff --git a/enterprise/backend/test/metabase_enterprise/transforms_python/transforms_api_test.clj b/enterprise/backend/test/metabase_enterprise/transforms_python/transforms_api_test.clj
index 76496d6afa4..f71856723aa 100644
--- a/enterprise/backend/test/metabase_enterprise/transforms_python/transforms_api_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/transforms_python/transforms_api_test.clj
@@ -558,9 +558,10 @@
(transforms.tu/test-run transform-id)
(transforms.tu/wait-for-transform-completion transform-id 10000)
- ;; Sync runs asynchronously after succeed-started-run!, so wait for
- ;; the new "friend" field to appear in metadata before querying.
- (transforms.tu/wait-for-field table-name "friend" 10000)
+ ;; Sync runs after succeed-started-run! and activates new fields
+ ;; before retiring old ones (non-transactional). Waiting for "age"
+ ;; to be deactivated guarantees "friend" is already active too.
+ (transforms.tu/wait-for-field-inactive table-name "age" 10000)
(let [updated-rows (transforms.tu/table-rows table-name)]
(is (= [["Alice" "Bob"] ["Bob" "Alice"]] updated-rows)
"Updated data should show Alice/Bob with friends instead of ages"))))))))))
diff --git a/test/metabase/transforms/test_util.clj b/test/metabase/transforms/test_util.clj
index 1597310ffd5..1a58d585cc4 100644
--- a/test/metabase/transforms/test_util.clj
+++ b/test/metabase/transforms/test_util.clj
@@ -160,22 +160,35 @@
(throw (ex-info (format "Transform run failed with status %s" status)
{:resp resp :status status})))))))
-(defn wait-for-field
- "Wait for a field with `field-name` to appear as active on the table named `table-name`.
- Useful after schema changes where sync runs asynchronously."
- [table-name field-name timeout-ms]
+(defn- poll-field
+ "Poll until `pred` is satisfied for the active-field lookup of `field-name` on `table-name`.
+ Returns the first truthy result of `pred`, or throws after `timeout-ms`."
+ [table-name field-name timeout-ms pred timeout-msg]
(let [timer (u/start-timer)]
(loop []
- (let [table (t2/select-one :model/Table :name table-name :db_id (mt/id))
- field (when table
- (t2/select-one :model/Field :table_id (:id table) :name field-name :active true))]
- (cond
- field field
- (> (u/since-ms timer) timeout-ms)
- (throw (ex-info (format "Field %s on table %s did not appear after %dms" field-name table-name timeout-ms)
- {:table-name table-name :field-name field-name :timeout-ms timeout-ms}))
- :else (do (Thread/sleep 200)
- (recur)))))))
+ (let [table (t2/select-one :model/Table :name table-name :db_id (mt/id))
+ field (when table
+ (t2/select-one :model/Field :table_id (:id table) :name field-name :active true))]
+ (or (pred field)
+ (if (> (u/since-ms timer) timeout-ms)
+ (throw (ex-info (format timeout-msg field-name table-name timeout-ms)
+ {:table-name table-name :field-name field-name :timeout-ms timeout-ms}))
+ (do (Thread/sleep 200)
+ (recur))))))))
+
+(defn wait-for-field
+ "Wait for a field with `field-name` to appear as active on `table-name`."
+ [table-name field-name timeout-ms]
+ (poll-field table-name field-name timeout-ms
+ some?
+ "Field %s on table %s did not appear after %dms"))
+
+(defn wait-for-field-inactive
+ "Wait for a field with `field-name` to no longer be active on `table-name`."
+ [table-name field-name timeout-ms]
+ (poll-field table-name field-name timeout-ms
+ nil?
+ "Field %s on table %s still active after %dms"))
(defn get-test-schema
"Get the schema from the products table in the test dataset.