diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2018-09-20 22:03:13 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2018-09-20 22:03:13 +0200 |
| commit | 9812feb39b079fec535f5affc6adaefc23bf6d9e (patch) | |
| tree | 60d2076416ed6e3ac640ef5853de2f64e108ff43 /tests | |
| parent | 72aa423cef7ba610d76220ec3a2697ffbf48417a (diff) | |
Fix tests
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testthat/test_irls.R | 2 | ||||
| -rw-r--r-- | tests/testthat/test_twa.R | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tests/testthat/test_irls.R b/tests/testthat/test_irls.R index b6b91d43..ffa2bb26 100644 --- a/tests/testthat/test_irls.R +++ b/tests/testthat/test_irls.R @@ -42,7 +42,7 @@ test_that("Reweighting method 'obs' works", { test_that("Reweighting method 'tc' works", { skip_on_cran() - skip() + skip("IRLS reweighting with method 'tc' is currently under construction") fit_irls_2 <- mkinfit(m_synth_DFOP_par, DFOP_par_c, reweight.method = "tc", quiet = TRUE) parms_2 <- signif(fit_irls_2$bparms.optim, 3) expect_equivalent(parms_2, c(99.3, 0.041, 0.00962, 0.597, 0.393, 0.298, 0.0203, 0.707)) diff --git a/tests/testthat/test_twa.R b/tests/testthat/test_twa.R index 0b187dbd..9151ed42 100644 --- a/tests/testthat/test_twa.R +++ b/tests/testthat/test_twa.R @@ -22,7 +22,12 @@ context("Calculation of maximum time weighted average concentrations (TWAs)") test_that("Time weighted average concentrations are correct", { skip_on_cran() twa_models <- c("SFO", "FOMC", "DFOP", "HS") - travis <- Sys.getenv("TRAVIS") + travis_env <- Sys.getenv("TRAVIS") + if (travis_env == "") { + travis <- FALSE + } else { + travis <- TRUE + } fits <- mmkin(twa_models, list(FOCUS_C = FOCUS_2006_C, FOCUS_D = FOCUS_2006_D), quiet = TRUE, cores = if (travis) 1 else 8) |