From e143eb1cb13a99a27ddd1f065731d63ecb93f112 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Sun, 20 Jun 2021 14:26:40 +0200 Subject: [PATCH] [#899] Fix JVM test --- src/babashka/impl/repl.clj | 2 +- test/babashka/test_utils.clj | 4 +++- test/babashka/uberjar_test.clj | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/babashka/impl/repl.clj b/src/babashka/impl/repl.clj index 1ae3cebb..9cbf4d95 100644 --- a/src/babashka/impl/repl.clj +++ b/src/babashka/impl/repl.clj @@ -49,7 +49,7 @@ "REPL with predefined hooks for attachable socket server." ([sci-ctx] (repl sci-ctx nil)) ([sci-ctx {:keys [:init :read :eval :need-prompt :prompt :flush :print :caught]}] - (let [in @sci/in #_(r/indexing-push-back-reader (r/push-back-reader @sci/in))] + (let [in @sci/in] (m/repl :init (or init (fn [] diff --git a/test/babashka/test_utils.clj b/test/babashka/test_utils.clj index dcc77e7b..9fac05a3 100644 --- a/test/babashka/test_utils.clj +++ b/test/babashka/test_utils.clj @@ -8,6 +8,7 @@ [clojure.edn :as edn] [clojure.string :as str] [clojure.test :as test :refer [*report-counters*]] + [clojure.tools.reader.reader-types :as r] [sci.core :as sci] [sci.impl.vars :as vars])) @@ -51,7 +52,8 @@ in (if (string? input-or-opts) input-or-opts (:in input-or-opts)) is (when in - (java.io.StringReader. in)) + (r/indexing-push-back-reader + (r/push-back-reader (java.io.StringReader. in)))) bindings-map (cond-> {sci/out os sci/err es} is (assoc sci/in is))] diff --git a/test/babashka/uberjar_test.clj b/test/babashka/uberjar_test.clj index 49865c33..9709df1a 100644 --- a/test/babashka/uberjar_test.clj +++ b/test/babashka/uberjar_test.clj @@ -1,9 +1,9 @@ (ns babashka.uberjar-test (:require + [babashka.main :as main] [babashka.test-utils :as tu] [clojure.string :as str] - [clojure.test :as t :refer [deftest is testing]] - [babashka.main :as main])) + [clojure.test :as t :refer [deftest is testing]])) (defn count-entries [jar] (with-open [jar-file (java.util.jar.JarFile. jar)]