TESTS: Tests on cancel() now assert that internal state is 'finished'

Author: HenrikBengtsson

inst/testme/test-cancel.R

@@ -29,21 +29,15 @@ for (strategy in strategies) {
 
   message("  Cancel future, which also interrupts the future, if supported")
   f <- cancel(f)
-  stopifnot({
-     f[["state"]] %in% c("canceled", "interrupted") ||
-    (f[["state"]] == "finished" && inherits(f, "SequentialFuture"))
-  })
+  stopifnot(f[["state"]] %in% "finished")
 
   n <- nbrOfFreeWorkers()
   message("  Number of free workers (after cancel + interupt): ", n)
 
   message("  Check if canceled + interrupted future is resolved")
   f <- resolve(f)
   stopifnot(resolved(f))
-  stopifnot({
-     f[["state"]] %in% c("canceled", "interrupted") ||
-    (f[["state"]] == "finished" && inherits(f, "SequentialFuture"))
-  })
+  stopifnot(f[["state"]] == "finished")
 
   n <- nbrOfFreeWorkers()
   message("  Number of free workers (after resolve): ", n)