Skip to content

Commit e7d0f9e

Browse files
Pass checks also when R_FUTURE_PLAN=multicore
1 parent 15c4c13 commit e7d0f9e

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: future
2-
Version: 1.34.0-9117
2+
Version: 1.34.0-9118
33
Title: Unified Parallel and Distributed Processing in R for Everyone
44
Imports:
55
digest,

tests/FutureRegistry.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source("incl/start.R")
22

33
message("*** FutureRegistry() ...")
44

5-
for (where in c(sprintf("multicore-%s", future:::session_uuid()), "rscript")) {
5+
for (where in c("multicore-dummy-uuid", "rscript")) {
66
message(sprintf("*** FutureRegistry('%s', 'list') ...", where))
77
futures <- FutureRegistry(where, action = "list")
88
print(futures)

tests/demo.R

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ source("incl/start.R")
33
message("*** Demos ...")
44

55
message("*** Fibonacci demo of the 'future' package ...")
6+
# Temporarily protect against non-default R_FUTURE_PLAN
7+
oopts <- options(future.plan = NULL)
68
demo("fibonacci", package = "future", ask = FALSE)
9+
options(oopts)
710
message("*** Fibonacci demo of the 'future' package ... DONE")
811

912

0 commit comments

Comments
 (0)