updating tests

Author: Jaremy J. Creechley

tests/tchannels_overwrite.nim

@@ -5,6 +5,7 @@ discard """
 
 import threading/channels
 import std/[os, logging, unittest]
+from tchannels_simple import runMultithreadTest
 
 suite "testing Chan with overwrite mode":
   var logger = newConsoleLogger(levelThreshold=lvlInfo)
@@ -40,52 +41,7 @@ suite "testing Chan with overwrite mode":
 
     var chan = newChan[string](elements = 4, overwrite = true)
 
-    # Launch the worker.
-    var worker1: Thread[void]
-    var worker2: Thread[void]
+    runMultithreadTest(chan)
 
-    ## start worker1
-    createThread(worker1, proc () =
-      chan.send("Hello World!"))
-
-    # Block until the message arrives, then print it out.
-    block:
-      var dest = ""
-      chan.recv(dest)
-      doAssert dest == "Hello World!"
-
-      # Wait for the thread to exit before moving on to the next example.
-      worker1.joinThread()
-
-    # Launch the other worker.
-    createThread(worker2, proc () =
-      # This is another proc to run in a background thread. This proc takes a while
-      # to send the message since it sleeps for 2 seconds (or 2000 milliseconds).
-      sleep(2000)
-      chan.send("Another message"))
-
-    # This time, use a non-blocking approach with tryRecv.
-    # Since the main thread is not blocked, it could be used to perform other
-    # useful work while it waits for data to arrive on the channel.
-    var messages: seq[string]
-    block:
-      var msg = ""
-      while true:
-        let tried = chan.tryRecv(msg)
-        if tried:
-          messages.add move(msg)
-          break
-
-        messages.add "Pretend I'm doing useful work..."
-        # For this example, sleep in order not to flood stdout with the above
-        # message.
-        sleep(400)
-
-      # Wait for the second thread to exit before cleaning up the channel.
-      worker2.joinThread()
-
-      # Clean up the channel.
-      doAssert messages[^1] == "Another message"
-      doAssert messages.len >= 2
 
 

tests/tchannels_simple.nim

@@ -7,20 +7,13 @@ import threading/channels
 import std/[os, logging, unittest]
 
 template runMultithreadTest*[T](chan: Chan[T]) =
-  # This proc will be run in another thread using the threads module.
-  proc firstWorker() =
-    chan.send("Hello World!")
-
-  # This is another proc to run in a background thread. This proc takes a while
-  # to send the message since it sleeps for 2 seconds (or 2000 milliseconds).
-  proc secondWorker() =
-    sleep(2000)
-    chan.send("Another message")
-
-
-  # Launch the worker.
   var worker1: Thread[void]
-  createThread(worker1, firstWorker)
+  var worker2: Thread[void]
+
+  # Launch the first worker.
+  createThread(worker1, proc () =
+    # This proc will be run in another thread using the threads module.
+    chan.send("Hello World!"))
 
   # Block until the message arrives, then print it out.
   var dest = ""
@@ -31,8 +24,12 @@ template runMultithreadTest*[T](chan: Chan[T]) =
   worker1.joinThread()
 
   # Launch the other worker.
-  var worker2: Thread[void]
-  createThread(worker2, secondWorker)
+  createThread(worker2, proc () =
+    # This is another proc to run in a background thread. This proc takes a while
+    # to send the message since it sleeps for 2 seconds (or 2000 milliseconds).
+    sleep(2000)
+    chan.send("Another message"))
+
   # This time, use a non-blocking approach with tryRecv.
   # Since the main thread is not blocked, it could be used to perform other
   # useful work while it waits for data to arrive on the channel.