TESTS: Fix EagerFuture -> SequentialFuture

HenrikBengtsson · HenrikBengtsson · commit 33f191293f45 · 2018-07-18T21:36:11.000+02:00
diff --git a/tests/batchtools_multicore.R b/tests/batchtools_multicore.R
@@ -27,7 +27,7 @@ for (cores in 1:min(2L, availableCores("multicore"))) {
     }, globals = globals)
     stopifnot(
       inherits(f, "BatchtoolsFuture") ||
-      ((cores == 1 || !supportsMulticore()) && inherits(f, "EagerFuture"))
+      ((cores == 1 || !supportsMulticore()) && inherits(f, "SequentialFuture"))
     )
 
     print(resolved(f))
diff --git a/tests/globals,manual.R b/tests/globals,manual.R
@@ -60,7 +60,7 @@ f <- future({
 }, globals = FALSE)
 rm(list = names(globals))
 y <- tryCatch(value(f), error = identity)
-if (!inherits(f, c("EagerFuture", "MulticoreFuture"))) {
+if (!inherits(f, c("SequentialFuture", "MulticoreFuture"))) {
   stopifnot(inherits(y, "simpleError"))
 }
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ for (cores in 1:min(2L, availableCores("multicore"))) {`
`27`	`27`	`}, globals = globals)`
`28`	`28`	`stopifnot(`
`29`	`29`	`inherits(f, "BatchtoolsFuture") \|\|`
`30`		`- ((cores == 1 \|\| !supportsMulticore()) && inherits(f, "EagerFuture"))`
	`30`	`+ ((cores == 1 \|\| !supportsMulticore()) && inherits(f, "SequentialFuture"))`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`print(resolved(f))`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ f <- future({`
`60`	`60`	`}, globals = FALSE)`
`61`	`61`	`rm(list = names(globals))`
`62`	`62`	`y <- tryCatch(value(f), error = identity)`
`63`		`-if (!inherits(f, c("EagerFuture", "MulticoreFuture"))) {`
	`63`	`+if (!inherits(f, c("SequentialFuture", "MulticoreFuture"))) {`
`64`	`64`	`stopifnot(inherits(y, "simpleError"))`
`65`	`65`	`}`
`66`	`66`