Fix test runner (#337)

* Upgrades tests to `unittest2`

* Better way to get the tests output. Fixes an issue where the output wasnt being retrieved

Author: jmgomez

testrunner.nim

@@ -81,16 +81,15 @@ proc listTests*(
     stdoutHandle = AsyncProcess.Pipe,
   )
   try:
-    let (error, res) = await readErrorOutputUntilExit(process, 15.seconds)
+    let (rawOutput, error, res) = await readOutputUntilExit(process, 15.seconds)
     if res != 0:
       error "Failed to list tests", nimPath = nimPath, entryPoint = entryPoint, res = res    
       error "An error occurred while listing tests"
       for line in error.splitLines:
         error "Error line: ", line = line
       error "Command args: ", args = args
-      result = TestProjectInfo(error: some error)
+      result = TestProjectInfo(error: some error)      
     else:
-      let rawOutput = await readAllOutput(process.stdoutStream)   
       debug "list test raw output", rawOutput = rawOutput
       result = extractTestInfo(rawOutput)
   finally:
@@ -126,7 +125,7 @@ proc runTests*(
   ls.testRunProcess = some(process)
   try:
     removeFile(resultFile)
-    let (error, res) = await readErrorOutputUntilExit(process, 15.seconds)
+    let (output, error, res) = await readOutputUntilExit(process, 15.seconds)
     if res != 0: #When a test fails, the process will exit with a non-zero code
       if fileExists(resultFile):
         result = parseTestResults(readFile(resultFile))
@@ -137,11 +136,12 @@ proc runTests*(
       error "An error occurred while running tests"
       error "Error from process", error = error
       result = RunTestProjectResult(fullOutput: error)
+      result.fullOutput = output
     else:
       let xmlContent = readFile(resultFile)
       # echo "XML CONTENT: ", xmlContent
       result = parseTestResults(xmlContent)
-      result.fullOutput = error
+      result.fullOutput = output
       removeFile(resultFile)
   except Exception as e:
     let processOutput = string.fromBytes(process.stdoutStream.read().await)

utils.nim

@@ -386,3 +386,45 @@ proc readErrorOutputUntilExit*(process: AsyncProcessRef, duration: Duration): Fu
         let data = await process.stderrStream.read()
         output.add(string.fromBytes(data))
       return (output, res)
+
+
+proc readOutputUntilExit*(process: AsyncProcessRef, duration: Duration): Future[tuple[output: string, error: string, code: int]] {.async.} =
+  var output = ""
+  var error = ""
+  var res = 0
+  # debug "Starting read output until exit"
+  
+  while true:
+    let hasExited = try:
+      res = await process.waitForExit(duration)
+      debug "Process exit check", hasExited = true, res = res
+      true
+    except AsyncTimeoutError:
+      debug "Process still running"
+      false
+
+    # Quick non-blocking reads
+    try:
+      if not process.stdoutStream.atEof:
+        # debug "Attempting stdout read"
+        let data = await process.stdoutStream.read()  #
+        if data.len > 0:
+          # debug "Got stdout data", len = data.len
+          output.add(string.fromBytes(data))
+    except CatchableError as e:
+      debug "Stdout read error", msg = e.msg
+
+    try:
+      if not process.stderrStream.atEof:
+        # debug "Attempting stderr read"
+        let data = await process.stderrStream.read() 
+        if data.len > 0:
+          # debug "Got stderr data", len = data.len
+          error.add(string.fromBytes(data))
+    except CatchableError as e:
+      debug "Stderr read error", msg = e.msg
+    
+    if hasExited:
+      # debug "Process has exited, final cleanup", output = output, error = error, code = res
+      return (output, error, res)
+