Skip to content

Commit

Permalink
Min clustermq version in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
wlandau-lilly committed Oct 16, 2023
1 parent 890e63a commit f0f5326
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion tests/testthat/test-1-keras.R
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ test_with_dir("custom keras format", {

test_with_dir("keras + clustermq", {
skip_on_cran()
skip_if_not_installed("clustermq")
skip_if_not_installed("clustermq", minimum_version = "0.9.1")
skip_if_not_installed("keras")
skip_on_os("windows")
if ("package:clustermq" %in% search()) {
Expand Down
2 changes: 1 addition & 1 deletion tests/testthat/test-6-hpc.R
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ test_with_dir("caching arg and column", {

test_with_dir("custom caching column and clustermq", {
skip_on_cran()
skip_if_not_installed("clustermq")
skip_if_not_installed("clustermq", minimum_version = "0.9.1")
skip_on_os("windows")
if ("package:clustermq" %in% search()) {
detach("package:clustermq", unload = TRUE) # nolint
Expand Down
2 changes: 1 addition & 1 deletion tests/testthat/test-8-decorated-storr.R
Original file line number Diff line number Diff line change
Expand Up @@ -1190,7 +1190,7 @@ test_with_dir("format file hpc checksums (#1168)", {
expect_equal(nchar(out), c(16L, 16L))
clean(destroy = TRUE)
make(plan, parallelism = "future", caching = "worker")
skip_if_not_installed("clustermq")
skip_if_not_installed("clustermq", minimum_version = "0.9.1")
skip_on_os("windows")
options(clustermq.scheduler = "multicore")
for (caching in c("main", "worker")) {
Expand Down
10 changes: 5 additions & 5 deletions tests/testthat/test-9-clustermq.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
drake_context("clustermq")

test_with_dir("clustermq parallelism for CRAN", {
skip_if_not_installed("clustermq")
skip_if_not_installed("clustermq", minimum_version = "0.9.1")
skip_on_os("windows")
options(clustermq.scheduler = "multicore")
plan <- drake_plan(x = {
Expand All @@ -22,7 +22,7 @@ test_with_dir("clustermq parallelism for CRAN", {

test_with_dir("clustermq parallelism", {
skip_on_cran()
skip_if_not_installed("clustermq")
skip_if_not_installed("clustermq", minimum_version = "0.9.1")
skip_on_os("windows")
if ("package:clustermq" %in% search()) {
detach("package:clustermq", unload = TRUE) # nolint
Expand Down Expand Up @@ -91,7 +91,7 @@ test_with_dir("clustermq parallelism", {

test_with_dir("No hpc targets? No workers.", {
skip_on_cran()
skip_if_not_installed("clustermq")
skip_if_not_installed("clustermq", minimum_version = "0.9.1")
skip_on_os("windows")
if ("package:clustermq" %in% search()) {
detach("package:clustermq", unload = TRUE) # nolint
Expand All @@ -117,7 +117,7 @@ test_with_dir("No hpc targets? No workers.", {

test_with_dir("All hpc targets up to date? No workers.", {
skip_on_cran()
skip_if_not_installed("clustermq")
skip_if_not_installed("clustermq", minimum_version = "0.9.1")
skip_on_os("windows")
if ("package:clustermq" %in% search()) {
detach("package:clustermq", unload = TRUE) # nolint
Expand Down Expand Up @@ -153,7 +153,7 @@ test_with_dir("All hpc targets up to date? No workers.", {

test_with_dir("Start off with non-HPC targets, then go to HPC targets.", {
skip_on_cran()
skip_if_not_installed("clustermq")
skip_if_not_installed("clustermq", minimum_version = "0.9.1")
skip_on_os("windows")
if ("package:clustermq" %in% search()) {
detach("package:clustermq", unload = TRUE) # nolint
Expand Down
2 changes: 1 addition & 1 deletion tests/testthat/test-9-dynamic.R
Original file line number Diff line number Diff line change
Expand Up @@ -1284,7 +1284,7 @@ test_with_dir("dyn loadd/readd with NULL subtargets (#1139)", {
test_with_dir("dynamic hpc", {
skip_on_cran()
skip_on_os("windows")
skip_if_not_installed("clustermq")
skip_if_not_installed("clustermq", minimum_version = "0.9.1")
skip_if_not_installed("future")
if ("package:clustermq" %in% search()) {
detach("package:clustermq", unload = TRUE) # nolint
Expand Down

0 comments on commit f0f5326

Please sign in to comment.