Merge pull request datashield#681 from StuartWheater/v6.3.6-dev-fix/ci-test-setup

Generalized/rework ping test config

Author: StuartWheater

tests/testthat/connection_to_datasets/init_local_settings.R

@@ -24,9 +24,9 @@ init.server.url <- function()
 
 init.local.settings <- function()
 {
-  path            <- getwd()
-  sub.folder.name <- "/connection_to_datasets/"
-  file.name       <- "local_settings.csv"
+   path            <- getwd()
+   sub.folder.name <- "/connection_to_datasets/"
+   file.name       <- "local_settings.csv"
 
-  return(paste(path, sub.folder.name, file.name, sep=""))
+   return(paste(path, sub.folder.name, file.name, sep=""))
 }

tests/testthat/connection_to_datasets/login_details.R

@@ -28,8 +28,10 @@ if ((ds.test_env$driver == "DSLiteDriver") || (ds.test_env$driver == "OpalDriver
         opal.url <- "https://localhost:8443/"
     }
 
-    ds.test_env$ping_url     <- opal.url
-    ds.test_env$ping_config  <- config(timeout=5)
+    ds.test_env$ping_url      <- opal.url
+    ds.test_env$ping_user     <- getOption("opal.user", "administrator")
+    ds.test_env$ping_password <- getOption("opal.password", "datashield_test&")
+    ds.test_env$ping_options  <- config(timeout=5, ssl_verifyhost=0, ssl_verifypeer=0)
 
     ds.test_env$server_url_1 <- opal.url
     ds.test_env$server_url_2 <- opal.url
@@ -55,8 +57,10 @@ if ((ds.test_env$driver == "DSLiteDriver") || (ds.test_env$driver == "OpalDriver
         armadillo.url <- "http://localhost:8080/"
     }
 
-    ds.test_env$ping_url     <- armadillo.url
-    ds.test_env$ping_config  <- config(timeout=5)
+    ds.test_env$ping_url      <- armadillo_ping.url
+    ds.test_env$ping_user     <- getOption("armadillo.user", "admin")
+    ds.test_env$ping_password <- getOption("armadillo.password", "admin")
+    ds.test_env$ping_options  <- "list(timeout=5)"
 
     ds.test_env$server_url_1 <- armadillo.url
     ds.test_env$server_url_2 <- armadillo.url

tests/testthat/test-_-vm-test.R

@@ -26,7 +26,7 @@ init.testing.datasets()
 
 test_that("The virtual machine is loaded. ",
 {
-    response <- httr::HEAD(url=ds.test_env$ping_url, config=ds.test_env$ping_config)
+    response <- httr::HEAD(url=ds.test_env$ping_url, config=ds.test_env$ping_options, authenticate(ds.test_env$ping_user, ds.test_env$ping_password))
     expect_true(http_status(response)$reason %in% c("OK", "Unauthorized"))
 })