fixups

rstudio · Sep 9, 2023 · dba0079 · dba0079
1 parent 231afb9
commit dba0079
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/R/zzz.R b/R/zzz.R
@@ -41,8 +41,8 @@ renv_zzz_load <- function() {
   # make sure renv (and packages using renv!!!) use tempdir for storage
   # when running tests, or R CMD check
   if (checking() || testing()) {
-    Sys.setenv(RENV_PATHS_ROOT = tempfile("renv-root-"))
-    Sys.setenv(RENV_PATHS_SANDBOX = tempfile("renv-sandbox-"))
+    Sys.setenv(RENV_PATHS_ROOT = Sys.getenv("RENV_PATHS_ROOT", unset = tempfile("renv-root-")))
+    Sys.setenv(RENV_PATHS_SANDBOX = Sys.getenv("RENV_PATHS_SANDBOX", unset = tempfile("renv-sandbox-")))
     options(renv.sandbox.locking_enabled = FALSE)
   }
 

diff --git a/tests/testthat/test-autoload.R b/tests/testthat/test-autoload.R
@@ -39,11 +39,11 @@ test_that("autoload() works", {
   # launch R and see what library paths we got
   output <- renv_system_exec(
     command = R(),
-    args    = c("-s", "-e", renv_shell_quote("writeLines(.libPaths())")),
+    args    = c("-s", "-e", renv_shell_quote("writeLines(.libPaths()[1])")),
     action  = "testing autoload"
   )
 
-  expected <- .libPaths()
+  expected <- .libPaths()[1]
   expect_equal(tail(output, n = length(expected)), expected)
 
 })
diff --git a/tests/testthat/test-migrate.R b/tests/testthat/test-migrate.R
@@ -10,7 +10,7 @@ skip_if_no_packrat <- function() {
     skip("cannot test with development version of Packrat")
 
   packrat <- renv_available_packages_latest(package = "packrat", type = "source")
-  if (packageVersion("packrat") > packrat$Version)
+  if (packageVersion("packrat") != packrat$Version)
     skip("packrat is not current")
 
   TRUE