Permalink
Browse files

Merge branch 'dev'

  • Loading branch information...
2 parents 6f43bfd + 4c48d9d commit e2f72f80843fe7df6be0a6d4e1159b8ba9e9e2c7 @avodonosov avodonosov committed Oct 8, 2012
Showing with 11 additions and 3 deletions.
  1. +1 −1 reporting/html-printers.lisp
  2. +10 −2 reporting/list-results.lisp
@@ -91,7 +91,7 @@ to include in to the text of the link, defaults to STATUS"
((:test-case :load) (third (result-spec result))))))
(ecase status
(:ok "ok-status")
- (:unexpected-ok "warn-status")
+ ((:known-fail :unexpected-ok) "warn-status")
(:fail "fail-status")
(:crash "crash-status")
(:timeout "timeout-status")
@@ -16,14 +16,22 @@
(suite-results (etypecase suite-status
(keyword (list (list :whole-test-suite suite-status)))
(list (let* ((failures (getf suite-status :failed-tests))
- (unexpected-oks (set-difference (getf suite-status :known-to-fail)
+ (expected-to-fail (getf suite-status :known-to-fail))
+ (known-failures (intersection expected-to-fail
+ failures
+ :test #'string=))
+ (just-failures (set-difference failures
+ known-failures
+ :test #'string=))
+ (unexpected-oks (set-difference expected-to-fail
failures
:test #'string=)))
(flet ((as-results (testcases status)
(mapcar (lambda (testcase)
(list :test-case testcase status))
testcases)))
- (nconc (as-results failures :fail)
+ (nconc (as-results just-failures :fail)
+ (as-results known-failures :known-fail)
(as-results unexpected-oks :unexpected-ok))))))))
(mapcar (lambda (suite-result)
(make-instance 'result :lib-result lib-result :result-spec suite-result))

0 comments on commit e2f72f8

Please sign in to comment.