More tests

keller-mark · Jun 21, 2024 · 269ee0d · 269ee0d
1 parent ac03900
commit 269ee0d
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 11 deletions.
diff --git a/R/options.R b/R/options.R
@@ -13,8 +13,8 @@ parse_parallel_option <- function(val) {
   if(val == "future") {
     return("future")
   }
-  logical_val <- as.logical(val)
-  integer_val <- as.integer(val)
+  logical_val <- suppressWarnings(as.logical(val))
+  integer_val <- suppressWarnings(as.integer(val))
 
   if(is.na(integer_val)) {
     return(logical_val)

diff --git a/R/stores.R b/R/stores.R
@@ -370,6 +370,7 @@ HttpStore <- R6::R6Class("HttpStore",
       path <- paste(private$base_path, key, sep="/")
 
       parallel_option <- getOption("pizzarr.parallel_read_enabled")
+      parallel_option <- parse_parallel_option(parallel_option)
       is_parallel <- is_truthy_parallel_option(parallel_option)
 
       if(is_parallel) {

diff --git a/tests/testthat/setup-utils.R b/tests/testthat/setup-utils.R
@@ -1,8 +1,9 @@
 setup({
-
+  pbapply::pboptions(type = "none")
+  do.call(options, pizzarr_option_defaults)
 })
 teardown({
-
+  do.call(options, pizzarr_option_defaults)
 })
 
 zarr_volcano <- function() {

diff --git a/tests/testthat/test-parallel.R b/tests/testthat/test-parallel.R
@@ -1,7 +1,5 @@
 library(pizzarr)
 
-pbapply::pboptions(type = "none")
-
 SlowGettingDirectoryStore <- R6::R6Class("SlowGettingDirectoryStore",
   inherit = DirectoryStore,
   public = list(
@@ -68,7 +66,6 @@ run_parallel_set <- function(num_workers) {
 }
 
 test_that("can run get_item() in parallel", {
-
   bench_df <- bench::mark(
     run_parallel_get(1),
     run_parallel_get(2),
@@ -81,11 +78,9 @@ test_that("can run get_item() in parallel", {
   expect_equal(unlist(bench_df$result), rep(134538481, 3))
   expect_equal(bench_df$total_time[[1]] > bench_df$total_time[[2]], TRUE)
   expect_equal(bench_df$total_time[[2]] > bench_df$total_time[[3]], TRUE)
-
 })
 
 test_that("can run set_item() in parallel", {
-
   bench_df <- bench::mark(
     run_parallel_set(1),
     run_parallel_set(2),
@@ -98,5 +93,27 @@ test_that("can run set_item() in parallel", {
   expect_equal(unlist(bench_df$result), rep(134538481*2.0, 3))
   expect_equal(bench_df$total_time[[1]] > bench_df$total_time[[2]], TRUE)
   expect_equal(bench_df$total_time[[2]] > bench_df$total_time[[3]], TRUE)
-
-})
+})
+
+test_that("parse_parallel_option works as expected", {
+  expect_equal(parse_parallel_option("future"), "future")
+  expect_equal(parse_parallel_option("0"), FALSE)
+  expect_equal(parse_parallel_option(0), FALSE)
+  expect_equal(parse_parallel_option("FALSE"), FALSE)
+  expect_equal(parse_parallel_option(FALSE), FALSE)
+  expect_equal(parse_parallel_option("1"), TRUE)
+  expect_equal(parse_parallel_option(1), TRUE)
+  expect_equal(parse_parallel_option("TRUE"), TRUE)
+  expect_equal(parse_parallel_option(TRUE), TRUE)
+  expect_equal(parse_parallel_option("2"), 2)
+  expect_equal(parse_parallel_option(2), 2)
+})
+
+test_that("is_truthy_parallel_option works as expected", {
+  expect_equal(is_truthy_parallel_option("future"), TRUE)
+  expect_equal(is_truthy_parallel_option(FALSE), FALSE)
+  expect_equal(is_truthy_parallel_option(0), FALSE)
+  expect_equal(is_truthy_parallel_option(TRUE), TRUE)
+  expect_equal(is_truthy_parallel_option(1), TRUE)
+  expect_equal(is_truthy_parallel_option(2), TRUE)
+})