Skip to content

Commit

Permalink
Merge branch 'junit-xml-test-results'
Browse files Browse the repository at this point in the history
  • Loading branch information
conormcd committed Feb 15, 2016
2 parents 3ae9101 + b28297f commit fc0203a
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ pom.xml.asc
.hg/
doc/api
test/debug.log
test/junit.xml
7 changes: 7 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: /.*/
Expand Down
3 changes: 2 additions & 1 deletion project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
3 changes: 2 additions & 1 deletion test/clj_libssh2/test_ssh.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 3 additions & 1 deletion test/clj_libssh2/test_utils.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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]))
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit fc0203a

Please sign in to comment.