From 82bb7109a46578632a25e6eb3f1d83ee7e4a59b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cam=20Sa=C3=BCl?= <cammsaul@gmail.com> Date: Fri, 6 Jan 2017 14:31:31 -0800 Subject: [PATCH] Fix random test failure :wrench: [ci drivers] --- test/metabase/models/metric_test.clj | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/metabase/models/metric_test.clj b/test/metabase/models/metric_test.clj index e040ae06ec4..0856bfc1eb0 100644 --- a/test/metabase/models/metric_test.clj +++ b/test/metabase/models/metric_test.clj @@ -40,7 +40,7 @@ :is_active true :definition {:clause ["a" "b"]}} (tu/with-temp* [Database [{database-id :id}] - Table [{:keys [id]} {:db_id database-id}]] + Table [{:keys [id]} {:db_id database-id}]] (create-metric-then-select! id "I only want *these* things" nil (user->id :rasta) {:clause ["a" "b"]}))) @@ -49,12 +49,12 @@ [true false] (tu/with-temp* [Database [{database-id :id}] - Table [{table-id :id} {:db_id database-id}] - Metric [{metric-id :id} {:table_id table-id - :definition {:database 45 - :query {:filter ["yay"]}}}]] + Table [{table-id :id} {:db_id database-id}] + Metric [{metric-id :id} {:table_id table-id + :definition {:database 45 + :query {:filter ["yay"]}}}]] [(metric/exists? metric-id) - (metric/exists? 34)])) + (metric/exists? Integer/MAX_VALUE)])) ; a Metric that definitely doesn't exist ;; retrieve-metric @@ -71,10 +71,10 @@ :definition {:database 45 :query {:filter ["yay"]}}} (tu/with-temp* [Database [{database-id :id}] - Table [{table-id :id} {:db_id database-id}] - Metric [{metric-id :id} {:table_id table-id - :definition {:database 45 - :query {:filter ["yay"]}}}]] + Table [{table-id :id} {:db_id database-id}] + Metric [{metric-id :id} {:table_id table-id + :definition {:database 45 + :query {:filter ["yay"]}}}]] (let [{:keys [creator] :as metric} (retrieve-metric metric-id)] (update (dissoc metric :id :table_id :created_at :updated_at) :creator (u/rpartial dissoc :date_joined :last_login))))) -- GitLab