TESTS: Make shutdown of parallel PSOCK clusters robust against some nodes already been terminated

Author: HenrikBengtsson

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: doFuture
-Version: 1.0.2-9005
+Version: 1.0.2-9006
 Title: Use Foreach to Parallelize via the Future Framework
 Depends:
     foreach (>= 1.5.0),

inst/testme/test-foreach_dofuture,cluster-missing-doFuture-pkg.R

@@ -45,7 +45,16 @@ setupClusterWithoutPkgs <- function(type = "PSOCK",
   attr(cl, "withouts") <- res
 
   cl
-}
+} ## setupClusterWithoutPkgs()
+
+
+stopCluster2 <- function(cl) {
+  for (kk in seq_along(cl)) {
+    tryCatch(parallel::stopCluster(cl[kk]), error = TRUE)
+  }
+} ## stopCluster2()
+
+
 
 cl <- NULL
 for (type in types) {
@@ -68,7 +77,7 @@ for (type in types) {
     print(res)
     stopifnot(inherits(res, "FutureError"))
   }
-  parallel::stopCluster(cl)
+  stopCluster2(cl)
   cl <- NULL
 
   cl <- setupClusterWithoutPkgs(type)  
@@ -88,7 +97,7 @@ for (type in types) {
     print(res)
     stopifnot(inherits(res, "FutureError"))
   }
-  parallel::stopCluster(cl)
+  stopCluster2(cl)
   cl <- NULL
 
   plan(sequential)

inst/testme/test-foreach_dopar,cluster-missing-doFuture-pkg.R

@@ -46,7 +46,13 @@ setupClusterWithoutPkgs <- function(type = "PSOCK",
   attr(cl, "withouts") <- res
 
   cl
-}
+} ## setupClusterWithoutPkgs()
+
+stopCluster2 <- function(cl) {
+  for (kk in seq_along(cl)) {
+    tryCatch(parallel::stopCluster(cl[kk]), error = TRUE)
+  }
+} ## stopCluster2()
 
 
 cl <- NULL
@@ -70,7 +76,7 @@ for (type in types) {
     print(res)
     stopifnot(inherits(res, "FutureError"))
   }
-  parallel::stopCluster(cl)
+  stopCluster2(cl)
   cl <- NULL
 
   cl <- setupClusterWithoutPkgs(type)  
@@ -90,7 +96,7 @@ for (type in types) {
     print(res)
     stopifnot(inherits(res, "FutureError"))
   }
-  parallel::stopCluster(cl)
+  stopCluster2(cl)
   cl <- NULL
 
   plan(sequential)