Updating install asreml and tests

biometryhub · Jul 10, 2024 · 1eae425 · 1eae425
1 parent 46e9033
commit 1eae425
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/R/install_asreml.R b/R/install_asreml.R
@@ -281,11 +281,11 @@ manage_file <- function(save_file, keep_file, filename) {
     }
 
     # If keep_file is FALSE, remove file
-    if(!keep_file) {
+    if(isFALSE(keep_file)) {
         unlink(save_file)
         result <- TRUE
     }
-    else if(keep_file) {
+    else if(isTRUE(keep_file)) {
         # If keep_file is true, copy asreml to current directory
         result <- tryCatch(
             expr = {

diff --git a/tests/testthat/test-zzz_install_asreml.R b/tests/testthat/test-zzz_install_asreml.R
@@ -30,7 +30,8 @@ test_that("Prints message if asreml already installed", {
     skip_on_cran()
     skip_on_ci()
     install_asreml(quiet = TRUE)
-    expect_message(install_asreml(), "ASReml-R is already installed.")
+    expect_message(install_asreml(), 
+                   "The latest version of ASReml-R available for your sysetm is already installed\\. To install anyway, set `force = TRUE`\\.")
 })
 
 test_that("Quiet returns no output", {