Merge branch 'datashield:feat/armadillo-remote-url' into feat/armadillo-remote-url

Author: StuartWheater

tests/testthat/connection_to_datasets/login_details.R

@@ -22,12 +22,18 @@ if (! is.null(getOption("default_driver"))) {
 }
 
 if ((ds.test_env$driver == "DSLiteDriver") || (ds.test_env$driver == "OpalDriver")) {
-    ds.test_env$ping_address <- paste("https://", ds.test_env$server_ip_address, ":8443", sep="")
+    if (ds.test_env$server_ip_address == "localhost") {
+        opal.url <- "https://localhost:8443"
+    } else {
+        opal.url <- ds.test_env$server_ip_address
+    }
+
+    ds.test_env$ping_address <- opal.url
     ds.test_env$ping_config  <- config(timeout=5, ssl_verifyhost=0, ssl_verifypeer=0)
 
-    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$ip_address_1 <- opal.url
+    ds.test_env$ip_address_2 <- opal.url
+    ds.test_env$ip_address_3 <- opal.url
 
     ds.test_env$user_1 <- getOption("opal.user", "administrator")
     ds.test_env$user_2 <- getOption("opal.user", "administrator")
@@ -43,20 +49,26 @@ if ((ds.test_env$driver == "DSLiteDriver") || (ds.test_env$driver == "OpalDriver
 
     ds.test_env$secure_login_details <- TRUE
 } else if (ds.test_env$driver == "ArmadilloDriver") {
-    ds.test_env$ping_address <- paste("http://", ds.test_env$server_ip_address, ":8080", sep="")
+    if (ds.test_env$server_ip_address == "localhost") {
+        armadillo.url <- "http://localhost:8080"
+    } else {
+        armadillo.url <- ds.test_env$server_ip_address
+    }
+
+    ds.test_env$ping_address <- armadillo.url
     ds.test_env$ping_config  <- config(timeout=5)
 
-    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 <- armadillo.url
+    ds.test_env$ip_address_2 <- armadillo.url
+    ds.test_env$ip_address_3 <- armadillo.url
 
-    ds.test_env$user_1 <- getOption("opal.user", "admin")
-    ds.test_env$user_2 <- getOption("opal.user", "admin")
-    ds.test_env$user_3 <- getOption("opal.user", "admin")
+    ds.test_env$user_1 <- getOption("armadillo.user", "admin")
+    ds.test_env$user_2 <- getOption("armadillo.user", "admin")
+    ds.test_env$user_3 <- getOption("armadillo.user", "admin")
 
-    ds.test_env$password_1 <- getOption("opal.password", "admin")
-    ds.test_env$password_2 <- getOption("opal.password", "admin")
-    ds.test_env$password_3 <- getOption("opal.password", "admin")
+    ds.test_env$password_1 <- getOption("armadillo.password", "admin")
+    ds.test_env$password_2 <- getOption("armadillo.password", "admin")
+    ds.test_env$password_3 <- getOption("armadillo.password", "admin")
 
     ds.test_env$options_1 <- "list()"
     ds.test_env$options_2 <- "list()"