diff --git a/inst/tinytest/test_arrayschema.R b/inst/tinytest/test_arrayschema.R index 5e714cca1e..8b03b5add6 100644 --- a/inst/tinytest/test_arrayschema.R +++ b/inst/tinytest/test_arrayschema.R @@ -1,8 +1,6 @@ library(tinytest) library(tiledb) -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) - ctx <- tiledb_ctx(limitTileDBCores()) if (get_return_as_preference() != "asis") set_return_as_preference("asis") # baseline value @@ -97,28 +95,21 @@ expect_error(tiledb:::libtiledb_array_schema_set_capacity(sch@ptr, -10)) #test_that("tiledb_array_schema created with encryption", { -if (!(isOldWindows)) { - dir.create(uri <- tempfile()) - key <- "0123456789abcdeF0123456789abcdeF" - - dom <- tiledb_domain(dims = c(tiledb_dim("rows", c(1L, 4L), 4L, "INT32"), - tiledb_dim("cols", c(1L, 4L), 4L, "INT32"))) - schema <- tiledb_array_schema(dom, attrs = c(tiledb_attr("a", type = "INT32"))) +dir.create(uri <- tempfile()) +key <- "0123456789abcdeF0123456789abcdeF" - ##tiledb_array_create_with_key(uri, schema, key) - ## for now calling into function - tiledb:::libtiledb_array_create_with_key(uri, schema@ptr, key) +dom <- tiledb_domain(dims = c(tiledb_dim("rows", c(1L, 4L), 4L, "INT32"), + tiledb_dim("cols", c(1L, 4L), 4L, "INT32"))) +schema <- tiledb_array_schema(dom, attrs = c(tiledb_attr("a", type = "INT32"))) -# ctx <- tiledb_ctx() -# arrptr <- tiledb:::libtiledb_array_open_with_key(ctx@ptr, uri, "WRITE", key) -# A <- new("tiledb_dense", ctx=ctx, uri=uri, as.data.frame=FALSE, ptr=arrptr) +##tiledb_array_create_with_key(uri, schema, key) +## for now calling into function +tiledb:::libtiledb_array_create_with_key(uri, schema@ptr, key) -# expect_true(is(A, "tiledb_dense")) - ##expect_true(is(schema(A), "tiledb_dense")) - ## can't yet read / write as scheme getter not generalized for encryption +##expect_true(is(schema(A), "tiledb_dense")) +## can't yet read / write as scheme getter not generalized for encryption - unlink(uri, recursive=TRUE) -} +unlink(uri, recursive=TRUE) #}) #test_that("tiledb_array_schema dups setter/getter", { diff --git a/inst/tinytest/test_arrayschemaevolution.R b/inst/tinytest/test_arrayschemaevolution.R index 65ad6722f2..8fb44e8221 100644 --- a/inst/tinytest/test_arrayschemaevolution.R +++ b/inst/tinytest/test_arrayschemaevolution.R @@ -1,7 +1,6 @@ library(tinytest) library(tiledb) -#isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) if (Sys.info()[["sysname"]] == "Windows") exit_file("Skip on Windows") ctx <- tiledb_ctx(limitTileDBCores()) diff --git a/inst/tinytest/test_arrowio.R b/inst/tinytest/test_arrowio.R index c115a8da3e..17b19cdaeb 100644 --- a/inst/tinytest/test_arrowio.R +++ b/inst/tinytest/test_arrowio.R @@ -1,9 +1,6 @@ library(tinytest) library(tiledb) -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) -if (isOldWindows) exit_file("skip this file on old Windows releases") - if (Sys.getenv("CI", "") == "") exit_file("Skip unextended test run") ctx <- tiledb_ctx(limitTileDBCores()) diff --git a/inst/tinytest/test_attr.R b/inst/tinytest/test_attr.R index add6b62994..96573c0ffb 100644 --- a/inst/tinytest/test_attr.R +++ b/inst/tinytest/test_attr.R @@ -3,7 +3,6 @@ library(tiledb) ctx <- tiledb_ctx(limitTileDBCores()) -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) isWindows <- Sys.info()[["sysname"]] == "Windows" #test_that("tiledb_attr constructor works", { @@ -54,7 +53,6 @@ expect_true(is.na(tiledb::cell_val_num(attrs))) #}) #test_that("tiledb_attr set fill", { -if (isOldWindows) exit_file("skip remainder of this file on old Windows releases") ## test for default dom <- tiledb_domain(dims = tiledb_dim("rows", c(1L, 4L), 4L, "INT32")) diff --git a/inst/tinytest/test_ctx.R b/inst/tinytest/test_ctx.R index a3d6f682ee..12a58ee5fb 100644 --- a/inst/tinytest/test_ctx.R +++ b/inst/tinytest/test_ctx.R @@ -1,9 +1,6 @@ library(tinytest) library(tiledb) -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) -if (isOldWindows) exit_file("skip this file on old Windows releases") - tiledb_ctx(limitTileDBCores()) #test_that("tiledb_ctx default constructor", { diff --git a/inst/tinytest/test_dataframe.R b/inst/tinytest/test_dataframe.R index c3fc484525..846af739cd 100644 --- a/inst/tinytest/test_dataframe.R +++ b/inst/tinytest/test_dataframe.R @@ -1,9 +1,6 @@ library(tinytest) library(tiledb) -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) -if (isOldWindows) exit_file("skip this file on old Windows releases") - ctx <- tiledb_ctx(limitTileDBCores()) #test_that("tiledb_fromdataframe", { diff --git a/inst/tinytest/test_datetime.R b/inst/tinytest/test_datetime.R index 2e540e6a50..bcb0caa048 100644 --- a/inst/tinytest/test_datetime.R +++ b/inst/tinytest/test_datetime.R @@ -1,9 +1,6 @@ library(tinytest) library(tiledb) -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) -if (isOldWindows) exit_file("skip this file on old Windows releases") - isMacOS <- (Sys.info()['sysname'] == "Darwin") ctx <- tiledb_ctx(limitTileDBCores()) diff --git a/inst/tinytest/test_dim.R b/inst/tinytest/test_dim.R index e921c5981e..99b0255d1b 100644 --- a/inst/tinytest/test_dim.R +++ b/inst/tinytest/test_dim.R @@ -1,9 +1,6 @@ library(tinytest) library(tiledb) -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) -if (isOldWindows) exit_file("skip this file on old Windows releases") - ctx <- tiledb_ctx(limitTileDBCores()) #test_that("tiledb_dim default constructor", { diff --git a/inst/tinytest/test_dimsubset.R b/inst/tinytest/test_dimsubset.R index 500912221f..bad3e6bbae 100644 --- a/inst/tinytest/test_dimsubset.R +++ b/inst/tinytest/test_dimsubset.R @@ -5,9 +5,6 @@ library(tinytest) library(tiledb) library(RcppSpdlog) # use logging for some informal profiling -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) -if (isOldWindows) exit_file("skip this file on old Windows releases") - if (!requireNamespace("nycflights13", quietly=TRUE)) exit_file("Needed 'nycflights13' package missing") log_setup("test_dimsubset", "warn") # but set the default level to 'warn' -> silent, activate via 'info' diff --git a/inst/tinytest/test_domain.R b/inst/tinytest/test_domain.R index 2b4422d425..b6d11eacd6 100644 --- a/inst/tinytest/test_domain.R +++ b/inst/tinytest/test_domain.R @@ -1,9 +1,6 @@ library(tinytest) library(tiledb) -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) -if (isOldWindows) exit_file("skip this file on old Windows releases") - ctx <- tiledb_ctx(limitTileDBCores()) #test_that("tiledb_domain basic constructor", { diff --git a/inst/tinytest/test_filestore.R b/inst/tinytest/test_filestore.R index 007ffdb262..d50f844781 100644 --- a/inst/tinytest/test_filestore.R +++ b/inst/tinytest/test_filestore.R @@ -1,9 +1,6 @@ library(tinytest) library(tiledb) -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) -if (isOldWindows) exit_file("skip this file on old Windows releases") - isWindows <- Sys.info()[["sysname"]] == "Windows" ctx <- tiledb_ctx(limitTileDBCores()) diff --git a/inst/tinytest/test_filterlist.R b/inst/tinytest/test_filterlist.R index 0b2b368e03..492ff02fd6 100644 --- a/inst/tinytest/test_filterlist.R +++ b/inst/tinytest/test_filterlist.R @@ -1,9 +1,6 @@ library(tinytest) library(tiledb) -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) -if (isOldWindows) exit_file("skip this file on old Windows releases") - ctx <- tiledb_ctx(limitTileDBCores()) #test_that("tiledb_filter_list default constructor", { diff --git a/inst/tinytest/test_fragmentinfo.R b/inst/tinytest/test_fragmentinfo.R index e17a7cd884..bc89122073 100644 --- a/inst/tinytest/test_fragmentinfo.R +++ b/inst/tinytest/test_fragmentinfo.R @@ -1,8 +1,6 @@ library(tinytest) library(tiledb) -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) -if (isOldWindows) exit_file("skip this file on old Windows releases") isMacOS <- (Sys.info()['sysname'] == "Darwin") ctx <- tiledb_ctx(limitTileDBCores()) diff --git a/inst/tinytest/test_group.R b/inst/tinytest/test_group.R index 86ffa578a6..c4d3612747 100644 --- a/inst/tinytest/test_group.R +++ b/inst/tinytest/test_group.R @@ -1,8 +1,6 @@ library(tinytest) library(tiledb) -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) -if (isOldWindows) exit_file("skip this file on old Windows releases") isWindows <- Sys.info()[["sysname"]] == "Windows" isMacOS <- (Sys.info()['sysname'] == "Darwin") diff --git a/inst/tinytest/test_libtiledb.R b/inst/tinytest/test_libtiledb.R index d5ab6c3476..2125059446 100644 --- a/inst/tinytest/test_libtiledb.R +++ b/inst/tinytest/test_libtiledb.R @@ -1,9 +1,6 @@ library(tinytest) library(tiledb) -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) -if (isOldWindows) exit_file("skip this file on old Windows releases") - tiledb_ctx(limitTileDBCores()) #test_that("version is valid", { diff --git a/inst/tinytest/test_matrix.R b/inst/tinytest/test_matrix.R index 3376e2d418..fec84f5f45 100644 --- a/inst/tinytest/test_matrix.R +++ b/inst/tinytest/test_matrix.R @@ -2,9 +2,6 @@ library(tinytest) library(tiledb) -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) -if (isOldWindows) exit_file("skip this file on old Windows releases") - ctx <- tiledb_ctx(limitTileDBCores()) uri <- tempfile() diff --git a/inst/tinytest/test_metadata.R b/inst/tinytest/test_metadata.R index d127cc5720..8dd1a2c652 100644 --- a/inst/tinytest/test_metadata.R +++ b/inst/tinytest/test_metadata.R @@ -1,9 +1,6 @@ library(tinytest) library(tiledb) -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) -if (isOldWindows) exit_file("skip this file on old Windows releases") - ctx <- tiledb_ctx(limitTileDBCores()) tmp <- tempfile() diff --git a/inst/tinytest/test_misc.R b/inst/tinytest/test_misc.R index d8f3445b99..64abeeb688 100644 --- a/inst/tinytest/test_misc.R +++ b/inst/tinytest/test_misc.R @@ -2,9 +2,6 @@ library(tinytest) library(tiledb) -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) -if (isOldWindows) exit_file("skip this file on old Windows releases") - ctx <- tiledb_ctx(limitTileDBCores()) if (is.null(get0("tiledb_error_message"))) exit_file("No 'tiledb_error_message'") diff --git a/inst/tinytest/test_query.R b/inst/tinytest/test_query.R index 09a3c41aaf..01d20ed2b5 100644 --- a/inst/tinytest/test_query.R +++ b/inst/tinytest/test_query.R @@ -1,9 +1,6 @@ library(tinytest) library(tiledb) -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) -if (isOldWindows) exit_file("skip this file on old Windows releases") - tiledb_ctx(limitTileDBCores()) .createArray <- function(tmp) { diff --git a/inst/tinytest/test_querycondition.R b/inst/tinytest/test_querycondition.R index 5cdfaff8ff..1dd40683c9 100644 --- a/inst/tinytest/test_querycondition.R +++ b/inst/tinytest/test_querycondition.R @@ -1,9 +1,7 @@ library(tinytest) library(tiledb) -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) isWindows <- Sys.info()[["sysname"]] == "Windows" -if (isOldWindows) exit_file("skip this file on old Windows releases") #if (Sys.getenv("_RUNNING_UNDER_VALGRIND_", "FALSE") == "TRUE" && Sys.Date() < as.Date("2022-08-06")) exit_file("Skipping under valgrind until Aug 6") diff --git a/inst/tinytest/test_sparsematrix.R b/inst/tinytest/test_sparsematrix.R index bde420be31..ee94829509 100644 --- a/inst/tinytest/test_sparsematrix.R +++ b/inst/tinytest/test_sparsematrix.R @@ -1,9 +1,6 @@ library(tinytest) library(tiledb) -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) -if (isOldWindows) exit_file("skip this file on old Windows releases") - ctx <- tiledb_ctx(limitTileDBCores()) if (!requireNamespace("Matrix", quietly=TRUE)) exit_file("Need the 'Matrix' package") diff --git a/inst/tinytest/test_tiledbarray.R b/inst/tinytest/test_tiledbarray.R index 89fca6dd60..dd3d683044 100644 --- a/inst/tinytest/test_tiledbarray.R +++ b/inst/tinytest/test_tiledbarray.R @@ -1,8 +1,6 @@ library(tinytest) library(tiledb) -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) -if (isOldWindows) exit_file("skip this file on old Windows releases") isMacOS <- (Sys.info()['sysname'] == "Darwin") ctx <- tiledb_ctx(limitTileDBCores()) diff --git a/inst/tinytest/test_tiledbarray_extra.R b/inst/tinytest/test_tiledbarray_extra.R index 01c1121442..11891df502 100644 --- a/inst/tinytest/test_tiledbarray_extra.R +++ b/inst/tinytest/test_tiledbarray_extra.R @@ -1,8 +1,7 @@ library(tinytest) library(tiledb) exit_file("Skip for now") -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) -if (isOldWindows) exit_file("skip this file on old Windows releases") + isMacOS <- (Sys.info()['sysname'] == "Darwin") if (tiledb_version(TRUE) < "2.7.0") exit_file("Needs TileDB 2.7.* or later") diff --git a/inst/tinytest/test_timetravel.R b/inst/tinytest/test_timetravel.R index 500b1bb343..bb867869e5 100644 --- a/inst/tinytest/test_timetravel.R +++ b/inst/tinytest/test_timetravel.R @@ -1,8 +1,6 @@ library(tinytest) library(tiledb) -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) -if (isOldWindows) exit_file("skip this file on old Windows releases") isMacOS <- (Sys.info()['sysname'] == "Darwin") ctx <- tiledb_ctx(limitTileDBCores()) diff --git a/inst/tinytest/test_timetravel_extra.R b/inst/tinytest/test_timetravel_extra.R index da1c10ad4c..d318db5308 100644 --- a/inst/tinytest/test_timetravel_extra.R +++ b/inst/tinytest/test_timetravel_extra.R @@ -2,8 +2,6 @@ library(tinytest) library(tiledb) -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) -if (isOldWindows) exit_file("skip this file on old Windows releases") isMacOS <- (Sys.info()['sysname'] == "Darwin") ctx <- tiledb_ctx(limitTileDBCores()) diff --git a/inst/tinytest/test_vfs.R b/inst/tinytest/test_vfs.R index a201c6cc31..15353e78f3 100644 --- a/inst/tinytest/test_vfs.R +++ b/inst/tinytest/test_vfs.R @@ -1,9 +1,6 @@ library(tinytest) library(tiledb) -isOldWindows <- Sys.info()[["sysname"]] == "Windows" && grepl('Windows Server 2008', osVersion) -if (isOldWindows) exit_file("skip this file on old Windows releases") - tiledb_ctx(limitTileDBCores()) #test_that("tiledb_vfs default constructor", {