Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ General advice:

- `devtools::test()` - Run all tests
- `devtools::test_file("tests/testthat/test-filename.R")` - Run tests in a specific file
- DO NOT USE `devtools::test_active_file()`
- `devtools::load_all()` - Load package for development
- `devtools::document()` - Generate documentation
- `devtools::check()` - Run R CMD check
Expand Down
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# testthat (development version)

* `ParallelProgressReporter` now respect `max_failures` (#1162).
* The last snapshot is no longer lost if the snapshot file is missing the final newline (#2092). It's easy to accidentally remove this because there are two trailing new lines in snapshot files and many editors will automatically remove if you touch the file.
* New `expect_r6_class()` (#2030).
* `expect_*()` functions consistently and rigorously check their inputs (#1754).
Expand Down
32 changes: 23 additions & 9 deletions R/reporter-progress.R
Original file line number Diff line number Diff line change
Expand Up @@ -221,16 +221,20 @@ ProgressReporter <- R6::R6Class(
self$report_issues(self$ctxt_issues)

if (self$is_full()) {
snapshotter <- get_snapshotter()
if (!is.null(snapshotter)) {
snapshotter$end_file()
}
self$report_full()
}
},

stop_reporter(c(
"Maximum number of failures exceeded; quitting at end of file.",
i = "Increase this number with (e.g.) {.run testthat::set_max_fails(Inf)}"
))
report_full = function() {
snapshotter <- get_snapshotter()
if (!is.null(snapshotter)) {
snapshotter$end_file()
}

stop_reporter(c(
"Maximum number of failures exceeded; quitting at end of file.",
i = "Increase this number with (e.g.) {.run testthat::set_max_fails(Inf)}"
))
},

add_result = function(context, test, result) {
Expand Down Expand Up @@ -258,6 +262,10 @@ ProgressReporter <- R6::R6Class(
},

end_reporter = function() {
if (self$is_full()) {
return()
}

self$cat_line()

colour_if <- function(n, type) {
Expand Down Expand Up @@ -465,7 +473,13 @@ ParallelProgressReporter <- R6::R6Class(
self$report_issues(fsts$issues)

self$files[[self$file_name]] <- NULL
if (length(self$files)) self$update(force = TRUE)
if (length(self$files)) {
self$update(force = TRUE)
}

if (self$is_full()) {
self$report_full()
}
},

end_reporter = function() {
Expand Down
151 changes: 78 additions & 73 deletions tests/testthat/_snaps/reporter-progress.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,79 +133,6 @@
--------------------------------------------------------------------------------
Maximum number of failures exceeded; quitting at end of file.
i Increase this number with (e.g.) `testthat::set_max_fails(Inf)`

== Results =====================================================================
-- Failed tests ----------------------------------------------------------------
Failure ('reporters/fail-many.R:3:5'): Example
FALSE (`actual`) is not equal to TRUE (`expected`).

`actual`: FALSE
`expected`: TRUE

Failure ('reporters/fail-many.R:3:5'): Example
FALSE (`actual`) is not equal to TRUE (`expected`).

`actual`: FALSE
`expected`: TRUE

Failure ('reporters/fail-many.R:3:5'): Example
FALSE (`actual`) is not equal to TRUE (`expected`).

`actual`: FALSE
`expected`: TRUE

Failure ('reporters/fail-many.R:3:5'): Example
FALSE (`actual`) is not equal to TRUE (`expected`).

`actual`: FALSE
`expected`: TRUE

Failure ('reporters/fail-many.R:3:5'): Example
FALSE (`actual`) is not equal to TRUE (`expected`).

`actual`: FALSE
`expected`: TRUE

Failure ('reporters/fail-many.R:3:5'): Example
FALSE (`actual`) is not equal to TRUE (`expected`).

`actual`: FALSE
`expected`: TRUE

Failure ('reporters/fail-many.R:3:5'): Example
FALSE (`actual`) is not equal to TRUE (`expected`).

`actual`: FALSE
`expected`: TRUE

Failure ('reporters/fail-many.R:3:5'): Example
FALSE (`actual`) is not equal to TRUE (`expected`).

`actual`: FALSE
`expected`: TRUE

Failure ('reporters/fail-many.R:3:5'): Example
FALSE (`actual`) is not equal to TRUE (`expected`).

`actual`: FALSE
`expected`: TRUE

Failure ('reporters/fail-many.R:3:5'): Example
FALSE (`actual`) is not equal to TRUE (`expected`).

`actual`: FALSE
`expected`: TRUE

Failure ('reporters/fail-many.R:3:5'): Example
FALSE (`actual`) is not equal to TRUE (`expected`).

`actual`: FALSE
`expected`: TRUE

[ FAIL 11 | WARN 0 | SKIP 0 | PASS 0 ]
== Terminated early ============================================================

No one gets it right on their first try

# can fully suppress incremental updates

Expand Down Expand Up @@ -632,3 +559,81 @@
[ FAIL 0 | WARN 0 | SKIP 0 | PASS 6 ]
[ FAIL 0 | WARN 0 | SKIP 0 | PASS 7 ]

# ParallelProgressReporter fails after max_fail tests

v | F W S OK | Context

- [ FAIL 0 | WARN 0 | SKIP 0 | PASS 0 ] Starting up...
x | 11 0 | reporters/fail-many
--------------------------------------------------------------------------------
Failure ('reporters/fail-many.R:3:5'): Example
FALSE (`actual`) is not equal to TRUE (`expected`).

`actual`: FALSE
`expected`: TRUE

Failure ('reporters/fail-many.R:3:5'): Example
FALSE (`actual`) is not equal to TRUE (`expected`).

`actual`: FALSE
`expected`: TRUE

Failure ('reporters/fail-many.R:3:5'): Example
FALSE (`actual`) is not equal to TRUE (`expected`).

`actual`: FALSE
`expected`: TRUE

Failure ('reporters/fail-many.R:3:5'): Example
FALSE (`actual`) is not equal to TRUE (`expected`).

`actual`: FALSE
`expected`: TRUE

Failure ('reporters/fail-many.R:3:5'): Example
FALSE (`actual`) is not equal to TRUE (`expected`).

`actual`: FALSE
`expected`: TRUE

Failure ('reporters/fail-many.R:3:5'): Example
FALSE (`actual`) is not equal to TRUE (`expected`).

`actual`: FALSE
`expected`: TRUE

Failure ('reporters/fail-many.R:3:5'): Example
FALSE (`actual`) is not equal to TRUE (`expected`).

`actual`: FALSE
`expected`: TRUE

Failure ('reporters/fail-many.R:3:5'): Example
FALSE (`actual`) is not equal to TRUE (`expected`).

`actual`: FALSE
`expected`: TRUE

Failure ('reporters/fail-many.R:3:5'): Example
FALSE (`actual`) is not equal to TRUE (`expected`).

`actual`: FALSE
`expected`: TRUE

Failure ('reporters/fail-many.R:3:5'): Example
FALSE (`actual`) is not equal to TRUE (`expected`).

`actual`: FALSE
`expected`: TRUE

Failure ('reporters/fail-many.R:3:5'): Example
FALSE (`actual`) is not equal to TRUE (`expected`).

`actual`: FALSE
`expected`: TRUE
--------------------------------------------------------------------------------
Maximum number of failures exceeded; quitting at end of file.
i Increase this number with (e.g.) `testthat::set_max_fails(Inf)`



10 changes: 10 additions & 0 deletions tests/testthat/test-reporter-progress.R
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,13 @@ test_that("display of successes only is compact", {
test_path("reporters/successes.R")
)
})

# parallel progress reporter ----------------------------------------------

test_that("ParallelProgressReporter fails after max_fail tests", {
withr::local_options(testthat.progress.max_fails = 10)
expect_snapshot_reporter(
ParallelProgressReporter$new(update_interval = 0, min_time = Inf),
test_path(c("reporters/fail-many.R", "reporters/fail.R"))
)
})
Loading