From d4d1835d1dc585187aeade0b1cf8b76167690a06 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Sat, 19 Apr 2025 20:20:54 +0200 Subject: [PATCH 1/5] fusebox tests --- deps.edn | 4 +++- .../lib_tests/babashka/run_all_libtests.clj | 2 -- test-resources/lib_tests/bb-tested-libs.edn | 14 +++++++++++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/deps.edn b/deps.edn index c891086f..87b98012 100644 --- a/deps.edn +++ b/deps.edn @@ -174,7 +174,9 @@ prismatic/plumbing {:git/url "https://github.com/plumatic/plumbing", :git/sha "424bc704f2db422de34269c139a5494314b3a43b"} org.clj-commons/hickory {:git/url "https://github.com/clj-commons/hickory" - :git/sha "9385b6708ef35f161732d8464b3a3aa57dd79f30"}} + :git/sha "9385b6708ef35f161732d8464b3a3aa57dd79f30"} + com.potetm/fusebox {:git/url "https://github.com/potetm/fusebox" + :git/sha "b61df08b11e4960b5dea2ccfb4532a717c71cb2a"}} :classpath-overrides {org.clojure/clojure nil org.clojure/spec.alpha nil}} :clj-nvd diff --git a/test-resources/lib_tests/babashka/run_all_libtests.clj b/test-resources/lib_tests/babashka/run_all_libtests.clj index 20e4e11b..b9b70876 100644 --- a/test-resources/lib_tests/babashka/run_all_libtests.clj +++ b/test-resources/lib_tests/babashka/run_all_libtests.clj @@ -75,8 +75,6 @@ (doseq [p test-paths] (add-classpath (str (fs/file git-dir p))))) (when-not (and skip-windows (windows?)) - (prn :branch (current-branch)) - (prn (System/getenv)) (if (and flaky (#{"main" "master"} (current-branch))) (println "Skipping" tns "for main branch because it's marked flaky") (swap! test-nss into tns)))) diff --git a/test-resources/lib_tests/bb-tested-libs.edn b/test-resources/lib_tests/bb-tested-libs.edn index 1b32339f..87cf2480 100644 --- a/test-resources/lib_tests/bb-tested-libs.edn +++ b/test-resources/lib_tests/bb-tested-libs.edn @@ -201,4 +201,16 @@ hickory.test.render hickory.test.select hickory.test.zip]} - cheshire/cheshire {:git-url "https://github.com/dakrone/cheshire", :test-namespaces [cheshire.test.core], :manually-added true}} + cheshire/cheshire {:git-url "https://github.com/dakrone/cheshire", :test-namespaces [cheshire.test.core], :manually-added true} + com.potetm/fusebox {:git-url "https://github.com/potetm/fusebox" + :git-sha "b61df08b11e4960b5dea2ccfb4532a717c71cb2a" + :test-paths ["test"] + :test-namespaces [com.potetm.fusebox.bulkhead-test + com.potetm.fusebox.bulwark-test + com.potetm.fusebox.circuit-breaker-test + com.potetm.fusebox.fallback-test + com.potetm.fusebox.memoize-test + com.potetm.fusebox.rate-limit-test + com.potetm.fusebox.registry-test + com.potetm.fusebox.retry-test + com.potetm.fusebox.timeout-test]}} From be1c20e271d7e9e404537a29704954d19bad6640 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Sat, 19 Apr 2025 23:00:11 +0200 Subject: [PATCH 2/5] Bump fusebox --- deps.edn | 2 +- test-resources/lib_tests/bb-tested-libs.edn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps.edn b/deps.edn index 87b98012..c69d185e 100644 --- a/deps.edn +++ b/deps.edn @@ -176,7 +176,7 @@ org.clj-commons/hickory {:git/url "https://github.com/clj-commons/hickory" :git/sha "9385b6708ef35f161732d8464b3a3aa57dd79f30"} com.potetm/fusebox {:git/url "https://github.com/potetm/fusebox" - :git/sha "b61df08b11e4960b5dea2ccfb4532a717c71cb2a"}} + :git/sha "2f42391868c82c193628bec8922f8735ae3cac66"}} :classpath-overrides {org.clojure/clojure nil org.clojure/spec.alpha nil}} :clj-nvd diff --git a/test-resources/lib_tests/bb-tested-libs.edn b/test-resources/lib_tests/bb-tested-libs.edn index 87cf2480..1cce6841 100644 --- a/test-resources/lib_tests/bb-tested-libs.edn +++ b/test-resources/lib_tests/bb-tested-libs.edn @@ -203,7 +203,7 @@ hickory.test.zip]} cheshire/cheshire {:git-url "https://github.com/dakrone/cheshire", :test-namespaces [cheshire.test.core], :manually-added true} com.potetm/fusebox {:git-url "https://github.com/potetm/fusebox" - :git-sha "b61df08b11e4960b5dea2ccfb4532a717c71cb2a" + :git-sha "2f42391868c82c193628bec8922f8735ae3cac66" :test-paths ["test"] :test-namespaces [com.potetm.fusebox.bulkhead-test com.potetm.fusebox.bulwark-test From fb3f8d9b21014d1cd082089b7ee1f9c53c79ceba Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Sat, 19 Apr 2025 23:20:04 +0200 Subject: [PATCH 3/5] disable timeout tests --- resources/META-INF/babashka/deps.edn | 4 +++- test-resources/lib_tests/bb-tested-libs.edn | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/META-INF/babashka/deps.edn b/resources/META-INF/babashka/deps.edn index c891086f..c69d185e 100644 --- a/resources/META-INF/babashka/deps.edn +++ b/resources/META-INF/babashka/deps.edn @@ -174,7 +174,9 @@ prismatic/plumbing {:git/url "https://github.com/plumatic/plumbing", :git/sha "424bc704f2db422de34269c139a5494314b3a43b"} org.clj-commons/hickory {:git/url "https://github.com/clj-commons/hickory" - :git/sha "9385b6708ef35f161732d8464b3a3aa57dd79f30"}} + :git/sha "9385b6708ef35f161732d8464b3a3aa57dd79f30"} + com.potetm/fusebox {:git/url "https://github.com/potetm/fusebox" + :git/sha "2f42391868c82c193628bec8922f8735ae3cac66"}} :classpath-overrides {org.clojure/clojure nil org.clojure/spec.alpha nil}} :clj-nvd diff --git a/test-resources/lib_tests/bb-tested-libs.edn b/test-resources/lib_tests/bb-tested-libs.edn index 1cce6841..354925ff 100644 --- a/test-resources/lib_tests/bb-tested-libs.edn +++ b/test-resources/lib_tests/bb-tested-libs.edn @@ -213,4 +213,4 @@ com.potetm.fusebox.rate-limit-test com.potetm.fusebox.registry-test com.potetm.fusebox.retry-test - com.potetm.fusebox.timeout-test]}} + #_com.potetm.fusebox.timeout-test]}} From e479b171815efeff8c94155ea7bf71b75d82f571 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Sun, 20 Apr 2025 13:15:08 +0200 Subject: [PATCH 4/5] disable rate limit test --- test-resources/lib_tests/bb-tested-libs.edn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-resources/lib_tests/bb-tested-libs.edn b/test-resources/lib_tests/bb-tested-libs.edn index 354925ff..8a254a2b 100644 --- a/test-resources/lib_tests/bb-tested-libs.edn +++ b/test-resources/lib_tests/bb-tested-libs.edn @@ -210,7 +210,7 @@ com.potetm.fusebox.circuit-breaker-test com.potetm.fusebox.fallback-test com.potetm.fusebox.memoize-test - com.potetm.fusebox.rate-limit-test + #_com.potetm.fusebox.rate-limit-test com.potetm.fusebox.registry-test com.potetm.fusebox.retry-test #_com.potetm.fusebox.timeout-test]}} From 65abe62ee14d94ed790503852a727d497e59afad Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Tue, 22 Apr 2025 20:11:17 +0200 Subject: [PATCH 5/5] sci, but not yet done --- sci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci b/sci index bb544b70..eba23cb4 160000 --- a/sci +++ b/sci @@ -1 +1 @@ -Subproject commit bb544b70ecdf3574bb7600f9203b08041e9d50d0 +Subproject commit eba23cb4983e2f30d1fadb5cd043ffe496353982