Skip to content

Commit 60e338e

Browse files
committed
Set package checking to as cran. All parallel = FALSE
1 parent 6e7c61e commit 60e338e

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

adegenet.Rproj

+1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@ PackageUseDevtools: Yes
1717
PackageInstallArgs: --no-multiarch --with-keep.source --install-tests
1818
PackageBuildArgs: --resave-data
1919
PackageBuildBinaryArgs: --html --latex
20+
PackageCheckArgs: --as-cran
2021
PackageRoxygenize: rd,collate,namespace

tests/testthat/test_genlight.R

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
context("Genlight construction")
22

33
test_that("Genlight objects can be created predictably", {
4-
expect_warning(a <- new("genlight", list(c(1,0,1), c(0,0,1,0)) ))
5-
expect_warning(b <- new("genlight", list(c(1,0,1,1,1,1), c(1,0)) ))
4+
skip_on_cran()
5+
expect_warning(a <- new("genlight", list(c(1,0,1), c(0,0,1,0)), parallel = FALSE ))
6+
expect_warning(b <- new("genlight", list(c(1,0,1,1,1,1), c(1,0)), parallel = FALSE ))
67
locNames(a) <- letters[1:4]
78
locNames(b) <- 1:6
89
c <- cbind(a, b)
@@ -14,7 +15,8 @@ test_that("Genlight objects can be created predictably", {
1415

1516

1617
test_that("subsetting with/without @other works", {
17-
x <- new("genlight", list(a=1,b=0,c=1), other=list(1:3, letters, data.frame(2:4)))
18+
skip_on_cran()
19+
x <- new("genlight", list(a=1,b=0,c=1), other=list(1:3, letters, data.frame(2:4)), parallel = FALSE)
1820
pop(x) <- c("pop1","pop1", "pop2")
1921
expect_that(x[1:2, ]@other[[1]], equals(1:2))
2022
expect_that(x[1:2, ]@other[[2]], equals(letters))

tests/testthat/test_hierarchy.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ test_that("Hierarchy methods work for genlight objects", {
2525
michier <- data.frame(other(microbov))
2626
make_gl <- function(n = 10, hier = michier){
2727
objs <- lapply(seq(n), function(x) sample(c(0, 1, NA), 10, replace = TRUE, prob = c(0.49, 0.49, 0.01)))
28-
return(new("genlight", objs, hierarchy = hier[sample(704, 10), sample(3, 2)]))
28+
return(new("genlight", objs, hierarchy = hier[sample(704, 10), sample(3, 2)], parallel = FALSE))
2929
}
3030
set.seed(9999)
3131
glTest <- lapply(1:10, function(x, y, z) make_gl(y, z), 10, michier)

0 commit comments

Comments
 (0)