From ea0e28d8543293e88954d5681b95fb988ca1972d Mon Sep 17 00:00:00 2001
From: Cam Saul <github@camsaul.com>
Date: Mon, 9 Mar 2020 17:36:21 -0700
Subject: [PATCH] Potential occasional cache-test failure fix
---
.circleci/config.yml | 2 +-
.../query_processor/middleware/cache_test.clj | 13 +++++++------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index f543cf04e20..59b9c85b047 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -266,7 +266,7 @@ jobs:
- run:
name: Generate checksums of all backend source files to use as Uberjar cache key
command: >
- for file in `find ./src -type f -name '*.clj' | sort`;
+ for file in `find ./src ./backend -type f -name '*.clj' | sort`;
do echo `md5sum $file` >> backend-checksums.txt;
done;
echo `md5sum project.clj` >> backend-checksums.txt
diff --git a/test/metabase/query_processor/middleware/cache_test.clj b/test/metabase/query_processor/middleware/cache_test.clj
index 22b50089ec0..4133e39ef14 100644
--- a/test/metabase/query_processor/middleware/cache_test.clj
+++ b/test/metabase/query_processor/middleware/cache_test.clj
@@ -34,12 +34,13 @@
(i/cached-results db-backend query-hash max-age-seconds f))
(save-results! [_ query-hash results]
- (i/save-results! db-backend query-hash results)
- (some-> @save-chan* (a/>!! ::save)))
+ (println "@save-chan*:" @save-chan*) ; NOCOMMIT
+ (some-> @save-chan* (a/>!! ::save))
+ (i/save-results! db-backend query-hash results))
(purge-old-entries! [_ max-age-seconds]
- (i/purge-old-entries! db-backend max-age-seconds)
- (some-> @purge-chan* (a/>!! ::purge))))))
+ (some-> @purge-chan* (a/>!! ::purge))
+ (i/purge-old-entries! db-backend max-age-seconds)))))
(defn- do-with-test-backend [thunk]
(binding [cache/*backend* (test-backend)]
@@ -113,7 +114,7 @@
::exception)))))
(orig query-hash out-chan))]
(u/prog1 (thunk)
- (testing "waiting for save"
+ (testing "\nwaiting for save"
(is (= expected-result
(mt/wait-for-result save-chan 1000)))))))
(finally
@@ -131,7 +132,7 @@
(try
(reset! purge-chan* purge-chan)
(u/prog1 (thunk)
- (testing "waiting for purge"
+ (testing "\nwaiting for purge"
(is (= expected-result
(mt/wait-for-result purge-chan 500)))))
(finally (reset! purge-chan* orig))))))
--
GitLab