Fix tests for compiled code on R-devel. Closes rstudio#1404

Author: wch

R/conditions.R

@@ -76,7 +76,7 @@ getCallNames <- function(calls) {
 }
 
 getLocs <- function(calls) {
-  sapply(calls, function(call) {
+  vapply(calls, function(call) {
     srcref <- attr(call, "srcref", exact = TRUE)
     if (!is.null(srcref)) {
       srcfile <- attr(srcref, "srcfile", exact = TRUE)
@@ -86,7 +86,7 @@ getLocs <- function(calls) {
       }
     }
     return("")
-  })
+  }, character(1))
 }
 
 #' @details \code{captureStackTraces} runs the given \code{expr} and if any

tests/testthat/test-stacks.R

@@ -13,7 +13,15 @@ causeError <- function(full) {
     B()
   })
 
-  res <- try(captureStackTraces(isolate(renderTable({C()}, server = FALSE)())),
+  res <- try({
+      captureStackTraces({
+        isolate({
+          renderTable({
+            C()
+          }, server = FALSE)()
+        })
+      })
+    },
     silent = TRUE)
   cond <- attr(res, "condition", exact = TRUE)
 
@@ -50,7 +58,7 @@ test_that("integration tests", {
     "isolate", "withCallingHandlers", "captureStackTraces", "doTryCatch",
     "tryCatchOne", "tryCatchList", "tryCatch", "try"))
   expect_equal(nzchar(df$loc), c(TRUE, TRUE, TRUE, FALSE, TRUE,
-    FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE,
+    FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, TRUE, FALSE, FALSE,
     FALSE, FALSE))
 
   df <- causeError(full = TRUE)
@@ -72,8 +80,8 @@ test_that("integration tests", {
     "tryCatch", "try"))
   expect_equal(nzchar(df$loc), c(FALSE, FALSE, FALSE, TRUE,
     TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE,
-    FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE,
-    FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE,
+    FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, TRUE,
+    FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, TRUE,
     FALSE, FALSE, FALSE, FALSE))
 })