vary ports across socket repl tests (#1539)
* use different port for socket repl tests - update socket-command to socket-command-on-port, which takes a port and then returns the socket-command function - change port numbers across tests * undo little formatting change * grr... newlines
This commit is contained in:
Bob
GitHub
parent
a945ea8146
commit
19bfd172fc
1 changed files with 103 additions and 99 deletions
|
|
@ -15,30 +15,31 @@
|
|||
|
||||
(set! *warn-on-reflection* true)
|
||||
|
||||
(defn socket-command [expr expected & [log?]]
|
||||
(with-open [socket (java.net.Socket. "127.0.0.1" 1666)
|
||||
reader (io/reader socket)
|
||||
sw (java.io.StringWriter.)
|
||||
writer (io/writer socket)]
|
||||
(binding [*out* writer]
|
||||
(println (str expr "\n")))
|
||||
(loop []
|
||||
(when-let [l (try (.readLine ^java.io.BufferedReader reader)
|
||||
(catch java.net.SocketException _ nil))]
|
||||
(when log?
|
||||
(println "===" l))
|
||||
(binding [*out* sw]
|
||||
(println l))
|
||||
(let [s (str sw)]
|
||||
;; (prn :s s :expected expected (str/includes? s expected))
|
||||
(if (if (fn? expected)
|
||||
(expected s)
|
||||
(str/includes? s expected))
|
||||
(is true)
|
||||
(recur)))))
|
||||
(binding [*out* writer]
|
||||
(println ":repl/quit\n"))
|
||||
:success))
|
||||
(defn socket-command-on-port [^long port]
|
||||
(fn [expr expected & [log?]]
|
||||
(with-open [socket (java.net.Socket. "127.0.0.1" port)
|
||||
reader (io/reader socket)
|
||||
sw (java.io.StringWriter.)
|
||||
writer (io/writer socket)]
|
||||
(binding [*out* writer]
|
||||
(println (str expr "\n")))
|
||||
(loop []
|
||||
(when-let [l (try (.readLine ^java.io.BufferedReader reader)
|
||||
(catch java.net.SocketException _ nil))]
|
||||
(when log?
|
||||
(println "===" l))
|
||||
(binding [*out* sw]
|
||||
(println l))
|
||||
(let [s (str sw)]
|
||||
;; (prn :s s :expected expected (str/includes? s expected))
|
||||
(if (if (fn? expected)
|
||||
(expected s)
|
||||
(str/includes? s expected))
|
||||
(is true)
|
||||
(recur)))))
|
||||
(binding [*out* writer]
|
||||
(println ":repl/quit\n"))
|
||||
:success)))
|
||||
|
||||
(def server-process (volatile! nil))
|
||||
|
||||
|
|
@ -46,87 +47,90 @@
|
|||
|
||||
(deftest ^:flaky socket-repl-test
|
||||
(when exec?
|
||||
(try
|
||||
(if tu/jvm?
|
||||
(let [ctx (init {:namespaces main/namespaces
|
||||
:features #{:bb}})]
|
||||
(ctx-store/reset-ctx! ctx)
|
||||
(start-repl! "0.0.0.0:1666" ctx))
|
||||
(do (vreset! server-process
|
||||
(p/process ["./bb" "socket-repl" "localhost:1666"]))
|
||||
(w/wait-for-port "localhost" 1666)))
|
||||
(Thread/sleep 50)
|
||||
(is (socket-command "(+ 1 2 3)" "user=> 6"))
|
||||
(testing "&env"
|
||||
(socket-command "(defmacro bindings [] (mapv #(list 'quote %) (keys &env)))" "bindings")
|
||||
(socket-command "(defn bar [x y z] (bindings))" "bar")
|
||||
(is (socket-command "(bar 1 2 3)" "[x y z]")))
|
||||
(testing "reader conditionals"
|
||||
(is (socket-command "#?(:bb 1337 :clj 8888)" "1337")))
|
||||
(testing "*1, *2, *3, *e"
|
||||
(is (socket-command "1\n*1" "1")))
|
||||
(testing "*ns*"
|
||||
(is (socket-command "(ns foo.bar) (ns-name *ns*)" "foo.bar")))
|
||||
(testing "set dyn vars"
|
||||
(is (socket-command "[(set! *warn-on-reflection* true) (set! *unchecked-math* true)]" "[true true]")))
|
||||
(finally
|
||||
(let [socket-command (socket-command-on-port 1666)]
|
||||
(try
|
||||
(if tu/jvm?
|
||||
(do (stop-repl!)
|
||||
(ctx-store/reset-ctx! nil)
|
||||
(Thread/sleep 100))
|
||||
(p/destroy-tree @server-process))))))
|
||||
(let [ctx (init {:namespaces main/namespaces
|
||||
:features #{:bb}})]
|
||||
(ctx-store/reset-ctx! ctx)
|
||||
(start-repl! "0.0.0.0:1666" ctx))
|
||||
(do (vreset! server-process
|
||||
(p/process ["./bb" "socket-repl" "localhost:1666"]))
|
||||
(w/wait-for-port "localhost" 1666)))
|
||||
(Thread/sleep 50)
|
||||
(is (socket-command "(+ 1 2 3)" "user=> 6"))
|
||||
(testing "&env"
|
||||
(socket-command "(defmacro bindings [] (mapv #(list 'quote %) (keys &env)))" "bindings")
|
||||
(socket-command "(defn bar [x y z] (bindings))" "bar")
|
||||
(is (socket-command "(bar 1 2 3)" "[x y z]")))
|
||||
(testing "reader conditionals"
|
||||
(is (socket-command "#?(:bb 1337 :clj 8888)" "1337")))
|
||||
(testing "*1, *2, *3, *e"
|
||||
(is (socket-command "1\n*1" "1")))
|
||||
(testing "*ns*"
|
||||
(is (socket-command "(ns foo.bar) (ns-name *ns*)" "foo.bar")))
|
||||
(testing "set dyn vars"
|
||||
(is (socket-command "[(set! *warn-on-reflection* true) (set! *unchecked-math* true)]" "[true true]")))
|
||||
(finally
|
||||
(if tu/jvm?
|
||||
(do (stop-repl!)
|
||||
(ctx-store/reset-ctx! nil)
|
||||
(Thread/sleep 100))
|
||||
(p/destroy-tree @server-process)))))))
|
||||
|
||||
(deftest ^:flaky socket-repl-opts-test
|
||||
(when exec?
|
||||
(try
|
||||
(if tu/jvm?
|
||||
(let [ctx (init {:bindings {'*command-line-args*
|
||||
["a" "b" "c"]}
|
||||
:env (atom {})
|
||||
:namespaces {'clojure.core.server clojure-core-server-namespace}
|
||||
:features #{:bb}})]
|
||||
(ctx-store/reset-ctx! ctx)
|
||||
(start-repl! "{:address \"localhost\" :accept clojure.core.server/repl :port 1666}"
|
||||
ctx))
|
||||
(do (vreset! server-process
|
||||
(p/process ["./bb" "--socket-repl" "{:address \"localhost\" :accept clojure.core.server/repl :port 1666}"]))
|
||||
(w/wait-for-port "localhost" 1666)))
|
||||
(Thread/sleep 50)
|
||||
(is (socket-command "(+ 1 2 3)" "user=> 6"))
|
||||
(finally
|
||||
(if tu/jvm?
|
||||
(do (stop-repl!)
|
||||
(ctx-store/reset-ctx! nil)
|
||||
(Thread/sleep 100))
|
||||
(p/destroy-tree @server-process))))))
|
||||
(let [socket-command (socket-command-on-port 1667)]
|
||||
(try
|
||||
(if tu/jvm?
|
||||
(let [ctx (init {:bindings {'*command-line-args*
|
||||
["a" "b" "c"]}
|
||||
:env (atom {})
|
||||
:namespaces {'clojure.core.server clojure-core-server-namespace}
|
||||
:features #{:bb}})]
|
||||
(ctx-store/reset-ctx! ctx)
|
||||
(start-repl! "{:address \"localhost\" :accept clojure.core.server/repl :port 1667}"
|
||||
ctx))
|
||||
(do (vreset! server-process
|
||||
(p/process ["./bb" "--socket-repl" "{:address \"localhost\" :accept clojure.core.server/repl :port 1667}"]))
|
||||
(w/wait-for-port "localhost" 1667)))
|
||||
(Thread/sleep 50)
|
||||
(is (socket-command "(+ 1 2 3)" "user=> 6"))
|
||||
(finally
|
||||
(if tu/jvm?
|
||||
(do (stop-repl!)
|
||||
(ctx-store/reset-ctx! nil)
|
||||
(Thread/sleep 100))
|
||||
(p/destroy-tree @server-process)))))))
|
||||
|
||||
(deftest ^:flaky socket-prepl-test
|
||||
(when exec?
|
||||
(try
|
||||
(if tu/jvm?
|
||||
(let [ctx (init {:bindings {'*command-line-args*
|
||||
["a" "b" "c"]}
|
||||
:env (atom {})
|
||||
:namespaces {'clojure.core.server clojure-core-server-namespace}
|
||||
:features #{:bb}})]
|
||||
(ctx-store/reset-ctx! ctx)
|
||||
(start-repl! "{:address \"localhost\" :accept clojure.core.server/io-prepl :port 1666}"
|
||||
ctx))
|
||||
(do (vreset! server-process
|
||||
(p/process ["./bb" "--socket-repl" "{:address \"localhost\" :accept clojure.core.server/io-prepl :port 1666}"]))
|
||||
(w/wait-for-port "localhost" 1666)))
|
||||
(Thread/sleep 50)
|
||||
(is (socket-command "(+ 1 2 3)" (fn [s]
|
||||
(let [m (edn/read-string s)]
|
||||
(and (= "6" (:val m))
|
||||
(= "user" (:ns m))
|
||||
(= "(+ 1 2 3)" (:form m)))))))
|
||||
(finally
|
||||
(if tu/jvm?
|
||||
(do (stop-repl!)
|
||||
(ctx-store/reset-ctx! nil)
|
||||
(Thread/sleep 100))
|
||||
(p/destroy-tree @server-process))))))
|
||||
(let [socket-command (socket-command-on-port 1668)]
|
||||
(try
|
||||
(if tu/jvm?
|
||||
(let [ctx (init {:bindings {'*command-line-args*
|
||||
["a" "b" "c"]}
|
||||
:env (atom {})
|
||||
:namespaces {'clojure.core.server clojure-core-server-namespace}
|
||||
:features #{:bb}})]
|
||||
(ctx-store/reset-ctx! ctx)
|
||||
(start-repl! "{:address \"localhost\" :accept clojure.core.server/io-prepl :port 1668}"
|
||||
ctx))
|
||||
(do (vreset! server-process
|
||||
(p/process ["./bb" "--socket-repl" "{:address \"localhost\" :accept clojure.core.server/io-prepl :port 1668}"]))
|
||||
(w/wait-for-port "localhost" 1668)))
|
||||
(Thread/sleep 50)
|
||||
(is (socket-command "(+ 1 2 3)" (fn [s]
|
||||
(let [m (edn/read-string s)]
|
||||
(and (= "6" (:val m))
|
||||
(= "user" (:ns m))
|
||||
(= "(+ 1 2 3)" (:form m)))))))
|
||||
(finally
|
||||
(if tu/jvm?
|
||||
(do (stop-repl!)
|
||||
(ctx-store/reset-ctx! nil)
|
||||
(Thread/sleep 100))
|
||||
(p/destroy-tree @server-process)))))))
|
||||
|
||||
;;;; Scratch
|
||||
|
||||
|
|
@ -141,5 +145,5 @@
|
|||
'*command-line-args*
|
||||
["a" "b" "c"]}
|
||||
:env (atom {})})
|
||||
(socket-command "(+ 1 2 3)" "6")
|
||||
((socket-command-on-port 1666) "(+ 1 2 3)" "6")
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in a new issue