From 407f06506c826a4b75adcecb52a1689bc613cbde Mon Sep 17 00:00:00 2001
From: Cam Saul <cammsaul@gmail.com>
Date: Mon, 13 May 2019 15:41:39 -0700
Subject: [PATCH] Test fix :wrench:
---
test/metabase/task/sync_databases_test.clj | 4 +++-
test/metabase/task_test.clj | 11 +++++------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/test/metabase/task/sync_databases_test.clj b/test/metabase/task/sync_databases_test.clj
index 63eadba73e7..0bed25ac5ec 100644
--- a/test/metabase/task/sync_databases_test.clj
+++ b/test/metabase/task/sync_databases_test.clj
@@ -36,7 +36,9 @@
(update-in [:data "db-id"] replace-trailing-id-with-<id>))))))))))
(defn- current-tasks []
- (replace-ids-with-<id> (tu/scheduler-current-tasks)))
+ (->> (tu/scheduler-current-tasks)
+ (filter #(#{"metabase.task.sync-and-analyze.job" "metabase.task.update-field-values.job"} (:key %)))
+ replace-ids-with-<id>))
(defmacro ^:private with-scheduler-setup [& body]
`(tu/with-temp-scheduler
diff --git a/test/metabase/task_test.clj b/test/metabase/task_test.clj
index 76bd5a5d2ef..08e1b25bf08 100644
--- a/test/metabase/task_test.clj
+++ b/test/metabase/task_test.clj
@@ -37,12 +37,11 @@
(cron/with-misfire-handling-instruction-ignore-misfires)))))
(defn- do-with-temp-scheduler-and-cleanup [f]
- (try
- (tu/with-temp-scheduler
- (f))
- (finally
- (task/delete-task! (.getKey (job)) (.getKey (trigger-1)))
- (task/delete-task! (.getKey (job)) (.getKey (trigger-2))))))
+ (tu/with-temp-scheduler
+ (try
+ (f)
+ (finally
+ (task/delete-task! (.getKey (job)) (.getKey (trigger-1)))))))
(defmacro ^:private with-temp-scheduler-and-cleanup [& body]
`(do-with-temp-scheduler-and-cleanup (fn [] ~@body)))
--
GitLab