Merge remote-tracking branch 'origin/master' into ro_mode

R/ids.R

@@ -52,7 +52,7 @@ convertIds = function(reg, ids, default = NULL, keep.extra = character(0L), keep
 
   invalid = ids[!reg$status, on = "job.id", which = TRUE]
   if (length(invalid) > 0L) {
-    info("Ignoring %i invalid job id", length(invalid), if (length(ids) > 1L) "s" else "")
+    info("Ignoring %i invalid job id%s", length(invalid), if (length(ids) > 1L) "s" else "")
     ids = ids[-invalid]
   }
 

README.md

@@ -8,7 +8,7 @@
 
 As a successor of the packages [BatchJobs](https://github.com/tudo-r/BatchJobs) and [BatchExperiments](https://github.com/tudo-r/Batchexperiments), batchtools provides a parallel implementation of Map for high performance computing systems managed by schedulers like Slurm, Sun Grid Engine, OpenLava, TORQUE/OpenPBS, Load Sharing Facility (LSF) or Docker Swarm (see the setup section in the [vignette](https://mllg.github.io/batchtools/articles/batchtools.html)).
 
-The main features conclude:
+Main features:
 * Convenience: All relevant batch system operations (submitting, listing, killing) are either handled internally or abstracted via simple R functions
 * Portability: With a well-defined interface, the source is independent from the underlying batch system - prototype locally, deploy on any high performance cluster
 * Reproducibility: Every computational part has an associated seed stored in a data base which ensures reproducibility even when the underlying batch system changes

tests/testthat/test_Registry.R

@@ -101,8 +101,7 @@ test_that("loadRegistry after early node error still usable (#135)", {
   batchMap(identity, 1:2, reg = reg)
   jc = makeJobCollection(1, reg = reg)
   jc$packages = "not_existing_package"
-  writeRDS(jc, jc$uri)
-  suppressAll(runOSCommand(Rscript(), sprintf("-e 'batchtools::doJobCollection(\"%s\")'", jc$uri)))
+  suppressAll(doJobCollection(jc))
   expect_character(list.files(fp(reg$file.dir, "updates")), len = 1L)
   expect_true(syncRegistry(reg = reg))
   expect_string(getErrorMessages(reg = reg)$message, fixed = "not_existing_package")