Merge branch 'v6.3.6-dev-feat/standardise-df' into v6.3.6-dev-feat/standardise-df

Author: StuartWheater

DESCRIPTION

@@ -86,4 +86,4 @@ Suggests:
     DSLite
 Encoding: UTF-8
 Language: en-GB
-Config/roxygen2/version: 8.0.0.9000
+Config/roxygen2/version: 8.0.0

tests/testthat/connection_to_datasets/login_details.R

@@ -31,7 +31,7 @@ if ((ds.test_env$driver == "DSLiteDriver") || (ds.test_env$driver == "OpalDriver
     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$ping_options  <- config(timeout=60, ssl_verifyhost=0, ssl_verifypeer=0)
 
     ds.test_env$server_url_1 <- opal.url
     ds.test_env$server_url_2 <- opal.url
@@ -60,7 +60,7 @@ if ((ds.test_env$driver == "DSLiteDriver") || (ds.test_env$driver == "OpalDriver
     ds.test_env$ping_url      <- armadillo.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$ping_options  <- "list(timeout=60)"
 
     ds.test_env$server_url_1 <- armadillo.url
     ds.test_env$server_url_2 <- armadillo.url

tests/testthat/perf_files/armadillo_hp-laptop-quay_perf-profile.csv

@@ -25,5 +25,6 @@
 "ds.names::perf::combine:0","4.190","0.5","2"
 "ds.numNA::perf::combine:0","3.588","0.5","2"
 "ds.sqrt::perf::0","2.278","0.5","2"
+"ds.standardiseDf:::perf::0","9.50","0.5","2"
 "ds.unique::perf::combine:0","3.909","0.5","2"
-"void::perf::void::0","20280.0","0.5","2"
+"void::perf::void::0","20280.0","0.5","2"