test that manipulateFile does not destroy comments. Needs lucode2#205

remindmodel · Aug 5, 2024 · 71094c9 · 71094c9
1 parent b250c0a
commit 71094c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -36,7 +36,7 @@ Imports:
     knitr,
     lazyeval,
     lpjclass,
-    lucode2 (>= 0.47.8),
+    lucode2 (>= 0.47.9),
     luplot,
     luscale,
     lusweave,

diff --git a/tests/testthat/test_01-manipulateConfig.R b/tests/testthat/test_01-manipulateConfig.R
@@ -10,12 +10,7 @@ test_that("manipulate config with default configuration does not change main.gms
   diffresult <- NULL
   diffavailable <- ! Sys.which("diff") == ""
   if (diffavailable) {
-    diffresult <- suppressWarnings(system(paste("diff -b ../../main.gms", tmpfile), intern = TRUE))
-    # drop all sorts of comments until https://github.com/pik-piam/lucode2/issues/121 is fixed
-    drop <- c("^< \\*\\*\\*", "^> \\*\\*\\*", "^> \\*' \\*", "^< \\*' \\*", "^---$", "^[0-9,]+c[0-9,]+$")
-    for (d in drop) {
-      diffresult <- grep(d, diffresult, value = TRUE, invert = TRUE)
-    }
+    diffresult <- suppressWarnings(system(paste("diff ../../main.gms", tmpfile), intern = TRUE))
     if (length(diffresult) > 0) {
       warning("Applying manipulateConfig with the default configuration leads to this diff between main.gms and ",
               basename(tmpfile), ":\n",