resolve URLs on MacOS

shikokuchuo · Sep 11, 2024 · 59742fa · 59742fa
1 parent 661a8b4
commit 59742fa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/R/daemons.R b/R/daemons.R
@@ -591,8 +591,9 @@ create_stream <- function(n, seed, envir) {
   `[[<-`(.GlobalEnv, ".Random.seed", oseed)
 }
 
+# "%s-%d" format required by IPC under MacOS
 auto_dispatcher_urls <- function(n, url)
-  as.character(lapply(seq_len(n), function(x) sprintf("%s/%d", url, x)))
+  as.character(lapply(seq_len(n), function(x) sprintf("%s-%d", url, x)))
 
 resolve_url_port <- function(url) {
   parse_url(url)[["port"]] == "0" || return(url)

diff --git a/tests/tests.R b/tests/tests.R
@@ -290,8 +290,8 @@ connection && .Platform[["OS.type"]] != "windows" && Sys.getenv("NOT_CRAN") == "
 }
 # threaded dispatcher tests
 connection && Sys.getenv("NOT_CRAN") == "true" && {
-  nanotesto(daemons(1, dispatcher = NA))
-  nanotesto(nextget("n"))
+  nanotest(daemons(2, dispatcher = NA) == 2L)
+  nanotest(nextget("n") == 2L)
   nanotest(startsWith(nextget("urls")[[1L]], mirai:::.urlscheme))
   nanotest(is.matrix(status()$daemons))
   nanotest(mirai(TRUE)[])
@@ -302,8 +302,8 @@ connection && Sys.getenv("NOT_CRAN") == "true" && {
   nanotestz(daemons(0))
   nanotest(daemons(2, url = local_url(), dispatcher = NA) == 2L)
   nanotest(length(urls <- nextget("urls")) == 2L)
-  nanotest(endsWith(urls[[1L]], "/1"))
-  nanotest(endsWith(urls[[2L]], "/2"))
+  nanotest(endsWith(urls[[1L]], "1"))
+  nanotest(endsWith(urls[[2L]], "2"))
   nanotestz(daemons(0))
 }
 Sys.sleep(1L)