Skip to content

Commit 552d158

Browse files
committed
switch off all store_bikedata tests on CRAN; closes #72
1 parent 52167d1 commit 552d158

File tree

1 file changed

+33
-35
lines changed

1 file changed

+33
-35
lines changed

tests/testthat/test-store-data.R

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -37,43 +37,41 @@ test_all <- (identical (Sys.getenv ("MPADGE_LOCAL"), "true") |
3737
# To ensure this is failsafe, tests for numbers of stations are simply
3838
# >= 93 + 581 + 456 + 5 + 233 + 700 = 2113
3939

40+
if (test_all)
41+
{
4042

41-
test_that ('write and store data', {
42-
bikedb <- file.path (tempdir (), "testdb")
43-
expect_silent (bike_write_test_data (data_dir = tempdir ()))
44-
expect_silent (n <- store_bikedata (data_dir = tempdir (),
45-
bikedb = bikedb,
46-
quiet = TRUE))
47-
expect_silent (bike_rm_db (bikedb))
48-
expect_message (n <- store_bikedata (data_dir = tempdir (),
49-
bikedb = bikedb,
50-
quiet = FALSE))
51-
expect_true (file.exists (bikedb))
52-
expect_silent (index_bikedata_db (bikedb = bikedb))
53-
# some windows test machines do not allow file deletion, so
54-
# numbers of lines are incremented with each appveyor/CRAN matrix
55-
# test. The following is therefore >= rather than just ==
56-
#expect_equal (n, 1568)
57-
expect_true (n >= 1568)
58-
})
43+
test_that ('write and store data', {
44+
bikedb <- file.path (tempdir (), "testdb")
45+
expect_silent (bike_write_test_data (data_dir = tempdir ()))
46+
expect_silent (n <- store_bikedata (data_dir = tempdir (),
47+
bikedb = bikedb,
48+
quiet = TRUE))
49+
expect_silent (bike_rm_db (bikedb))
50+
expect_message (n <- store_bikedata (data_dir = tempdir (),
51+
bikedb = bikedb,
52+
quiet = FALSE))
53+
expect_true (file.exists (bikedb))
54+
expect_silent (index_bikedata_db (bikedb = bikedb))
55+
# some windows test machines do not allow file deletion, so
56+
# numbers of lines are incremented with each appveyor/CRAN matrix
57+
# test. The following is therefore >= rather than just ==
58+
#expect_equal (n, 1568)
59+
expect_true (n >= 1568)
60+
})
5961

60-
test_that ('stations from downloaded data', {
61-
bikedb <- file.path (tempdir (), "testdb")
62-
st <- bike_stations (bikedb)
63-
if (test_all)
64-
{
65-
# This sometimes fails on some cran windoze machines for some
66-
# reason
62+
test_that ('stations from downloaded data', {
63+
bikedb <- file.path (tempdir (), "testdb")
64+
st <- bike_stations (bikedb)
6765
expect_true (nrow (st) >= 2545)
68-
}
69-
})
66+
})
7067

71-
# some windows machines also don't clean all 13 files up, so this is necessary:
72-
test_that ('remove data', {
73-
expect_true (bike_rm_test_data (data_dir = tempdir ()) >= 10)
74-
})
68+
# some windows machines also don't clean all 13 files up, so this is necessary:
69+
test_that ('remove data', {
70+
expect_true (bike_rm_test_data (data_dir = tempdir ()) >= 10)
71+
})
7572

76-
bikedb <- file.path (tempdir (), "testdb")
77-
chk <- tryCatch (file.remove (bikedb),
78-
warning = function (w) NULL,
79-
error = function (e) NULL)
73+
bikedb <- file.path (tempdir (), "testdb")
74+
chk <- tryCatch (file.remove (bikedb),
75+
warning = function (w) NULL,
76+
error = function (e) NULL)
77+
}

0 commit comments

Comments
 (0)