Reduce testing on CRAN serversv1.2.0

4 files changed, 7 insertions, 6 deletions

diff --git a/log/build.log b/log/build.log
index c4f9b8a2..a56a64df 100644
--- a/log/build.log
+++ b/log/build.log
@@ -6,4 +6,3 @@
 * checking for LF line-endings in source and make files and shell scripts
 * checking for empty or unneeded directories
 * building ‘mkin_1.2.0.tar.gz’
-
diff --git a/tests/testthat/test_dmta.R b/tests/testthat/test_dmta.R
index 30c5d7c4..c44cdac8 100644
--- a/tests/testthat/test_dmta.R
+++ b/tests/testthat/test_dmta.R
@@ -11,13 +11,13 @@ names(dmta_ds) <- sapply(dimethenamid_2018$ds, function(ds) ds$title)
 dmta_ds[["Elliot"]] <- rbind(dmta_ds[["Elliot 1"]], dmta_ds[["Elliot 2"]])
 dmta_ds[["Elliot 1"]] <- dmta_ds[["Elliot 2"]] <- NULL
 
-# mkin
-dmta_dfop <- mmkin("DFOP", dmta_ds, quiet = TRUE, cores = n_cores)
-dmta_dfop_tc <- mmkin("DFOP", dmta_ds, error_model = "tc", quiet = TRUE, cores = n_cores)
-
 test_that("Different backends get consistent results for DFOP tc, dimethenamid data", {
 
   skip_on_cran() # Time constraints
+  # mkin
+  dmta_dfop <- mmkin("DFOP", dmta_ds, quiet = TRUE, cores = n_cores)
+  dmta_dfop_tc <- mmkin("DFOP", dmta_ds, error_model = "tc", quiet = TRUE, cores = n_cores)
+
   # nlme
   expect_warning(
     nlme_dfop_tc <- nlme(dmta_dfop_tc),
diff --git a/tests/testthat/test_multistart.R b/tests/testthat/test_multistart.R
index 5803b62c..98d3fb6d 100644
--- a/tests/testthat/test_multistart.R
+++ b/tests/testthat/test_multistart.R
@@ -1,6 +1,7 @@
 context("Multistart method for saem.mmkin models")
 
 test_that("multistart works for saem.mmkin models", {
+  skip_on_cran() # Save CRAN time
   set.seed(123456)
   saem_sfo_s_multi <- multistart(sfo_saem_1_reduced, n = 8, cores = n_cores,
     no_random_effect = "parent_0")
@@ -16,7 +17,6 @@ test_that("multistart works for saem.mmkin models", {
   expect_equal(round(anova_sfo, 1)["best(saem_sfo_s_multi)", "AIC"], 1309.7)
   expect_true(anova_sfo[3, "Pr(>Chisq)"] > 0.2) # Local: 1, CRAN: 0.4
 
-  skip_on_cran() # Save CRAN time
   set.seed(123456)
   saem_biphasic_m_multi <- multistart(saem_biphasic_m, n = 8,
     cores = n_cores)
diff --git a/tests/testthat/test_nafta.R b/tests/testthat/test_nafta.R
index 8eb052c5..b89ea342 100644
--- a/tests/testthat/test_nafta.R
+++ b/tests/testthat/test_nafta.R
@@ -4,6 +4,7 @@ test_that("Data for more than one compound are rejected",
   expect_error(nafta(FOCUS_2006_D, cores = 1)))
 
 test_that("Test data from Appendix B are correctly evaluated", {
+  skip_on_cran()
   expect_message(res <- nafta(NAFTA_SOP_Appendix_B, "aerobic aquatic", cores = 1))
 
   # From Figure D.1
@@ -25,6 +26,7 @@ test_that("Test data from Appendix B are correctly evaluated", {
 })
 
 test_that("Test data from Appendix D are correctly evaluated", {
+  skip_on_cran()
   # We are not interested in the warnings about non-normal residuals here
   suppressWarnings(
   res <- nafta(NAFTA_SOP_Appendix_D, "MRID 555555",