From 9f5d7e005dac5135da95265c3076ede86521fcb9 Mon Sep 17 00:00:00 2001
From: Ngoc Khuat <qn.khuat@gmail.com>
Date: Fri, 14 Jul 2023 22:27:50 +0700
Subject: [PATCH] Fix `with-temporary-setting-values` incorrectly identify
whether it's in a parallel test (#32382)
---
test/metabase/server/request/util_test.clj | 2 +-
test/metabase/test/util.clj | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/test/metabase/server/request/util_test.clj b/test/metabase/server/request/util_test.clj
index 18d54f77ac3..1140a729211 100644
--- a/test/metabase/server/request/util_test.clj
+++ b/test/metabase/server/request/util_test.clj
@@ -54,7 +54,7 @@
nil
nil))
-(deftest ^:parallel ip-address-test
+(deftest ip-address-test
(let [request (ring.mock/request :get "api/session")]
(testing "request with no forwarding"
(is (= "127.0.0.1"
diff --git a/test/metabase/test/util.clj b/test/metabase/test/util.clj
index 5d2a2e030fe..ac5a645a713 100644
--- a/test/metabase/test/util.clj
+++ b/test/metabase/test/util.clj
@@ -374,6 +374,7 @@
Prefer the macro [[with-temporary-setting-values]] or [[with-temporary-raw-setting-values]] over using this function directly."
[setting-k value thunk & {:keys [raw-setting?]}]
;; plugins have to be initialized because changing `report-timezone` will call driver methods
+ (mb.hawk.parallel/assert-test-is-not-parallel "do-with-temporary-setting-value")
(initialize/initialize-if-needed! :db :plugins)
(let [setting-k (name setting-k)
setting (try
@@ -421,7 +422,6 @@
To temporarily override the value of *read-only* env vars, use [[with-temp-env-var-value]]."
[[setting-k value & more :as bindings] & body]
(assert (even? (count bindings)) "mismatched setting/value pairs: is each setting name followed by a value?")
- (mb.hawk.parallel/assert-test-is-not-parallel "with-temporary-setting-vales")
(if (empty? bindings)
`(do ~@body)
`(do-with-temporary-setting-value ~(keyword setting-k) ~value
@@ -434,7 +434,6 @@
using [[metabase.models.setting/defsetting]]."
[[setting-k value & more :as bindings] & body]
(assert (even? (count bindings)) "mismatched setting/value pairs: is each setting name followed by a value?")
- (mb.hawk.parallel/assert-test-is-not-parallel "with-temporary-raw-setting-values")
(if (empty? bindings)
`(do ~@body)
`(do-with-temporary-setting-value ~(keyword setting-k) ~value
--
GitLab