Merge 48aa732 into c67018f

r-lib · Jun 16, 2015 · a046d46 · a046d46
2 parents c67018f + 48aa732
commit a046d46
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/R/test-results.r b/R/test-results.r
@@ -31,7 +31,7 @@ sumarize_one_test_results <- function(test) {
   context <- if (length(test$context) > 0) test$context else ''
 
   res <- data.frame(file = test$file, context = context, test = test$test,
-    nb = nb_tests, failed = nb_failed, skipped = nb_skipped, error = error,
+    nb = nb_tests, failed = nb_failed, skipped = as.logical(nb_skipped), error = error,
     user = test$user, system = test$system, real = test$real,
     stringsAsFactors = FALSE)
 

diff --git a/tests/testthat/test-test_dir.r b/tests/testthat/test-test_dir.r
@@ -23,7 +23,8 @@ test_that('test_dir()', {
         "no failure", "helper test"),
       nb = c(2L, 2L, 2L, 0L, 1L, 0L, 0L, 0L, 1L, 1L, 0L, 1L, 1L, 2L, 2L, 1L),
       failed = c(0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 1L, 0L, 0L, 1L, 1L, 0L, 0L),
-      skipped = c(0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L),
+      skipped = c(FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE,
+        FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE),
       error = c(FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, TRUE, TRUE, TRUE,
         TRUE, FALSE, FALSE, FALSE, FALSE, FALSE),
       stringsAsFactors = FALSE)