From 429183f65bf3cee02b5911edd7500b5471ae8410 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Thu, 21 May 2026 16:19:53 +0100 Subject: [PATCH 1/4] Fixed server image user --- tests/docker/armadillo/standard/config/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/armadillo/standard/config/application.yml b/tests/docker/armadillo/standard/config/application.yml index 54e90c36..be4ed07d 100644 --- a/tests/docker/armadillo/standard/config/application.yml +++ b/tests/docker/armadillo/standard/config/application.yml @@ -14,7 +14,7 @@ armadillo: # oidc-admin-user: user@yourdomain.org profiles: - name: default - image: datashield/rock-quebrada-lamda-permissive:latest + image: datashield/rock_citest-permissive:latest port: 8085 host: default package-whitelist: # Packages for 'permissive' From a51cbec7cf368335b2d8ab458b335dabb7215070 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Thu, 21 May 2026 16:20:54 +0100 Subject: [PATCH 2/4] Fixed network config for Opal --- .../connection_to_datasets/login_details.R | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/testthat/connection_to_datasets/login_details.R b/tests/testthat/connection_to_datasets/login_details.R index 81395474..2ce4ca2d 100644 --- a/tests/testthat/connection_to_datasets/login_details.R +++ b/tests/testthat/connection_to_datasets/login_details.R @@ -22,12 +22,12 @@ if (! is.null(getOption("default_driver"))) { } if ((ds.test_env$driver == "DSLiteDriver") || (ds.test_env$driver == "OpalDriver")) { - ds.test_env$ping_address <- paste("http://", ds.test_env$server_ip_address, ":8080", sep="") - ds.test_env$ping_config <- config(timeout=5) + ds.test_env$ping_address <- paste("https://", ds.test_env$server_ip_address, ":8443", sep="") + ds.test_env$ping_config <- config(timeout=5, ssl_verifyhost=0, ssl_verifypeer=0) - ds.test_env$ip_address_1 <- paste("http://", ds.test_env$server_ip_address, ":8080", sep="") - ds.test_env$ip_address_2 <- paste("http://", ds.test_env$server_ip_address, ":8080", sep="") - ds.test_env$ip_address_3 <- paste("http://", ds.test_env$server_ip_address, ":8080", sep="") + ds.test_env$ip_address_1 <- paste("https://", ds.test_env$server_ip_address, ":8443", sep="") + ds.test_env$ip_address_2 <- paste("https://", ds.test_env$server_ip_address, ":8443", sep="") + ds.test_env$ip_address_3 <- paste("https://", ds.test_env$server_ip_address, ":8443", sep="") ds.test_env$user_1 <- getOption("opal.user", "administrator") ds.test_env$user_2 <- getOption("opal.user", "administrator") @@ -37,9 +37,9 @@ if ((ds.test_env$driver == "DSLiteDriver") || (ds.test_env$driver == "OpalDriver ds.test_env$password_2 <- getOption("opal.password", "datashield_test&") ds.test_env$password_3 <- getOption("opal.password", "datashield_test&") - ds.test_env$options_1 <- "list()" - ds.test_env$options_2 <- "list()" - ds.test_env$options_3 <- "list()" + ds.test_env$options_1 <- "list(ssl_verifyhost=0, ssl_verifypeer=0)" + ds.test_env$options_2 <- "list(ssl_verifyhost=0, ssl_verifypeer=0)" + ds.test_env$options_3 <- "list(ssl_verifyhost=0, ssl_verifypeer=0)" ds.test_env$secure_login_details <- TRUE } else if (ds.test_env$driver == "ArmadilloDriver") { From 0840616ad64d40530cd587f8881a78bb95e9eb97 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Fri, 22 May 2026 14:36:45 +0100 Subject: [PATCH 3/4] Rework 'useFancyQuotes' option during tests --- tests/testthat.R | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/testthat.R b/tests/testthat.R index 389ee66c..b262d97d 100644 --- a/tests/testthat.R +++ b/tests/testthat.R @@ -9,5 +9,8 @@ library(testthat) library(dsBaseClient) -if (identical(Sys.getenv("NOT_CRAN"), "true")) +if (identical(Sys.getenv("NOT_CRAN"), "true")) { + ufq_opt <- base::options(useFancyQuotes = FALSE) test_check("dsBaseClient") + base::options(useFancyQuotes = ufq_opt) +} From 1c2bebf69cf16c323484cdc81d1da047666894d2 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Fri, 22 May 2026 15:03:03 +0100 Subject: [PATCH 4/4] Fixed use of 'useFancyQuotes' option --- tests/testthat/setup.R | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/testthat/setup.R b/tests/testthat/setup.R index 5980e9df..02275ef1 100644 --- a/tests/testthat/setup.R +++ b/tests/testthat/setup.R @@ -33,6 +33,7 @@ source("connection_to_datasets/init_testing_datasets.R") source("connection_to_datasets/init_studies_datasets.R") source("connection_to_datasets/init_discordant_datasets.R") source("connection_to_datasets/init_mediation_datasets.R") -options(datashield.errors.print = FALSE) +base::options(datashield.errors.print = FALSE) +base::options(useFancyQuotes = FALSE) # context("setup - done")