diff --git a/src/babashka/impl/clojure/test.clj b/src/babashka/impl/clojure/test.clj_deleted similarity index 100% rename from src/babashka/impl/clojure/test.clj rename to src/babashka/impl/clojure/test.clj_deleted diff --git a/src/babashka/main.clj b/src/babashka/main.clj index 2732b5cc..90be6d26 100644 --- a/src/babashka/main.clj +++ b/src/babashka/main.clj @@ -53,7 +53,6 @@ [babashka.impl.server :refer [clojure-core-server-namespace]] [babashka.impl.socket-repl :as socket-repl] [babashka.impl.tasks :as tasks :refer [tasks-namespace]] - [babashka.impl.test :as t] [babashka.impl.tools.cli :refer [tools-cli-namespace]] [babashka.impl.uberscript :as uberscript] [babashka.nrepl.server :as nrepl-server] diff --git a/test/babashka/impl/nrepl_server_test.clj b/test/babashka/impl/nrepl_server_test.clj index 108cc123..a8d54b43 100644 --- a/test/babashka/impl/nrepl_server_test.clj +++ b/test/babashka/impl/nrepl_server_test.clj @@ -9,6 +9,7 @@ [bencode.core :as bencode] [clojure.test :as t :refer [deftest is testing]] [sci.core :as sci] + [babashka.impl.common :as common] [sci.ctx-store :as ctx-store] [babashka.impl.classpath :as cp]) (:import @@ -213,8 +214,8 @@ (deftest ^:skip-windows nrepl-server-test (let [proc-state (atom nil) server-state (atom nil) - ctx (sci/init {:namespaces main/namespaces - :features #{:bb}})] + _ (main/main "-e" "nil") ;; dummy invocation to reset ctx + ctx (common/ctx)] (sci.ctx-store/with-ctx ctx (try (if tu/jvm? diff --git a/test/babashka/test_test.clj b/test/babashka/test_test.clj index 7dea2691..35dcb073 100644 --- a/test/babashka/test_test.clj +++ b/test/babashka/test_test.clj @@ -1,17 +1,14 @@ (ns babashka.test-test (:require - [babashka.impl.clojure.test :as test-impl] + #_[babashka.impl.clojure.test :as test-impl] [babashka.test-utils :as tu] [clojure.edn :as edn] [clojure.java.io :as io] [clojure.string :as str] - [clojure.test :as t :refer [deftest is]] - [sci.core :as sci])) + [clojure.test :as t :refer [deftest is]])) (defn bb [& args] - (let [sw (java.io.StringWriter.)] - (sci/binding [test-impl/test-out sw] - (str sw (apply tu/bb nil (map str args)))))) + (str (apply tu/bb nil (map str args)))) (deftest deftest-test (is (str/includes?