Work around failing tests on R 3.6.x Windows

r-lib · Mar 17, 2024 · 1699daa · 1699daa
1 parent b687aa2
commit 1699daa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/tests/testthat/test-install-cran.R b/tests/testthat/test-install-cran.R
@@ -13,7 +13,11 @@ test_that("", {
   on.exit(unlink(lib, recursive = TRUE), add = TRUE)
   dir.create(lib)
 
-  install_cran("pkgconfig", lib = lib, repos = repos, force = TRUE, quiet = TRUE)
+  # we'll get warnings when CRAN moves binary packages to the
+  # cran-archive server.
+  suppressWarnings(
+    install_cran("pkgconfig", lib = lib, repos = repos, force = TRUE, quiet = TRUE)
+  )
 
   expect_silent(packageDescription("pkgconfig", lib.loc = lib))
 })
diff --git a/tests/testthat/test-install-svn.R b/tests/testthat/test-install-svn.R
@@ -25,6 +25,7 @@ test_that("install_svn subdir", {
 test_that("remote_download.svn_remote error", {
 
   skip_on_cran()
+  if (Sys.which("svn") == "") skip("Subversion not installed")
 
   x <- list(url = "http://foo.bar.com")
 

diff --git a/tests/testthat/test-script.R b/tests/testthat/test-script.R
@@ -54,7 +54,7 @@ test_that("install-github.R script does not load any package", {
     },
     args = list(script = script, lib = lib),
     cmdargs = c("--vanilla", "--slave", "--no-save", "--no-restore"),
-    timeout = 20
+    timeout = 60
   )
 
   expect_equal(pkgs[[1]], pkgs[[2]])