Use two assignments to avoid skipping another test

2 files changed, 16 insertions, 16 deletions

diff --git a/test.log b/test.log
index 09dd4c3f..af73d96a 100644
--- a/test.log
+++ b/test.log
@@ -6,34 +6,30 @@ Testing mkin
 ✔ |   4       | Calculation of FOCUS chi2 error levels [2.2 s]
 ✔ |   4       | Fitting the SFORB model [1.7 s]
 ✔ |   5       | Calculation of Akaike weights
-✔ |  10       | Confidence intervals and p-values [9.4 s]
-✔ |  14       | Error model fitting [38.4 s]
+✔ |  10       | Confidence intervals and p-values [9.5 s]
+✔ |  14       | Error model fitting [37.6 s]
 ✔ |   6       | Test fitting the decline of metabolites from their maximum [0.8 s]
 ✔ |   1       | Fitting the logistic model [0.9 s]
 ✔ |   1       | Test dataset class mkinds used in gmkin
-✔ |  12       | Special cases of mkinfit calls [2.4 s]
+✔ |  12       | Special cases of mkinfit calls [2.3 s]
 ✔ |   9       | mkinmod model generation and printing [0.2 s]
-✔ |   3       | Model predictions with mkinpredict [0.3 s]
-✔ |  16       | Evaluations according to 2015 NAFTA guidance [4.2 s]
+✔ |   3       | Model predictions with mkinpredict [0.4 s]
+✔ |  16       | Evaluations according to 2015 NAFTA guidance [4.1 s]
 ✔ |   3       | Nonlinear mixed-effects models [2.1 s]
 ✔ |   4       | Calculation of maximum time weighted average concentrations (TWAs) [2.2 s]
 ✔ |   3       | Summary
 ✔ |  11       | Plotting [0.6 s]
 ✔ |   4       | AIC calculation
 ✔ |   2       | Residuals extracted from mkinfit models
-✔ |   2       | Complex test case from Schaefer et al. (2007) Piacenza paper [5.5 s]
+✔ |   2       | Complex test case from Schaefer et al. (2007) Piacenza paper [5.2 s]
 ✔ |   1       | Summaries of old mkinfit objects
-✔ |   4       | Results for synthetic data established in expertise for UBA (Ranke 2014) [7.2 s]
-✔ |   7     1 | Hypothesis tests [34.0 s]
-────────────────────────────────────────────────────────────────────────────────
-test_tests.R:60: skip: We can do a likelihood ratio test using an update specification
-Reason: This errors out if called by testthat while it works in a normal R session
-────────────────────────────────────────────────────────────────────────────────
+✔ |   4       | Results for synthetic data established in expertise for UBA (Ranke 2014) [7.0 s]
+✔ |   9       | Hypothesis tests [36.7 s]
 
 ══ Results ═════════════════════════════════════════════════════════════════════
-Duration: 115.8 s
+Duration: 117.1 s
 
-OK:       141
+OK:       143
 Failed:   0
 Warnings: 0
-Skipped:  1
+Skipped:  0
diff --git a/tests/testthat/test_tests.R b/tests/testthat/test_tests.R
index ddf8e1a0..3d1c136c 100644
--- a/tests/testthat/test_tests.R
+++ b/tests/testthat/test_tests.R
@@ -57,7 +57,11 @@ test_that("Updating fitted models works", {
 })
 
 test_that("We can do a likelihood ratio test using an update specification", {
-  skip("This errors out if called by testthat while it works in a normal R session")
+  # The following two assignments were made so the update.mkinfit function called
+  # by lrtest.mkinfit finds these objects when lrtest.mkinfit is called by
+  # testthat
+  assign("f_2_mkin", f_2_mkin, globalenv())
+  assign("DFOP_par_c", DFOP_par_c, globalenv())
   test_2_mkin_k2 <- lrtest(f_2_mkin, fixed_parms = c(k2 = 0))
   expect_equivalent(test_2_mkin_k2[["2", "Pr(>Chisq)"]], 4.851e-8, tolerance = 1e-8)
   test_2_mkin_tc <- lrtest(f_2_mkin, error_model = "tc")