Merge branch 'junit-xml-test-results'

conormcd · Feb 15, 2016 · fc0203a · fc0203a
2 parents 3ae9101 + b28297f
commit fc0203a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ pom.xml.asc
 .hg/
 doc/api
 test/debug.log
+test/junit.xml
diff --git a/circle.yml b/circle.yml
@@ -2,6 +2,13 @@ machine:
   java:
     version: oraclejdk8
 
+test:
+  post:
+    - mkdir -p ${CIRCLE_TEST_REPORTS}/lein-test:
+        parallel: true
+    - cp test/junit.xml ${CIRCLE_TEST_REPORTS}/lein-test/${CIRCLE_NODE_INDEX}.xml:
+        parallel: true
+
 deployment:
   all:
     branch: /.*/

diff --git a/project.clj b/project.clj
@@ -11,7 +11,8 @@
                  [net.n01se/clojure-jna "1.0.0"]
                  [robert/hooke "1.3.0"]]
   :profiles {:dev {:plugins [[lein-codox "0.9.1"]]}
-             :test {:jvm-opts ["-Djava.util.logging.config.file=test/logging.properties"]}}
+             :test {:dependencies [[clojure-test-junit-output "0.1.3"]]
+                    :jvm-opts ["-Djava.util.logging.config.file=test/logging.properties"]}}
   :deploy-repositories ^:replace [["clojars" {:url "https://clojars.org/repo"
                                               :username [:gpg :env/clojars_username]
                                               :password [:gpg :env/clojars_password]

diff --git a/test/clj_libssh2/test_ssh.clj b/test/clj_libssh2/test_ssh.clj
@@ -96,7 +96,8 @@
                                  (swap! output conj (String. b off len))))
             run-exec (future
                        (try
-                         (ssh/exec {:port 2222
+                         (ssh/exec {:blocking-timeout 5000
+                                    :port 2222
                                     :read-timeout 5000}
                                    (str "tail -F " tempfile)
                                    :out streaming-reader)

diff --git a/test/clj_libssh2/test_utils.clj b/test/clj_libssh2/test_utils.clj
@@ -2,6 +2,7 @@
   (:require [clojure.java.shell :as sh]
             [clojure.string :as str]
             [clojure.test :as test]
+            [clojure-test-junit-output.core :refer [with-junit-output]]
             [net.n01se.clojure-jna :as jna]
             [clj-libssh2.logging :as logging])
   (:import [java.io File]))
@@ -60,7 +61,8 @@
 (defn fixtures
   []
   (test/use-fixtures :once (test/join-fixtures
-                             [with-sandbox-sshd
+                             [(with-junit-output "test/junit.xml")
+                              with-sandbox-sshd
                               with-really-verbose-logging])))
 
 (defmacro with-temp-file