[#899] Fix JVM test

This commit is contained in:
Michiel Borkent 2021-06-20 14:26:40 +02:00
parent f27098f877
commit e143eb1cb1
3 changed files with 6 additions and 4 deletions

View file

@ -49,7 +49,7 @@
"REPL with predefined hooks for attachable socket server." "REPL with predefined hooks for attachable socket server."
([sci-ctx] (repl sci-ctx nil)) ([sci-ctx] (repl sci-ctx nil))
([sci-ctx {:keys [:init :read :eval :need-prompt :prompt :flush :print :caught]}] ([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 (m/repl
:init (or init :init (or init
(fn [] (fn []

View file

@ -8,6 +8,7 @@
[clojure.edn :as edn] [clojure.edn :as edn]
[clojure.string :as str] [clojure.string :as str]
[clojure.test :as test :refer [*report-counters*]] [clojure.test :as test :refer [*report-counters*]]
[clojure.tools.reader.reader-types :as r]
[sci.core :as sci] [sci.core :as sci]
[sci.impl.vars :as vars])) [sci.impl.vars :as vars]))
@ -51,7 +52,8 @@
in (if (string? input-or-opts) in (if (string? input-or-opts)
input-or-opts (:in input-or-opts)) input-or-opts (:in input-or-opts))
is (when in 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 bindings-map (cond-> {sci/out os
sci/err es} sci/err es}
is (assoc sci/in is))] is (assoc sci/in is))]

View file

@ -1,9 +1,9 @@
(ns babashka.uberjar-test (ns babashka.uberjar-test
(:require (:require
[babashka.main :as main]
[babashka.test-utils :as tu] [babashka.test-utils :as tu]
[clojure.string :as str] [clojure.string :as str]
[clojure.test :as t :refer [deftest is testing]] [clojure.test :as t :refer [deftest is testing]]))
[babashka.main :as main]))
(defn count-entries [jar] (defn count-entries [jar]
(with-open [jar-file (java.util.jar.JarFile. jar)] (with-open [jar-file (java.util.jar.JarFile. jar)]