Make package tests work with future 1.14.0-9000

Author: HenrikBengtsson

DESCRIPTION

@@ -2,7 +2,7 @@ Package: future.batchtools
 Version: 0.8.0-9000
 Depends:
     R (>= 3.2.0),
-    future (>= 1.12.0)
+    future (>= 1.14.0)
 Imports:
     batchtools (>= 0.9.11)
 Suggests:

NEWS

@@ -1,10 +1,8 @@
 Package: future.batchtools
 ==========================
 
-Version: 0.8.0-9000 [2019-06-22]
+Version: 0.8.0-9000 [2019-09-27]
 
- * ...
- 
 BUG FIXES:
 
  * print() for BatchtoolsFuture would produce an error if the underlying

tests/BatchtoolsFuture.R

@@ -14,14 +14,6 @@ message("*** BatchtoolsFuture() - cleanup ... DONE")
 
 message("*** BatchtoolsFuture() - deleting exceptions ...")
 
-## Deleting a non-resolved future
-f <- BatchtoolsFuture({ x <- 1 })
-res <- tryCatch({
-  delete(f)
-}, warning = function(w) w)
-print(res)
-stopifnot(inherits(res, "warning"))
-
 ## Printing a deleted future
 f <- batchtools_local(42L)
 print(f)

tests/future,lazy.R

@@ -15,7 +15,12 @@ for (strategy in strategies) {
   a <- 42
   f <- future(2 * a, lazy = TRUE)
   a <- 21
-  stopifnot(!resolved(f))
+  ## In future (> 1.14.0), resolved() will launch lazy future,
+  ## which means for some backends (e.g. sequential) this means
+  ## that resolved() might end up returning TRUE.
+  if (packageVersion("future") <= "1.14.0") {
+    stopifnot(!resolved(f))
+  }
   f <- resolve(f)
   stopifnot(resolved(f))
   v <- value(f)
@@ -25,7 +30,12 @@ for (strategy in strategies) {
   v %<-% { 2 * a } %lazy% TRUE
   a <- 21
   f <- futureOf(v)  
-  stopifnot(!resolved(f))
+  ## In future (> 1.14.0), resolved() will launch lazy future,
+  ## which means for some backends (e.g. sequential) this means
+  ## that resolved() might end up returning TRUE.
+  if (packageVersion("future") <= "1.14.0") {
+    stopifnot(!resolved(f))
+  }
   f <- resolve(f)
   stopifnot(resolved(f))
   stopifnot(v == 84)