Merge pull request #546 from StuartWheater/v6.3.1-RC4-dev

Align with StuartWheater/dsBaseClient
datashield · Oct 14, 2024 · 1f5edc0 · 1f5edc0
2 parents 17e6a9d + e472e5a
commit 1f5edc0
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 41 deletions.
diff --git a/armadillo_azure-pipelines.yml b/armadillo_azure-pipelines.yml
@@ -289,6 +289,7 @@ jobs:
                 junit_rep <- JunitReporter$new(file = "test_results_dsbase.xml");
                 progress_rep <- ProgressReporter$new(max_failures = 999999);
                 multi_rep <- MultiReporter$new(reporters = list(progress_rep, junit_rep));
+                options("datashield.return_errors" = FALSE);
                 options("default_driver" = "ArmadilloDriver");
                 testthat::test_package("$(projectName)", filter = "_-|datachk-|smk-|arg-|disc-|perf-|smk_expt-|expt-|math-", reporter = multi_rep, stop_on_failure = FALSE)
                 '"'"'
@@ -410,6 +411,7 @@ jobs:
                 junit_rep <- JunitReporter$new(file = "test_results_dsdanger.xml");
                 progress_rep <- ProgressReporter$new(max_failures = 999999);
                 multi_rep <- MultiReporter$new(reporters = list(progress_rep, junit_rep));
+                options("datashield.return_errors" = FALSE);
                 options("default_driver" = "ArmadilloDriver");
                 testthat::test_package("$(projectName)", filter = "__dgr-|datachk_dgr-|smk_dgr-|arg_dgr-|disc_dgr-|smk_expt_dgr-|expt_dgr-|math_dgr-", reporter = multi_rep, stop_on_failure = FALSE)
                 '"'"'

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -288,6 +288,7 @@ jobs:
                 junit_rep <- JunitReporter$new(file = "test_results_dsbase.xml");
                 progress_rep <- ProgressReporter$new(max_failures = 999999);
                 multi_rep <- MultiReporter$new(reporters = list(progress_rep, junit_rep));
+                options("datashield.return_errors" = FALSE);
                 options("default_driver" = "OpalDriver");
                 testthat::test_package("$(projectName)", filter = "_-|datachk-|smk-|arg-|disc-|perf-|smk_expt-|expt-|math-", reporter = multi_rep, stop_on_failure = FALSE)
                 '"'"'
@@ -401,6 +402,7 @@ jobs:
                 junit_rep <- JunitReporter$new(file = "test_results_dsdanger.xml");
                 progress_rep <- ProgressReporter$new(max_failures = 999999);
                 multi_rep <- MultiReporter$new(reporters = list(progress_rep, junit_rep));
+                options("datashield.return_errors" = FALSE);
                 options("default_driver" = "OpalDriver");
                 testthat::test_package("$(projectName)", filter = "__dgr-|datachk_dgr-|smk_dgr-|arg_dgr-|disc_dgr-|smk_expt_dgr-|expt_dgr-|math_dgr-", reporter = multi_rep, stop_on_failure = FALSE)
                 '"'"'

diff --git a/docker-compose_armadillo.yml b/docker-compose_armadillo.yml
@@ -3,7 +3,7 @@ services:
         hostname: armadillo
         ports:
             - 8080:8080
-        image: datashield/armadillo_citest:4.8.1
+        image: datashield/armadillo_citest:4.10.0
         environment:
             LOGGING_CONFIG: 'classpath:logback-file.xml'
             AUDIT_LOG_PATH: '/app/logs/audit.log'
@@ -16,6 +16,6 @@ services:
 
     default:
         hostname: default
-        image: datashield/rock-junction-devel-permissive:latest
+        image: datashield/rock-knot-devel-permissive:latest
         environment:
             DEBUG: "FALSE"
diff --git a/opal_azure-pipelines.yml b/opal_azure-pipelines.yml
@@ -287,6 +287,7 @@ jobs:
                 junit_rep <- JunitReporter$new(file = "test_results_dsbase.xml");
                 progress_rep <- ProgressReporter$new(max_failures = 999999);
                 multi_rep <- MultiReporter$new(reporters = list(progress_rep, junit_rep));
+                options("datashield.return_errors" = FALSE);
                 options("default_driver" = "OpalDriver");
                 testthat::test_package("$(projectName)", filter = "_-|datachk-|smk-|arg-|disc-|perf-|smk_expt-|expt-|math-", reporter = multi_rep, stop_on_failure = FALSE)
                 '"'"'
@@ -402,6 +403,7 @@ jobs:
                 junit_rep <- JunitReporter$new(file = "test_results_dsdanger.xml");
                 progress_rep <- ProgressReporter$new(max_failures = 999999);
                 multi_rep <- MultiReporter$new(reporters = list(progress_rep, junit_rep));
+                options("datashield.return_errors" = FALSE);
                 options("default_driver" = "OpalDriver");
                 testthat::test_package("$(projectName)", filter = "__dgr-|datachk_dgr-|smk_dgr-|arg_dgr-|disc_dgr-|smk_expt_dgr-|expt_dgr-|math_dgr-", reporter = multi_rep, stop_on_failure = FALSE)
                 '"'"'

diff --git a/tests/testthat/perf_files/armadillo_azure-pipeline.csv b/tests/testthat/perf_files/armadillo_azure-pipeline.csv
@@ -1,14 +1,14 @@
 "refer_name","rate","lower_tolerance","upper_tolerance"
-"conndisconn::perf::simple0","0.06223","0.5","2"
-"ds.abs::perf::0","0.8101","0.5","2"
-"ds.asInteger::perf:0","0.8950","0.5","2"
-"ds.asList::perf:0","1.754","0.5","2"
-"ds.asNumeric::perf:0","0.8654","0.5","2"
-"ds.assign::perf::0","1.683","0.5","2"
-"ds.class::perf::combine:0","1.755","0.5","2"
-"ds.colnames::perf:0","1.099","0.5","2"
-"ds.exists::perf::combine:0","3.627","0.5","2"
-"ds.length::perf::combine:0","3.556","0.5","2"
-"ds.mean::perf::combine:0","3.548","0.5","2"
-"ds.mean::perf::split:0","3.508","0.5","2"
-"void::perf::void::0","24560.0","0.5","2"
+"conndisconn::perf::simple0","0.1050","0.5","2"
+"ds.abs::perf::0","3.896","0.5","2"
+"ds.asInteger::perf:0","3.550","0.5","2"
+"ds.asList::perf:0","8.040","0.5","2"
+"ds.asNumeric::perf:0","3.577","0.5","2"
+"ds.assign::perf::0","6.739","0.5","2"
+"ds.class::perf::combine:0","8.171","0.5","2"
+"ds.colnames::perf:0","6.292","0.5","2"
+"ds.exists::perf::combine:0","16.33","0.5","2"
+"ds.length::perf::combine:0","16.08","0.5","2"
+"ds.mean::perf::combine:0","16.08","0.5","2"
+"ds.mean::perf::split:0","15.83","0.5","2"
+"void::perf::void::0","36510.0","0.5","2"
diff --git a/tests/testthat/perf_files/armadillo_hp-laptop_quay.csv b/tests/testthat/perf_files/armadillo_hp-laptop_quay.csv
@@ -1,14 +1,14 @@
 "refer_name","rate","lower_tolerance","upper_tolerance"
-"conndisconn::perf::simple0","0.05471","0.5","2"
-"ds.abs::perf::0","0.5769","0.5","2"
-"ds.asInteger::perf:0","0.6371","0.5","2"
-"ds.asList::perf:0","1.296","0.5","2"
-"ds.asNumeric::perf:0","0.6456","0.5","2"
-"ds.assign::perf::0","1.349","0.5","2"
-"ds.class::perf::combine:0","1.490","0.5","2"
-"ds.colnames::perf:0","0.9683","0.5","2"
-"ds.exists::perf::combine:0","2.999","0.5","2"
-"ds.length::perf::combine:0","2.963","0.5","2"
-"ds.mean::perf::combine:0","2.976","0.5","2"
-"ds.mean::perf::split:0","2.758","0.5","2"
-"void::perf::void::0","23050","0.5","2"
+"conndisconn::perf::simple0","0.0728825086646545","0.5","2"
+"ds.abs::perf::0","1.82780826738886","0.5","2"
+"ds.asInteger::perf:0","1.82494215205532","0.5","2"
+"ds.asList::perf:0","4.63744814345485","0.5","2"
+"ds.asNumeric::perf:0","2.17634899364127","0.5","2"
+"ds.assign::perf::0","4.03888444894903","0.5","2"
+"ds.class::perf::combine:0","4.99978056980171","0.5","2"
+"ds.colnames::perf:0","3.24967546869707","0.5","2"
+"ds.exists::perf::combine:0","9.59415959170337","0.5","2"
+"ds.length::perf::combine:0","9.9987761882776","0.5","2"
+"ds.mean::perf::combine:0","8.62936433290321","0.5","2"
+"ds.mean::perf::split:0","8.55029467108351","0.5","2"
+"void::perf::void::0","21874.0401780822","0.5","2"
diff --git a/tests/testthat/perf_files/default_perf_profile.csv b/tests/testthat/perf_files/default_perf_profile.csv
@@ -1,14 +1,14 @@
 "refer_name","rate","lower_tolerance","upper_tolerance"
-"conndisconn::perf::simple0","0.229","0.5","2"
-"ds.abs::perf::0","1.796","0.5","2"
-"ds.asInteger::perf:0","1.538","0.5","2"
-"ds.asList::perf:0","3.061","0.5","2"
-"ds.asNumeric::perf:0","1.548","0.5","2"
-"ds.assign::perf::0","3.556","0.5","2"
-"ds.class::perf::combine:0","3.149","0.5","2"
-"ds.colnames::perf:0","2.584","0.5","2"
-"ds.exists::perf::combine:0","7.138","0.5","2"
-"ds.length::perf::combine:0","6.385","0.5","2"
-"ds.mean::perf::combine:0","5.982","0.5","2"
-"ds.mean::perf::split:0","6.923","0.5","2"
-"void::perf::void::0","41810.0","0.5","2"
+"conndisconn::perf::simple0","0.1050","0.5","2"
+"ds.abs::perf::0","3.896","0.5","2"
+"ds.asInteger::perf:0","3.550","0.5","2"
+"ds.asList::perf:0","8.040","0.5","2"
+"ds.asNumeric::perf:0","3.577","0.5","2"
+"ds.assign::perf::0","6.739","0.5","2"
+"ds.class::perf::combine:0","8.171","0.5","2"
+"ds.colnames::perf:0","6.292","0.5","2"
+"ds.exists::perf::combine:0","16.33","0.5","2"
+"ds.length::perf::combine:0","16.08","0.5","2"
+"ds.mean::perf::combine:0","16.08","0.5","2"
+"ds.mean::perf::split:0","15.83","0.5","2"
+"void::perf::void::0","36510.0","0.5","2"