Merge branch 'datashield:v6.3.6-dev' into 6.4.0-6.3.6_update

StuartWheater · web-flow · commit ce20aadc7d36 · 2026-06-16T15:51:53.000+01:00
diff --git a/tests/testthat/connection_to_datasets/login_details.R b/tests/testthat/connection_to_datasets/login_details.R
@@ -57,7 +57,7 @@ if ((ds.test_env$driver == "DSLiteDriver") || (ds.test_env$driver == "OpalDriver
         armadillo.url <- "http://localhost:8080/"
     }
 
-    ds.test_env$ping_url      <- armadillo_ping.url
+    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)"

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ if ((ds.test_env$driver == "DSLiteDriver") \|\| (ds.test_env$driver == "OpalDriver`
`57`	`57`	`armadillo.url <- "http://localhost:8080/"`
`58`	`58`	`}`
`59`	`59`
`60`		`- ds.test_env$ping_url <- armadillo_ping.url`
	`60`	`+ ds.test_env$ping_url <- armadillo.url`
`61`	`61`	`ds.test_env$ping_user <- getOption("armadillo.user", "admin")`
`62`	`62`	`ds.test_env$ping_password <- getOption("armadillo.password", "admin")`
`63`	`63`	`ds.test_env$ping_options <- "list(timeout=5)"`