Remove thread/new from test suite.

3 files changed, 35 insertions, 53 deletions

diff --git a/test/suite0002.janet b/test/suite0002.janet
index d978a66..899e6d6 100644
--- a/test/suite0002.janet
+++ b/test/suite0002.janet
@@ -8,15 +8,8 @@
          (assert (= msg "spork") "RPC server")
          (string "Hello " msg))})
 
-(defn wrk [m] (rpc/server fns "localhost" 8000))
-
-(def wt (thread/new wrk 1 :h)) # so need heavy thread for the assert
-
-(os/sleep 0.1) # give server thread little time to start
-
-(defer (:close wt)
-  (def c (rpc/client "localhost" 8000))
-  (assert (= (:hi c "spork") "Hello spork") "RPC client")
-  (:close c))
+(with [wt (rpc/server fns "localhost" 8000)]
+  (with [c (rpc/client "localhost" 8000)]
+    (assert (= (:hi c "spork") "Hello spork") "RPC client")))
 
 (end-suite)
diff --git a/test/suite0003.janet b/test/suite0003.janet
index f4a2dce..e0db708 100644
--- a/test/suite0003.janet
+++ b/test/suite0003.janet
@@ -10,16 +10,11 @@
     (assert (= msg "spork") "Message 1")
     (send msg)))
 
-(defn wrk [m] (net/server "localhost" 8000 handler))
+(with [wt (net/server "localhost" 8000 handler)]
+  (with [s (net/connect "localhost" 8000)]
+    (def recv (msg/make-recv s))
+    (def send (msg/make-send s))
+    (send "spork")
+    (assert (= (recv) "spork") "Message 2")))
 
-(def wt (thread/new wrk 1 :h)) # we need heavy thread for the assert
-
-(os/sleep 0.1) # give server thread little time to start
-
-(defer (:close wt)
-  (def s (net/connect "localhost" 8000))
-  (def recv (msg/make-recv s))
-  (def send (msg/make-send s))
-  (send "spork")
-  (assert (= (recv) "spork") "Message 2"))
 (end-suite)
diff --git a/test/suite0009.janet b/test/suite0009.janet
index b04fbf7..33f672a 100644
--- a/test/suite0009.janet
+++ b/test/suite0009.janet
@@ -4,44 +4,38 @@
 
 (start-suite 9)
 
-(defn wrk [m]
-  (netrepl/server "localhost" "8000"))
+(with [wt (netrepl/server "localhost" "8000")]
+  (with [s (net/connect "localhost" "8000")]
+    (def recv (msg/make-recv s))
+    (def send (msg/make-send s))
+    (send "test")
 
-(def wt (thread/new wrk 1 :h)) # we need heavy thread for the assert
+    (assert (= (recv) "test:1: ") "Prompt 1")
+    (send "(+ 1 2)\n")
+    (assert (= (recv) "\e[32m3\e[0m\n") "Result 1")
 
-(os/sleep 0.1) # give server thread little time to start
+    (assert (= (recv) "test:2: ") "Prompt 2")
+    (send "\xFF(parser/where (dyn :parser) 100)")
+    (assert (= (recv) "(true (100 0))") "Response 2")
+    (send "(+ 1 2)\n")
+    (assert (= (recv) "\e[32m3\e[0m\n") "Result 2")
 
-(defer (:close wt)
-  (def s (net/connect "localhost" "8000"))
-  (def recv (msg/make-recv s))
-  (def send (msg/make-send s))
-  (send "test")
+    (assert (= (recv) "test:101: ") "Prompt 3")
+    (send "\xFEcancel")
+    (assert (= (recv) nil) "Response 3")
 
-  (assert (= (recv) "test:1: ") "Prompt 1")
-  (send "(+ 1 2)\n")
-  (assert (= (recv) "\e[32m3\e[0m\n") "Result 1")
+    (assert (= (recv) "test:101: ") "Prompt 4")
+    (send "\xFEsource \"foobar.janet\"")
+    (assert (= (recv) nil) "Response 4")
 
-  (assert (= (recv) "test:2: ") "Prompt 2")
-  (send "\xFF(parser/where (dyn :parser) 100)")
-  (assert (= (recv) "(true (100 0))") "Response 2")
-  (send "(+ 1 2)\n")
-  (assert (= (recv) "\e[32m3\e[0m\n") "Result 2")
+    (assert (= (recv) "test:101: ") "Prompt 5")
+    (send "(def foo :bar)\n")
+    (assert (= (recv) "\e[33m:bar\e[0m\n") "Result 5")
 
-  (assert (= (recv) "test:101: ") "Prompt 3")
-  (send "\xFEcancel")
-  (assert (= (recv) nil) "Response 3")
+    (assert (= (recv) "test:102: ") "Prompt 6")
+    (send "(get (dyn 'foo) :source-map)\n")
+    (assert (= (recv) "(\e[35m\"foobar.janet\"\e[0m \e[32m101\e[0m \e[32m1\e[0m)\n") "Result 6")
 
-  (assert (= (recv) "test:101: ") "Prompt 4")
-  (send "\xFEsource \"foobar.janet\"")
-  (assert (= (recv) nil) "Response 4")
+    (assert (= (recv) "test:103: ") "Prompt 7")))
 
-  (assert (= (recv) "test:101: ") "Prompt 5")
-  (send "(def foo :bar)\n")
-  (assert (= (recv) "\e[33m:bar\e[0m\n") "Result 5")
-
-  (assert (= (recv) "test:102: ") "Prompt 6")
-  (send "(get (dyn 'foo) :source-map)\n")
-  (assert (= (recv) "(\e[35m\"foobar.janet\"\e[0m \e[32m101\e[0m \e[32m1\e[0m)\n") "Result 6")
-
-  (assert (= (recv) "test:103: ") "Prompt 7"))
 (end-suite)