Merge pull request #72 from datashield/v6.3.6-dev-feat/standardise-df

V6.3.6 dev feat/standardise df

Author: StuartWheater

dsBase_6.3.6-permissive.tar.gz

@@ -229,8 +229,8 @@ init.studies.dataset.stand <- function(variables)
     {
       builder <- DSI::newDSLoginBuilder(.silent = TRUE)
       builder$append(server = "sim1", url = ds.test_env$server_url_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "STANDARDISE.std_1", options=ds.test_env$options_1)
-      builder$append(server = "sim2", url = ds.test_env$server_url_2, user = ds.test_env$user_2, password = ds.test_env$password_2, table = "STANDARDISE.std_1", options=ds.test_env$options_2)
-      builder$append(server = "sim3", url = ds.test_env$server_url_3, user = ds.test_env$user_3, password = ds.test_env$password_3, table = "STANDARDISE.std_1", options=ds.test_env$options_3)
+      builder$append(server = "sim2", url = ds.test_env$server_url_2, user = ds.test_env$user_2, password = ds.test_env$password_2, table = "STANDARDISE.std_2", options=ds.test_env$options_2)
+      builder$append(server = "sim3", url = ds.test_env$server_url_3, user = ds.test_env$user_3, password = ds.test_env$password_3, table = "STANDARDISE.std_3", options=ds.test_env$options_3)
       ds.test_env$login.data <- builder$build()
     }
     else if (ds.test_env$driver == "ArmadilloDriver")
@@ -286,8 +286,8 @@ init.studies.dataset.stand <- function(variables)
     {
       builder <- DSI::newDSLoginBuilder(.silent = TRUE)
       builder$append(server = "sim1", url = ds.test_env$server_url_1, user = ds.test_env$user_1, password = ds.test_env$password_1, table = "STANDARDISE.std_1", options=ds.test_env$options_1)
-      builder$append(server = "sim2", url = ds.test_env$server_url_2, user = ds.test_env$user_2, password = ds.test_env$password_2, table = "STANDARDISE.std_1", options=ds.test_env$options_2)
-      builder$append(server = "sim3", url = ds.test_env$server_url_3, user = ds.test_env$user_3, password = ds.test_env$password_3, table = "STANDARDISE.std_1", options=ds.test_env$options_3)
+      builder$append(server = "sim2", url = ds.test_env$server_url_2, user = ds.test_env$user_2, password = ds.test_env$password_2, table = "STANDARDISE.std_2", options=ds.test_env$options_2)
+      builder$append(server = "sim3", url = ds.test_env$server_url_3, user = ds.test_env$user_3, password = ds.test_env$password_3, table = "STANDARDISE.std_3", options=ds.test_env$options_3)
       ds.test_env$login.data <- builder$build()
     }
     else if (ds.test_env$driver == "ArmadilloDriver")

tests/testthat/connection_to_datasets/init_studies_datasets.R

@@ -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=60)"
+    ds.test_env$ping_options  <- config(timeout=60)
 
     ds.test_env$server_url_1 <- armadillo.url
     ds.test_env$server_url_2 <- armadillo.url

tests/testthat/connection_to_datasets/login_details.R

@@ -17,7 +17,6 @@ test_that("setup", {
 #
 # Tests
 #
-
 ####################################################################################################
 # Code that will be used in multiple tests
 ####################################################################################################