WIP auto-skip if package not installed

Author: hadley

R/test-that.R

@@ -124,19 +124,11 @@ test_code <- function(test, code, env, reporter, skip_on_empty = TRUE) {
     # to be able to debug with the DebugReporter
     register_expectation(e, 2)
 
-    e[["handled"]] <- TRUE
     test_error <<- e
+    invokeRestart("end_test")
   }
   handle_fatal <- function(e) {
     handled <<- TRUE
-    # Error caught in handle_error() has precedence
-    if (!is.null(test_error)) {
-      e <- test_error
-      if (isTRUE(e[["handled"]])) {
-        return()
-      }
-    }
-
     register_expectation(e, 0)
   }
   handle_expectation <- function(e) {
@@ -175,7 +167,7 @@ test_code <- function(test, code, env, reporter, skip_on_empty = TRUE) {
 
     debug_end <- if (inherits(e, "skip_empty")) -1 else 2
     register_expectation(e, debug_end)
-    signalCondition(e)
+    invokeRestart("end_test")
   }
 
   test_env <- new.env(parent = env)
@@ -185,24 +177,30 @@ test_code <- function(test, code, env, reporter, skip_on_empty = TRUE) {
   withr::local_options(testthat_topenv = test_env)
 
   before <- inspect_state()
-  tryCatch(
-    withCallingHandlers(
-      {
-        eval(code, test_env)
-        if (!handled && !is.null(test)) {
-          skip_empty()
-        }
-      },
-      expectation = handle_expectation,
-      skip = handle_skip,
-      warning = handle_warning,
-      message = handle_message,
-      error = handle_error
+  withRestarts(
+    tryCatch(
+      withCallingHandlers(
+        {
+          eval(code, test_env)
+          if (!handled && !is.null(test)) {
+            skip_empty()
+          }
+        },
+        expectation = handle_expectation,
+        packageNotFoundError = function(e) {
+          if (on_cran()) {
+            skip(paste0(e$package, " is not installed."))
+          }
+        },
+        skip = handle_skip,
+        warning = handle_warning,
+        message = handle_message,
+        error = handle_error
+      ),
+      # some errors may need handling here, e.g., stack overflow
+      error = handle_fatal
     ),
-    # some errors may need handling here, e.g., stack overflow
-    error = handle_fatal,
-    # skip silently terminate code
-    skip = function(e) {}
+    end_test = function() {}
   )
   after <- inspect_state()
 

tests/testthat/test-snapshot-reporter.R

@@ -139,7 +139,6 @@ test_that("errors in test doesn't change snapshot", {
 
 test_that("skips and unexpected errors reset snapshots", {
   regenerate <- FALSE
-
   if (regenerate) {
     withr::local_envvar(c(TESTTHAT_REGENERATE_SNAPS = "true"))
   }
@@ -156,7 +155,7 @@ test_that("skips and unexpected errors reset snapshots", {
 
   snaps <- snap_from_md(brio::read_lines(path))
   titles <- c("errors reset snapshots", "skips reset snapshots")
-  expect_true(all(titles %in% names(snaps)))
+  expect_in(titles, names(snaps))
 })
 
 test_that("`expect_error()` can fail inside `expect_snapshot()`", {

tests/testthat/test-snapshot/_snaps/snapshot.md

@@ -5,10 +5,3 @@
     Output
       [1] 1
 
-# skips reset snapshots
-
-    Code
-      print(1)
-    Output
-      [1] 1
-

tests/testthat/test-test-that.R

@@ -147,3 +147,19 @@ test_that("no braces required in testthat 2e", {
     NA
   )
 })
+
+test_that("missing packages cause a skip on CRAN", {
+  local_on_cran(TRUE)
+  # skip generated test_that, so need to wrap
+  expect_skip(test_that("", {
+    library(notinstalled)
+  }))
+
+  local_on_cran(FALSE)
+  expect_error(
+    test_that("", {
+      library(notinstalled)
+    }),
+    class = "packageNotFoundError"
+  )
+})