Merge pull request #93 from dklein-pik/master

Add testthat result to bot message. Keep testthat log file longterm in tests folder.

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '3560940'
+ValidationKey: '3581447'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'

CITATION.cff

@@ -2,8 +2,8 @@ cff-version: 1.2.0
 message: If you use this software, please cite it using the metadata from this file.
 type: software
 title: 'modelstats: Run Analysis Tools'
-version: 0.18.0
-date-released: '2024-03-01'
+version: 0.18.1
+date-released: '2024-03-05'
 abstract: A collection of tools to analyze model runs.
 authors:
 - family-names: Giannousakis

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: modelstats
 Type: Package
 Title: Run Analysis Tools
-Version: 0.18.0
-Date: 2024-03-01
+Version: 0.18.1
+Date: 2024-03-05
 Authors@R: c(
     person("Anastasis", "Giannousakis", email = "[email protected]", role = c("aut","cre")),
     person("Oliver", "Richters", role = "aut")

R/modeltests.R

@@ -154,9 +154,7 @@ startRuns <- function(test, model, mydir, gitPath, user) {
       withr::with_dir("magpie", {
             system(paste0(gitPath, " reset --hard origin/develop && ", gitPath, " pull"))
       })
-      # 2. rename old test-full.log
-      system("mv test-full.log test-full-previous.log")
-      # 3. execute test
+      # 2. execute test
       system("make test-full-slurm")
 
     } else if (model == "MAgPIE") {
@@ -371,16 +369,22 @@ evaluateRuns <- function(model, mydir, gitPath, compScen, email, mattermostToken
     }
 
     # Evaluate result of tests/testthat
-    logStatus <- NULL
-    try(logStatus <- readLines("../test-full.log", warn = FALSE))
-    if (is.null(logStatus)) {
-      testthatResult <- "Could not check for the results of TESTTHAT, test-full.log not found"
-    } else if (! any(grep("FAIL", logStatus))) {
-      testthatResult <- "`make test-full` did not run properly. Check test-full.log"
-    } else if (any(grep("FAIL 1", logStatus))) {
-      testthatResult <- "Some tests FAIL in `make test-full`. Check test-full.log"
+    currentName <- "../test-full.log"
+    dateTag <- format(file.info(currentName)$mtime, "%Y-%m-%d")
+    if (is.na(dateTag)) {
+      testthatResult <- "Could not check for the results of `make test-full`, test-full.log not found"
     } else {
-      # "make test-full reports all tests PASS"
+      logStatus <- readLines(currentName, warn = FALSE)
+      logStatus <- tail(grep("\\[ FAIL", logStatus, value = TRUE))
+      newName <- paste0("tests/test-full-", dateTag, ".log")
+      file.rename(from = currentName, to = paste0("../", newName))
+      if (!isTRUE(grepl("FAIL", logStatus))) {
+        testthatResult <- paste("`make test-full` did not run properly. Check", newName)
+      } else if (!isTRUE(grepl("FAIL 0", logStatus) & grepl("WARN 0", logStatus))) {
+        testthatResult <- paste0("Not all tests pass in `make test-full`: ", logStatus ,". Check ", newName)
+      } else {
+        testthatResult <- paste("All tests pass in `make test-full`:", logStatus)
+      }
     }
   }
 

README.md

@@ -1,6 +1,6 @@
 # Run Analysis Tools
 
-R package **modelstats**, version **0.18.0**
+R package **modelstats**, version **0.18.1**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/modelstats)](https://cran.r-project.org/package=modelstats)  [![R build status](https://github.com/pik-piam/modelstats/workflows/check/badge.svg)](https://github.com/pik-piam/modelstats/actions) [![codecov](https://codecov.io/gh/pik-piam/modelstats/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/modelstats) [![r-universe](https://pik-piam.r-universe.dev/badges/modelstats)](https://pik-piam.r-universe.dev/builds)
 
@@ -47,7 +47,7 @@ In case of questions / problems please contact Anastasis Giannousakis <giannou@p
 
 To cite package **modelstats** in publications use:
 
-Giannousakis A, Richters O (2024). _modelstats: Run Analysis Tools_. R package version 0.18.0, <https://github.com/pik-piam/modelstats>.
+Giannousakis A, Richters O (2024). _modelstats: Run Analysis Tools_. R package version 0.18.1, <https://github.com/pik-piam/modelstats>.
 
 A BibTeX entry for LaTeX users is
 
@@ -56,7 +56,7 @@ A BibTeX entry for LaTeX users is
   title = {modelstats: Run Analysis Tools},
   author = {Anastasis Giannousakis and Oliver Richters},
   year = {2024},
-  note = {R package version 0.18.0},
+  note = {R package version 0.18.1},
   url = {https://github.com/pik-piam/modelstats},
 }
 ```