Merge pull request datashield#680 from StuartWheater/v6.3.6-dev

Update/fix to 'Opal' http/https config

Author: StuartWheater

tests/testthat/connection_to_datasets/init_local_settings.R

@@ -15,8 +15,7 @@ init.server.url <- function()
    }
    else
    {
-      # server.url <- "http://127.0.0.1:8080/"
-      server.url <- "http://localhost:8080/"
+      server.url <- NULL
    }
    return (server.url)
 }

tests/testthat/connection_to_datasets/login_details.R

@@ -22,7 +22,11 @@ if (! is.null(getOption("default_driver"))) {
 }
 
 if ((ds.test_env$driver == "DSLiteDriver") || (ds.test_env$driver == "OpalDriver")) {
-    opal.url <- ds.test_env$server_url
+    if (! is.null(ds.test_env$server_url)) {
+        opal.url <- ds.test_env$server_url
+    } else {
+        opal.url <- "https://localhost:8443/"
+    }
 
     ds.test_env$ping_url     <- opal.url
     ds.test_env$ping_config  <- config(timeout=5)
@@ -39,13 +43,17 @@ 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") {
-    armadillo.url <- ds.test_env$server_url
+    if (! is.null(ds.test_env$server_url)) {
+        armadillo.url <- ds.test_env$server_url
+    } else {
+        armadillo.url <- "http://localhost:8080/"
+    }
 
     ds.test_env$ping_url     <- armadillo.url
     ds.test_env$ping_config  <- config(timeout=5)