Use user-specified stop_on_failure if provided. Fixes r-lib#2129

R/test.R

@@ -58,7 +58,9 @@ test <- function(pkg = ".", filter = NULL, ...) {
 
   env <- new.env(parent = ns_env)
 
-  testthat_args <- list(test_path, filter = filter, env = env, stop_on_failure = FALSE, ... = ...)
+  testthat_args <- list(test_path, filter = filter, env = env,  ... = ...)
+  testthat_args$stop_on_failure <- testthat_args$stop_on_failure %||% FALSE
+
   if (packageVersion("testthat") >= "1.0.2.9000") { # 2.0.0
     testthat_args <- c(testthat_args, load_helpers = FALSE)
   } else if (packageVersion("testthat") > "1.0.2") {

tests/testthat/test-test.R

@@ -29,3 +29,17 @@ test_that("TESTTHAT_PKG environment varaible is set", {
   test("testTest", filter = "envvar", reporter = "stop")
   expect_true(TRUE)
 })
+
+test_that("stop_on_failure set to FALSE if not provided", {
+  expect_output(test("testTestWithFailure", filter = "fail"), "Broken")
+})
+
+test_that("stop_on_failure passed on if provided", {
+  expect_output(test("testTestWithFailure", filter = "fail", stop_on_failure = FALSE), "Broken")
+  expect_error(test("testTestWithFailure", filter = "fail", stop_on_failure = TRUE))
+})
+
+test_that("stop_on_warning passed on if provided", {
+  expect_output(test("testTestWithFailure", filter = "warn", stop_on_warning = FALSE), "Beware!")
+  expect_error(test("testTestWithFailure", filter = "warn", stop_on_warning = TRUE))
+})

tests/testthat/testTestWithFailure/DESCRIPTION

@@ -0,0 +1,10 @@
+Package: testTestWithFailure
+Title: Tools to Make Developing R Code Easier
+License: GPL-2
+Description: Package description.
+Author: Hadley <[email protected]>
+Maintainer: Hadley <[email protected]>
+Version: 0.1
+Suggests:
+    testthat
+RoxygenNote: 5.0.1

tests/testthat/testTestWithFailure/NAMESPACE

@@ -0,0 +1,2 @@
+# Generated by roxygen2: do not edit by hand
+

tests/testthat/testTestWithFailure/R/dummy.R

@@ -0,0 +1 @@
+

tests/testthat/testTestWithFailure/tests/testthat.R

@@ -0,0 +1,4 @@
+library(testthat)
+library(testTest)
+
+test_check("testTest")

tests/testthat/testTestWithFailure/tests/testthat/test-fail.R

@@ -0,0 +1,5 @@
+context("failure")
+
+test_that("failing test", {
+  fail("Broken")
+})

tests/testthat/testTestWithFailure/tests/testthat/test-warn.R

@@ -0,0 +1,5 @@
+context("warning")
+
+test_that("warning from test", {
+  warning("Beware!")
+})