only stop if condition not handled and test didn't pass

r-lib · krlmlr · Feb 19, 2016 · Feb 5, 2016 · Feb 5, 2016 · Feb 5, 2016
commit 77d51dce52f95e19502eb414593ca83e09dc5bc6
diff --git a/R/expect-that.r b/R/expect-that.r
@@ -45,7 +45,12 @@ report_results <- function(results) {
                     class = c("test_result", "condition"))
 
   withRestarts(
-    if (results$passed) signalCondition(cond) else stop(cond),
+    {
+      signalCondition(cond)
+      if (!results$passed) {
+        stop(format(results), call. = FALSE)
+      }
+    },
     continue_test = function(e) NULL
   )