Polishing

Author: hadley

R/reporter-progress.R

@@ -233,9 +233,8 @@ ProgressReporter <- R6::R6Class(
 
       # Separate from the progress bar
       self$cat_line()
-      self$cat_line()
       stop_reporter(c(
-        "Maximum number of failures exceeded; quitting at end of file.",
+        "Maximum number of failures exceeded; quitting.",
         i = "Increase this number with (e.g.) {.run testthat::set_max_fails(Inf)}"
       ))
     },
@@ -481,7 +480,9 @@ ParallelProgressReporter <- R6::R6Class(
           self$update(force = TRUE)
         }
       } else {
+        self$update(force = TRUE)
         self$cat_line()
+        self$rule()
 
         issues <- unlist(
           map(self$files, \(x) x$issues$as_list()),
@@ -490,6 +491,7 @@ ParallelProgressReporter <- R6::R6Class(
         summary <- map_chr(issues, issue_summary)
         self$cat_tight(paste(summary, collapse = "\n\n"))
 
+        self$cat_line()
         self$report_full()
       }
     },

tests/testthat/_snaps/reporter-progress.md

@@ -131,7 +131,8 @@
     `actual`:   FALSE
     `expected`: TRUE 
     --------------------------------------------------------------------------------
-    Maximum number of failures exceeded; quitting at end of file.
+    
+    Maximum number of failures exceeded; quitting.
     i Increase this number with (e.g.) `testthat::set_max_fails(Inf)` 
 
 # can fully suppress incremental updates
@@ -564,7 +565,7 @@
     v | F W  S  OK | Context
 
     - [ FAIL 0 | WARN 0 | SKIP 0 | PASS 0 ] Starting up...                          
-    x | 11        0 | reporters/fail-many                                           
+    \ [ FAIL 11 | WARN 0 | SKIP 0 | PASS 0 ] @ reporters/fail-many                  
     --------------------------------------------------------------------------------
     Failure ('reporters/fail-many.R:3:5'): Example
     FALSE (`actual`) is not equal to TRUE (`expected`).
@@ -631,8 +632,8 @@
 
     `actual`:   FALSE
     `expected`: TRUE 
-    --------------------------------------------------------------------------------
-    Maximum number of failures exceeded; quitting at end of file.
+    
+    Maximum number of failures exceeded; quitting.
     i Increase this number with (e.g.) `testthat::set_max_fails(Inf)` 
 
                                                                                     

tests/testthat/test-capture-output.R

@@ -1,9 +1,3 @@
-test_that("fails", {
-  for (i in 1:5) {
-    test_that(paste0(i), fail())
-  }
-})
-
 test_that("multiplication works", {
   utf8 <- "M\u00e4chler"
   latin1 <- "M\xe4chler"

tests/testthat/test-watcher.R

@@ -1,8 +1,3 @@
-test_that("fails", {
-  for (i in 1:5) {
-    test_that(paste0(i), fail())
-  }
-})
 test_that("compare state works correctly", {
   loc <- withr::local_tempfile(pattern = "watcher")
   dir.create(loc)