From 595eed5d39301b338f0588c7d9f4d72a95c86211 Mon Sep 17 00:00:00 2001
From: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
Date: Wed, 14 Oct 2026 15:18:53 +0300
Subject: [PATCH 01/11] Made testall fail regular acceptance tests which log
 errors

Tests that print Pass message but have logs errors will fail with `FAIL (Error printed)` message.
Tests which are expected to log errors should use `.error.cf` or `.error.pass.cf` suffix. see: `tests/acceptance/README`

Ticket: CFE-3041
Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
---
 tests/acceptance/README  |  7 +++++++
 tests/acceptance/testall | 14 ++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/tests/acceptance/README b/tests/acceptance/README
index 2435b57b224..b192cb5995c 100644
--- a/tests/acceptance/README
+++ b/tests/acceptance/README
@@ -113,6 +113,13 @@ case letters and underscores only. If the test is expected to generate an error
 additional '.x' suffix before '.cf' (e.g. 'string_vars.x.cf'). A crash will
 still cause a failure.
 
+Regular tests (without any special suffix) fail if they log any errors, even
+if they print the Pass message. If the test is expected to log errors (e.g. it
+contains promises which are intentionally not kept), it should have an
+additional '.error' suffix before '.cf' (e.g. 'bad_perms.error.cf'), in which
+case it passes as long as it logs at least one error and exits with 0. If it
+should also print the Pass message, use the '.error.pass.cf' suffix instead.
+
 Tests which are not expected to pass yet (e.g. there is a bug in code which
 prevents tests from passing) should be placed in 'staging' subdirectory in the
 test directory where they belong. Such test cases will be only run if --staging
diff --git a/tests/acceptance/testall b/tests/acceptance/testall
index 621ee4efe87..2579b4ac268 100755
--- a/tests/acceptance/testall
+++ b/tests/acceptance/testall
@@ -216,6 +216,8 @@ usage() {
     echo "If no test is given, all standard tests are run:"
     echo "  Tests with names of form <file>.cf are expected to run successfully"
     echo "  Tests with names of form <file>.x.cf are expected to exit with error"
+    echo "  Tests with names of form <file>.error.cf are expected to log error(s) and exit with 0"
+    echo "  Tests with names of form <file>.error.pass.cf are expected to log error(s), pass and exit with 0"
     echo "Set ${COLOR_SUCCESS}CFENGINE_COLOR=1${COLOR_NORMAL} to get ANSI color markers where appropriate."
     echo
     echo "If arguments are given, those are executed as tests"
@@ -645,8 +647,16 @@ export CFENGINE_TEST_OVERRIDE_WORKDIR TEMP CFENGINE_TEST_OVERRIDE_EXTENSION_LIBR
                 fi
             elif grep -E "R: .*$ESCAPED_TEST Pass" $OUTFILE > /dev/null
             then
-                RESULT=Pass
-                RESULT_MSG="${COLOR_SUCCESS}Pass${COLOR_NORMAL}"
+                # Regular tests must not log errors, tests which are expected
+                # to log errors should be named *.error.cf or *.error.pass.cf
+                if grep -E '^ *error: ' $OUTFILE > /dev/null
+                then
+                    RESULT=FAIL
+                    RESULT_MSG="${COLOR_FAILURE}FAIL (Error printed)${COLOR_NORMAL}"
+                else
+                    RESULT=Pass
+                    RESULT_MSG="${COLOR_SUCCESS}Pass${COLOR_NORMAL}"
+                fi
             elif grep -E "R: .*$ESCAPED_TEST Skip/unsupported" $OUTFILE > /dev/null
             then
                 RESULT=Skip

From e772fd5b6a8560704c03db1bb0a97d84aefc0297 Mon Sep 17 00:00:00 2001
From: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
Date: Thu, 15 Oct 2026 14:21:10 +0300
Subject: [PATCH 02/11] Added fileexists() guards to file reads in acceptance
 tests

These tests read files created by their own init bundle, but pre-evaluation calls the read functions before the files exist, logging "Could not examine file" errors which now fail regular tests.

Ticket: CFE-3041
Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
---
 .../01_vars/01_basic/this_promiser_with_readjson.cf      | 3 ++-
 tests/acceptance/01_vars/02_functions/011.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/012.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/013.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/014.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/015.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/016.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/017.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/018.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/019.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/020.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/021.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/024.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/025.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/026.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/027.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/028.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/029.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/030.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/031.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/032.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/033.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/034.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/037.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/038.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/039.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/040.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/041.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/042.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/043.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/044.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/045.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/046.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/047.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/050.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/400.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/401.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/410.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/420.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/421.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/440.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/441.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/442.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/443.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/444.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/445.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/447.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/450.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/500.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/501.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/520.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/521.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/600.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/601.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/620.cf             | 3 ++-
 tests/acceptance/01_vars/02_functions/621.cf             | 3 ++-
 .../01_vars/02_functions/classfilterdata_collecting.cf   | 3 ++-
 .../01_vars/02_functions/long_string_from_text_file.cf   | 3 ++-
 ...sestringarray_dontread_comment_duplicate_lastline2.cf | 3 ++-
 ...ngarray_weird_indices_real_comments_noemptyfields2.cf | 3 ++-
 tests/acceptance/01_vars/02_functions/peers.cf           | 9 ++++++---
 tests/acceptance/01_vars/02_functions/read_empty_file.cf | 6 ++++--
 ...stringarray_dontread_comment_duplicatekey_lastline.cf | 3 ++-
 .../01_vars/02_functions/readstringarrayidx_order.cf     | 3 ++-
 tests/acceptance/01_vars/04_containers/readjson.cf       | 3 ++-
 .../acceptance/01_vars/04_containers/readjson_arrays.cf  | 3 ++-
 tests/acceptance/01_vars/04_containers/readjson_new.cf   | 3 ++-
 tests/acceptance/01_vars/04_containers/readjson_null.cf  | 3 ++-
 .../acceptance/01_vars/04_containers/readjson_objects.cf | 3 ++-
 .../acceptance/01_vars/04_containers/readjson_scalar.cf  | 3 ++-
 .../01_vars/04_containers/readjson_subindex.cf           | 3 ++-
 .../01_vars/04_containers/readjson_subindex_quoted.cf    | 3 ++-
 tests/acceptance/08_commands/arglist.cf                  | 3 ++-
 .../09_insert_lines/preserve_block_blank_lines.cf        | 3 ++-
 .../10_files/templating/empty_template_empty_file.cf     | 3 ++-
 tests/acceptance/10_files/templating/mustache_abuse.cf   | 3 ++-
 .../10_files/templating/mustache_datastate_demo.cf       | 3 ++-
 tests/acceptance/10_files/templating/mustache_demo.cf    | 3 ++-
 .../templating/mustache_expect_list_find_string.cf       | 6 ++++--
 .../10_files/templating/mustache_html_escape.cf          | 3 ++-
 .../10_files/templating/mustache_inline_demo.cf          | 3 ++-
 .../10_files/templating/mustache_render_quote.cf         | 3 ++-
 .../10_files/templating/mustache_repair_existing.cf      | 3 ++-
 tests/acceptance/31_tickets/CFE-3866/test.cf             | 3 ++-
 84 files changed, 176 insertions(+), 88 deletions(-)

diff --git a/tests/acceptance/01_vars/01_basic/this_promiser_with_readjson.cf b/tests/acceptance/01_vars/01_basic/this_promiser_with_readjson.cf
index 60cfff7563f..4d7d32a549b 100644
--- a/tests/acceptance/01_vars/01_basic/this_promiser_with_readjson.cf
+++ b/tests/acceptance/01_vars/01_basic/this_promiser_with_readjson.cf
@@ -26,7 +26,8 @@ bundle agent test
 {
   vars:
     "cf_promises_validated"
-      data => readjson("$(G.testfile).$(this.promiser)", 1K);
+      data => readjson("$(G.testfile).$(this.promiser)", 1K),
+      if => fileexists("$(G.testfile).$(this.promiser)");
 
     "printable" string => format("%S", "cf_promises_validated");
 
diff --git a/tests/acceptance/01_vars/02_functions/011.cf b/tests/acceptance/01_vars/02_functions/011.cf
index 0405b37d51a..93a5a1c3384 100644
--- a/tests/acceptance/01_vars/02_functions/011.cf
+++ b/tests/acceptance/01_vars/02_functions/011.cf
@@ -37,7 +37,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/012.cf b/tests/acceptance/01_vars/02_functions/012.cf
index 6ace98654cb..55de4ce5573 100644
--- a/tests/acceptance/01_vars/02_functions/012.cf
+++ b/tests/acceptance/01_vars/02_functions/012.cf
@@ -38,7 +38,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/013.cf b/tests/acceptance/01_vars/02_functions/013.cf
index 1708bbaddc0..4e493478c13 100644
--- a/tests/acceptance/01_vars/02_functions/013.cf
+++ b/tests/acceptance/01_vars/02_functions/013.cf
@@ -37,7 +37,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/014.cf b/tests/acceptance/01_vars/02_functions/014.cf
index 716e8873390..c981a70bac4 100644
--- a/tests/acceptance/01_vars/02_functions/014.cf
+++ b/tests/acceptance/01_vars/02_functions/014.cf
@@ -37,7 +37,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\.", 5, 100);
+    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\.", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/015.cf b/tests/acceptance/01_vars/02_functions/015.cf
index c515ba037d5..f96df7ab224 100644
--- a/tests/acceptance/01_vars/02_functions/015.cf
+++ b/tests/acceptance/01_vars/02_functions/015.cf
@@ -37,7 +37,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/016.cf b/tests/acceptance/01_vars/02_functions/016.cf
index 0688544a875..2b7482ddb8f 100644
--- a/tests/acceptance/01_vars/02_functions/016.cf
+++ b/tests/acceptance/01_vars/02_functions/016.cf
@@ -38,7 +38,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/017.cf b/tests/acceptance/01_vars/02_functions/017.cf
index b9cfa15a1bc..0b15619d31e 100644
--- a/tests/acceptance/01_vars/02_functions/017.cf
+++ b/tests/acceptance/01_vars/02_functions/017.cf
@@ -38,7 +38,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/018.cf b/tests/acceptance/01_vars/02_functions/018.cf
index d72de43df26..4173999135b 100644
--- a/tests/acceptance/01_vars/02_functions/018.cf
+++ b/tests/acceptance/01_vars/02_functions/018.cf
@@ -37,7 +37,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/019.cf b/tests/acceptance/01_vars/02_functions/019.cf
index 6b1af5b6871..d269fda0c69 100644
--- a/tests/acceptance/01_vars/02_functions/019.cf
+++ b/tests/acceptance/01_vars/02_functions/019.cf
@@ -37,7 +37,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "X", 5, 100);
+    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "X", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/020.cf b/tests/acceptance/01_vars/02_functions/020.cf
index cc59c326708..3a1a1fe0723 100644
--- a/tests/acceptance/01_vars/02_functions/020.cf
+++ b/tests/acceptance/01_vars/02_functions/020.cf
@@ -37,7 +37,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s", 5, 100);
+    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/021.cf b/tests/acceptance/01_vars/02_functions/021.cf
index 8032a987cc5..f62d85462bb 100644
--- a/tests/acceptance/01_vars/02_functions/021.cf
+++ b/tests/acceptance/01_vars/02_functions/021.cf
@@ -37,7 +37,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", ",", 5, 100);
+    "nums" slist => readstringlist("$(G.testfile)", "NoComment", ",", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/024.cf b/tests/acceptance/01_vars/02_functions/024.cf
index 74df030785c..6f7382d12d2 100644
--- a/tests/acceptance/01_vars/02_functions/024.cf
+++ b/tests/acceptance/01_vars/02_functions/024.cf
@@ -36,7 +36,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/025.cf b/tests/acceptance/01_vars/02_functions/025.cf
index 3d6351e52c1..4c7c07f1079 100644
--- a/tests/acceptance/01_vars/02_functions/025.cf
+++ b/tests/acceptance/01_vars/02_functions/025.cf
@@ -37,7 +37,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/026.cf b/tests/acceptance/01_vars/02_functions/026.cf
index 50b0cf1ec32..5e0ea912cc8 100644
--- a/tests/acceptance/01_vars/02_functions/026.cf
+++ b/tests/acceptance/01_vars/02_functions/026.cf
@@ -36,7 +36,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/027.cf b/tests/acceptance/01_vars/02_functions/027.cf
index 55a80306d4f..75e7c539cd5 100644
--- a/tests/acceptance/01_vars/02_functions/027.cf
+++ b/tests/acceptance/01_vars/02_functions/027.cf
@@ -36,7 +36,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\.", 5, 100);
+    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\.", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/028.cf b/tests/acceptance/01_vars/02_functions/028.cf
index 322b4fa70a3..850cbb5fc44 100644
--- a/tests/acceptance/01_vars/02_functions/028.cf
+++ b/tests/acceptance/01_vars/02_functions/028.cf
@@ -36,7 +36,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/029.cf b/tests/acceptance/01_vars/02_functions/029.cf
index 3a746744265..b15d19dcffa 100644
--- a/tests/acceptance/01_vars/02_functions/029.cf
+++ b/tests/acceptance/01_vars/02_functions/029.cf
@@ -37,7 +37,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/030.cf b/tests/acceptance/01_vars/02_functions/030.cf
index c5e438f364f..3938eda2acb 100644
--- a/tests/acceptance/01_vars/02_functions/030.cf
+++ b/tests/acceptance/01_vars/02_functions/030.cf
@@ -37,7 +37,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/031.cf b/tests/acceptance/01_vars/02_functions/031.cf
index d40f59a1035..dd199a7d122 100644
--- a/tests/acceptance/01_vars/02_functions/031.cf
+++ b/tests/acceptance/01_vars/02_functions/031.cf
@@ -36,7 +36,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/032.cf b/tests/acceptance/01_vars/02_functions/032.cf
index 742c4e4f0b2..2c0d4cf6c0f 100644
--- a/tests/acceptance/01_vars/02_functions/032.cf
+++ b/tests/acceptance/01_vars/02_functions/032.cf
@@ -36,7 +36,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "X", 5, 100);
+    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "X", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/033.cf b/tests/acceptance/01_vars/02_functions/033.cf
index e90f323f897..7e3a5d367d3 100644
--- a/tests/acceptance/01_vars/02_functions/033.cf
+++ b/tests/acceptance/01_vars/02_functions/033.cf
@@ -36,7 +36,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s", 5, 100);
+    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/034.cf b/tests/acceptance/01_vars/02_functions/034.cf
index e9d1dbfafcf..38abced469c 100644
--- a/tests/acceptance/01_vars/02_functions/034.cf
+++ b/tests/acceptance/01_vars/02_functions/034.cf
@@ -36,7 +36,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", ",", 5, 100);
+    "nums" ilist => readintlist("$(G.testfile)", "NoComment", ",", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/037.cf b/tests/acceptance/01_vars/02_functions/037.cf
index 770c373c58c..6e65a785ceb 100644
--- a/tests/acceptance/01_vars/02_functions/037.cf
+++ b/tests/acceptance/01_vars/02_functions/037.cf
@@ -36,7 +36,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/038.cf b/tests/acceptance/01_vars/02_functions/038.cf
index 26eabcf4638..4fc8fb18a79 100644
--- a/tests/acceptance/01_vars/02_functions/038.cf
+++ b/tests/acceptance/01_vars/02_functions/038.cf
@@ -37,7 +37,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/039.cf b/tests/acceptance/01_vars/02_functions/039.cf
index 53dd4046be4..6f72f753c8c 100644
--- a/tests/acceptance/01_vars/02_functions/039.cf
+++ b/tests/acceptance/01_vars/02_functions/039.cf
@@ -36,7 +36,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/040.cf b/tests/acceptance/01_vars/02_functions/040.cf
index 3ba0f3c2dba..4c10aaa8d9d 100644
--- a/tests/acceptance/01_vars/02_functions/040.cf
+++ b/tests/acceptance/01_vars/02_functions/040.cf
@@ -36,7 +36,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\.", 5, 100);
+    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\.", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/041.cf b/tests/acceptance/01_vars/02_functions/041.cf
index 61608635fd5..7fefc1cb209 100644
--- a/tests/acceptance/01_vars/02_functions/041.cf
+++ b/tests/acceptance/01_vars/02_functions/041.cf
@@ -36,7 +36,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/042.cf b/tests/acceptance/01_vars/02_functions/042.cf
index ee96964fae0..a1e160b2a42 100644
--- a/tests/acceptance/01_vars/02_functions/042.cf
+++ b/tests/acceptance/01_vars/02_functions/042.cf
@@ -37,7 +37,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/043.cf b/tests/acceptance/01_vars/02_functions/043.cf
index 7a9427aed85..54b5bff2c65 100644
--- a/tests/acceptance/01_vars/02_functions/043.cf
+++ b/tests/acceptance/01_vars/02_functions/043.cf
@@ -37,7 +37,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/044.cf b/tests/acceptance/01_vars/02_functions/044.cf
index 6b0e85e0c7f..a28458dcc12 100644
--- a/tests/acceptance/01_vars/02_functions/044.cf
+++ b/tests/acceptance/01_vars/02_functions/044.cf
@@ -36,7 +36,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100);
+    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/045.cf b/tests/acceptance/01_vars/02_functions/045.cf
index 0cddcd75623..4aaa3c1fd7f 100644
--- a/tests/acceptance/01_vars/02_functions/045.cf
+++ b/tests/acceptance/01_vars/02_functions/045.cf
@@ -36,7 +36,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "X", 5, 100);
+    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "X", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/046.cf b/tests/acceptance/01_vars/02_functions/046.cf
index 41a076f5609..251535cd8bb 100644
--- a/tests/acceptance/01_vars/02_functions/046.cf
+++ b/tests/acceptance/01_vars/02_functions/046.cf
@@ -36,7 +36,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s", 5, 100);
+    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/047.cf b/tests/acceptance/01_vars/02_functions/047.cf
index c8c73e774ed..b6b1384ee9b 100644
--- a/tests/acceptance/01_vars/02_functions/047.cf
+++ b/tests/acceptance/01_vars/02_functions/047.cf
@@ -36,7 +36,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", ",", 5, 100);
+    "nums" rlist => readreallist("$(G.testfile)", "NoComment", ",", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/050.cf b/tests/acceptance/01_vars/02_functions/050.cf
index b0d9b0b64db..b53302a9df0 100644
--- a/tests/acceptance/01_vars/02_functions/050.cf
+++ b/tests/acceptance/01_vars/02_functions/050.cf
@@ -36,7 +36,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\.", 5, 100);
+    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\.", 5, 100),
+      if => fileexists("$(G.testfile)");
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/400.cf b/tests/acceptance/01_vars/02_functions/400.cf
index bc6edf6d783..da20512b37c 100644
--- a/tests/acceptance/01_vars/02_functions/400.cf
+++ b/tests/acceptance/01_vars/02_functions/400.cf
@@ -45,7 +45,8 @@ bundle agent test
     "cnt"
       int => readstringarray(
         "ary", "$(G.testfile)", "NoComment", ":", 10, 1000
-      );
+      ),
+      if => fileexists("$(G.testfile)");
 
     "num" int => "3";
 }
diff --git a/tests/acceptance/01_vars/02_functions/401.cf b/tests/acceptance/01_vars/02_functions/401.cf
index fd2f2da1be3..f06d4999a61 100644
--- a/tests/acceptance/01_vars/02_functions/401.cf
+++ b/tests/acceptance/01_vars/02_functions/401.cf
@@ -45,7 +45,8 @@ bundle agent test
     "cnt"
       int => readstringarray(
         "ary", "$(G.testfile)", "NoComment", ":", 10, 1000
-      );
+      ),
+      if => fileexists("$(G.testfile)");
 
     "num" int => "3";
 }
diff --git a/tests/acceptance/01_vars/02_functions/410.cf b/tests/acceptance/01_vars/02_functions/410.cf
index 2937dd75310..e05695088a1 100644
--- a/tests/acceptance/01_vars/02_functions/410.cf
+++ b/tests/acceptance/01_vars/02_functions/410.cf
@@ -48,7 +48,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "cnt" int => readstringarray("ary", "$(G.testfile)", "^#.*", ":+", 10, 14);
+    "cnt" int => readstringarray("ary", "$(G.testfile)", "^#.*", ":+", 10, 14),
+      if => fileexists("$(G.testfile)");
     "num" int => "3";
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/420.cf b/tests/acceptance/01_vars/02_functions/420.cf
index 634072f50f1..122a91e0c22 100644
--- a/tests/acceptance/01_vars/02_functions/420.cf
+++ b/tests/acceptance/01_vars/02_functions/420.cf
@@ -42,7 +42,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "teststr" string => readfile("$(G.testfile)", 1000);
+    "teststr" string => readfile("$(G.testfile)", 1000),
+      if => fileexists("$(G.testfile)");
 
     "cnt"
       int => parsestringarray("ary", "$(teststr)", "NoComment", ":", 10, 1000);
diff --git a/tests/acceptance/01_vars/02_functions/421.cf b/tests/acceptance/01_vars/02_functions/421.cf
index 9891f76758a..9c5fb087d24 100644
--- a/tests/acceptance/01_vars/02_functions/421.cf
+++ b/tests/acceptance/01_vars/02_functions/421.cf
@@ -42,7 +42,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "teststr" string => readfile("$(G.testfile)", 1000);
+    "teststr" string => readfile("$(G.testfile)", 1000),
+      if => fileexists("$(G.testfile)");
 
     "cnt"
       int => parsestringarray("ary", "$(teststr)", "NoComment", ":", 10, 1000);
diff --git a/tests/acceptance/01_vars/02_functions/440.cf b/tests/acceptance/01_vars/02_functions/440.cf
index 3ffe141d7b8..93c2839d1c8 100644
--- a/tests/acceptance/01_vars/02_functions/440.cf
+++ b/tests/acceptance/01_vars/02_functions/440.cf
@@ -45,7 +45,8 @@ bundle agent test
     "cnt"
       int => readstringarrayidx(
         "ary", "$(G.testfile)", "NoComment", ":", 10, 1000
-      );
+      ),
+      if => fileexists("$(G.testfile)");
 
     "num" int => "3";
 }
diff --git a/tests/acceptance/01_vars/02_functions/441.cf b/tests/acceptance/01_vars/02_functions/441.cf
index 3a71cff5cd7..639d1e48cc5 100644
--- a/tests/acceptance/01_vars/02_functions/441.cf
+++ b/tests/acceptance/01_vars/02_functions/441.cf
@@ -45,7 +45,8 @@ bundle agent test
     "cnt"
       int => readstringarrayidx(
         "ary", "$(G.testfile)", "NoComment", ":", 10, 1000
-      );
+      ),
+      if => fileexists("$(G.testfile)");
 
     "num" int => "3";
 }
diff --git a/tests/acceptance/01_vars/02_functions/442.cf b/tests/acceptance/01_vars/02_functions/442.cf
index 284a6f7357c..bd9d0ae93fb 100644
--- a/tests/acceptance/01_vars/02_functions/442.cf
+++ b/tests/acceptance/01_vars/02_functions/442.cf
@@ -46,7 +46,8 @@ bundle agent test
     "cnt"
       int => readstringarrayidx(
         "ary", "$(G.testfile)", "NoComment", ":", 10, 1000
-      );
+      ),
+      if => fileexists("$(G.testfile)");
 
     "num" int => "4";
 }
diff --git a/tests/acceptance/01_vars/02_functions/443.cf b/tests/acceptance/01_vars/02_functions/443.cf
index 5663b905fb1..ef4bd364ef4 100644
--- a/tests/acceptance/01_vars/02_functions/443.cf
+++ b/tests/acceptance/01_vars/02_functions/443.cf
@@ -53,7 +53,8 @@ bundle agent test
     "cnt"
       int => readstringarrayidx(
         "ary", "$(G.testfile)", "NoComment", ":", 10, 1000
-      );
+      ),
+      if => fileexists("$(G.testfile)");
 
     "num" int => "4";
 }
diff --git a/tests/acceptance/01_vars/02_functions/444.cf b/tests/acceptance/01_vars/02_functions/444.cf
index 5e384aabbd9..2a138207d9f 100644
--- a/tests/acceptance/01_vars/02_functions/444.cf
+++ b/tests/acceptance/01_vars/02_functions/444.cf
@@ -51,7 +51,8 @@ bundle agent test
     "cnt"
       int => readstringarrayidx(
         "ary", "$(G.testfile)", "NoComment", ":", 10, 1000
-      );
+      ),
+      if => fileexists("$(G.testfile)");
 
     "num" int => "9";
 }
diff --git a/tests/acceptance/01_vars/02_functions/445.cf b/tests/acceptance/01_vars/02_functions/445.cf
index 82be099cc04..89b95d24738 100644
--- a/tests/acceptance/01_vars/02_functions/445.cf
+++ b/tests/acceptance/01_vars/02_functions/445.cf
@@ -54,7 +54,8 @@ bundle agent test
     "cnt"
       int => readstringarrayidx(
         "ary", "$(G.testfile)", "NoComment", ":", 10, 1000
-      );
+      ),
+      if => fileexists("$(G.testfile)");
 
     "num" int => "9";
 }
diff --git a/tests/acceptance/01_vars/02_functions/447.cf b/tests/acceptance/01_vars/02_functions/447.cf
index 517919c7918..0632d00fc67 100644
--- a/tests/acceptance/01_vars/02_functions/447.cf
+++ b/tests/acceptance/01_vars/02_functions/447.cf
@@ -48,7 +48,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "cnt" int => readstringarrayidx("ary", "$(G.testfile)", "", ":", 10, 1000);
+    "cnt" int => readstringarrayidx("ary", "$(G.testfile)", "", ":", 10, 1000),
+      if => fileexists("$(G.testfile)");
     "num" int => "9";
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/450.cf b/tests/acceptance/01_vars/02_functions/450.cf
index c850c569dae..d686c41c1db 100644
--- a/tests/acceptance/01_vars/02_functions/450.cf
+++ b/tests/acceptance/01_vars/02_functions/450.cf
@@ -49,7 +49,8 @@ bundle agent test
 {
   vars:
     "cnt"
-      int => readstringarrayidx("ary", "$(G.testfile)", "^#.*", ":+", 10, 14);
+      int => readstringarrayidx("ary", "$(G.testfile)", "^#.*", ":+", 10, 14),
+      if => fileexists("$(G.testfile)");
 
     "num" int => "3";
 }
diff --git a/tests/acceptance/01_vars/02_functions/500.cf b/tests/acceptance/01_vars/02_functions/500.cf
index 205241c3089..01148598230 100644
--- a/tests/acceptance/01_vars/02_functions/500.cf
+++ b/tests/acceptance/01_vars/02_functions/500.cf
@@ -42,7 +42,8 @@ bundle agent test
 {
   vars:
     "cnt"
-      int => readintarray("ary", "$(G.testfile)", "NoComment", ":", 10, 1000);
+      int => readintarray("ary", "$(G.testfile)", "NoComment", ":", 10, 1000),
+      if => fileexists("$(G.testfile)");
 
     "num" int => "3";
 }
diff --git a/tests/acceptance/01_vars/02_functions/501.cf b/tests/acceptance/01_vars/02_functions/501.cf
index 7c3c982d76e..ddaba1ac6e5 100644
--- a/tests/acceptance/01_vars/02_functions/501.cf
+++ b/tests/acceptance/01_vars/02_functions/501.cf
@@ -42,7 +42,8 @@ bundle agent test
 {
   vars:
     "cnt"
-      int => readintarray("ary", "$(G.testfile)", "NoComment", ":", 10, 1000);
+      int => readintarray("ary", "$(G.testfile)", "NoComment", ":", 10, 1000),
+      if => fileexists("$(G.testfile)");
 
     "num" int => "3";
 }
diff --git a/tests/acceptance/01_vars/02_functions/520.cf b/tests/acceptance/01_vars/02_functions/520.cf
index b54fc402132..d1ab666bce3 100644
--- a/tests/acceptance/01_vars/02_functions/520.cf
+++ b/tests/acceptance/01_vars/02_functions/520.cf
@@ -41,7 +41,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "teststr" string => readfile("$(G.testfile)", 1000);
+    "teststr" string => readfile("$(G.testfile)", 1000),
+      if => fileexists("$(G.testfile)");
     "cnt" int => parseintarray("ary", "$(teststr)", "NoComment", ":", 10, 1000);
     "num" int => "3";
 }
diff --git a/tests/acceptance/01_vars/02_functions/521.cf b/tests/acceptance/01_vars/02_functions/521.cf
index 12424b904fc..84233e9db8b 100644
--- a/tests/acceptance/01_vars/02_functions/521.cf
+++ b/tests/acceptance/01_vars/02_functions/521.cf
@@ -41,7 +41,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "teststr" string => readfile("$(G.testfile)", 1000);
+    "teststr" string => readfile("$(G.testfile)", 1000),
+      if => fileexists("$(G.testfile)");
     "cnt" int => parseintarray("ary", "$(teststr)", "NoComment", ":", 10, 1000);
     "num" int => "3";
 }
diff --git a/tests/acceptance/01_vars/02_functions/600.cf b/tests/acceptance/01_vars/02_functions/600.cf
index fb48a433696..b402e6dd99f 100644
--- a/tests/acceptance/01_vars/02_functions/600.cf
+++ b/tests/acceptance/01_vars/02_functions/600.cf
@@ -42,7 +42,8 @@ bundle agent test
 {
   vars:
     "cnt"
-      int => readrealarray("ary", "$(G.testfile)", "NoComment", ":", 10, 1000);
+      int => readrealarray("ary", "$(G.testfile)", "NoComment", ":", 10, 1000),
+      if => fileexists("$(G.testfile)");
 
     "num" int => "3";
 }
diff --git a/tests/acceptance/01_vars/02_functions/601.cf b/tests/acceptance/01_vars/02_functions/601.cf
index e19a254a1b0..843d72d1219 100644
--- a/tests/acceptance/01_vars/02_functions/601.cf
+++ b/tests/acceptance/01_vars/02_functions/601.cf
@@ -42,7 +42,8 @@ bundle agent test
 {
   vars:
     "cnt"
-      int => readrealarray("ary", "$(G.testfile)", "NoComment", ":", 10, 1000);
+      int => readrealarray("ary", "$(G.testfile)", "NoComment", ":", 10, 1000),
+      if => fileexists("$(G.testfile)");
 
     "num" int => "3";
 }
diff --git a/tests/acceptance/01_vars/02_functions/620.cf b/tests/acceptance/01_vars/02_functions/620.cf
index 8ce3531136f..50f06d423e9 100644
--- a/tests/acceptance/01_vars/02_functions/620.cf
+++ b/tests/acceptance/01_vars/02_functions/620.cf
@@ -41,7 +41,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "teststr" string => readfile("$(G.testfile)", 1000);
+    "teststr" string => readfile("$(G.testfile)", 1000),
+      if => fileexists("$(G.testfile)");
 
     "cnt"
       int => parserealarray("ary", "$(teststr)", "NoComment", ":", 10, 1000);
diff --git a/tests/acceptance/01_vars/02_functions/621.cf b/tests/acceptance/01_vars/02_functions/621.cf
index 59d8b7eb462..dc908d968cd 100644
--- a/tests/acceptance/01_vars/02_functions/621.cf
+++ b/tests/acceptance/01_vars/02_functions/621.cf
@@ -41,7 +41,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "teststr" string => readfile("$(G.testfile)", 1000);
+    "teststr" string => readfile("$(G.testfile)", 1000),
+      if => fileexists("$(G.testfile)");
 
     "cnt"
       int => parserealarray("ary", "$(teststr)", "NoComment", ":", 10, 1000);
diff --git a/tests/acceptance/01_vars/02_functions/classfilterdata_collecting.cf b/tests/acceptance/01_vars/02_functions/classfilterdata_collecting.cf
index 88ea0d29e6d..8b2cbc66bc2 100644
--- a/tests/acceptance/01_vars/02_functions/classfilterdata_collecting.cf
+++ b/tests/acceptance/01_vars/02_functions/classfilterdata_collecting.cf
@@ -44,7 +44,8 @@ bundle agent test
 
   vars:
     "filtered"
-      data => classfilterdata(readjson("$(G.testfile).json"), "auto", "if");
+      data => classfilterdata(readjson("$(G.testfile).json"), "auto", "if"),
+      if => fileexists("$(G.testfile).json");
 }
 
 bundle agent check
diff --git a/tests/acceptance/01_vars/02_functions/long_string_from_text_file.cf b/tests/acceptance/01_vars/02_functions/long_string_from_text_file.cf
index 80ecfd7f317..25a0bbce723 100644
--- a/tests/acceptance/01_vars/02_functions/long_string_from_text_file.cf
+++ b/tests/acceptance/01_vars/02_functions/long_string_from_text_file.cf
@@ -26,7 +26,8 @@ bundle agent test
 {
   vars:
     "keyfile" string => "$(G.testfile).data";
-    "keys" slist => readstringlist("$(keyfile)", "#[^\n]*", "\n", 10, 3072);
+    "keys" slist => readstringlist("$(keyfile)", "#[^\n]*", "\n", 10, 3072),
+      if => fileexists("$(keyfile)");
 }
 
 #######################################################
diff --git a/tests/acceptance/01_vars/02_functions/parsestringarray_dontread_comment_duplicate_lastline2.cf b/tests/acceptance/01_vars/02_functions/parsestringarray_dontread_comment_duplicate_lastline2.cf
index 643b67106ba..478a3eb0c63 100644
--- a/tests/acceptance/01_vars/02_functions/parsestringarray_dontread_comment_duplicate_lastline2.cf
+++ b/tests/acceptance/01_vars/02_functions/parsestringarray_dontread_comment_duplicate_lastline2.cf
@@ -51,7 +51,8 @@ bundle agent test
     "cnt"
       int => readstringarrayidx(
         "ary", "$(G.testfile)", "NoComment", ":", 6, 1000
-      );
+      ),
+      if => fileexists("$(G.testfile)");
 
     "num" int => "6";
 }
diff --git a/tests/acceptance/01_vars/02_functions/parsestringarray_weird_indices_real_comments_noemptyfields2.cf b/tests/acceptance/01_vars/02_functions/parsestringarray_weird_indices_real_comments_noemptyfields2.cf
index 801e3f09c2a..79539da135d 100644
--- a/tests/acceptance/01_vars/02_functions/parsestringarray_weird_indices_real_comments_noemptyfields2.cf
+++ b/tests/acceptance/01_vars/02_functions/parsestringarray_weird_indices_real_comments_noemptyfields2.cf
@@ -48,7 +48,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "teststr" string => readfile("$(G.testfile)", 1000);
+    "teststr" string => readfile("$(G.testfile)", 1000),
+      if => fileexists("$(G.testfile)");
     "cnt" int => parsestringarray("ary", "$(teststr)", "^#.*", ":+", 10, 14);
     "num" int => "3";
 }
diff --git a/tests/acceptance/01_vars/02_functions/peers.cf b/tests/acceptance/01_vars/02_functions/peers.cf
index 5b87f0b1cb4..e99d0373e91 100644
--- a/tests/acceptance/01_vars/02_functions/peers.cf
+++ b/tests/acceptance/01_vars/02_functions/peers.cf
@@ -56,10 +56,12 @@ bundle agent test
     "subtests" ilist => { "0", "1", "2", "3", "4", "5" };
 
     "peers_$(tests)_$(subtests)"
-      slist => peers("$(G.testfile).$(tests)", "#.*", $(subtests));
+      slist => peers("$(G.testfile).$(tests)", "#.*", $(subtests)),
+      if => fileexists("$(G.testfile).$(tests)");
 
     "peerleaders_$(tests)_$(subtests)"
-      slist => peerleaders("$(G.testfile).$(tests)", "#.*", $(subtests));
+      slist => peerleaders("$(G.testfile).$(tests)", "#.*", $(subtests)),
+      if => fileexists("$(G.testfile).$(tests)");
 
     "actual_peers_$(tests)_$(subtests)"
       string => format("%S", "peers_$(tests)_$(subtests)");
@@ -68,7 +70,8 @@ bundle agent test
       string => format("%S", "peerleaders_$(tests)_$(subtests)");
 
     "actual_peerleader_$(tests)_$(subtests)"
-      string => peerleader("$(G.testfile).$(tests)", "#.*", $(subtests));
+      string => peerleader("$(G.testfile).$(tests)", "#.*", $(subtests)),
+      if => fileexists("$(G.testfile).$(tests)");
 }
 
 #######################################################
diff --git a/tests/acceptance/01_vars/02_functions/read_empty_file.cf b/tests/acceptance/01_vars/02_functions/read_empty_file.cf
index 1ce7d0bb4ca..d1f37354b8a 100644
--- a/tests/acceptance/01_vars/02_functions/read_empty_file.cf
+++ b/tests/acceptance/01_vars/02_functions/read_empty_file.cf
@@ -15,8 +15,10 @@ bundle agent init
 bundle agent test
 {
   vars:
-    "value1" string => readfile("$(G.testfile)", 10000);
-    "value2" string => readfile("$(G.testfile)", 0);
+    "value1" string => readfile("$(G.testfile)", 10000),
+      if => fileexists("$(G.testfile)");
+    "value2" string => readfile("$(G.testfile)", 0),
+      if => fileexists("$(G.testfile)");
 }
 
 bundle agent check
diff --git a/tests/acceptance/01_vars/02_functions/readstringarray_dontread_comment_duplicatekey_lastline.cf b/tests/acceptance/01_vars/02_functions/readstringarray_dontread_comment_duplicatekey_lastline.cf
index f9339fc69e5..2d9b30cc87b 100644
--- a/tests/acceptance/01_vars/02_functions/readstringarray_dontread_comment_duplicatekey_lastline.cf
+++ b/tests/acceptance/01_vars/02_functions/readstringarray_dontread_comment_duplicatekey_lastline.cf
@@ -49,7 +49,8 @@ bundle agent test
 {
   vars:
     "cnt"
-      int => readstringarray("ary", "$(G.testfile)", "NoComment", ":", 6, 1000);
+      int => readstringarray("ary", "$(G.testfile)", "NoComment", ":", 6, 1000),
+      if => fileexists("$(G.testfile)");
 
     "num" int => "6";
 }
diff --git a/tests/acceptance/01_vars/02_functions/readstringarrayidx_order.cf b/tests/acceptance/01_vars/02_functions/readstringarrayidx_order.cf
index 3d8236815ee..c8fd1b9a0b5 100644
--- a/tests/acceptance/01_vars/02_functions/readstringarrayidx_order.cf
+++ b/tests/acceptance/01_vars/02_functions/readstringarrayidx_order.cf
@@ -69,7 +69,8 @@ bundle agent test
     "num"
       int => readstringarrayidx(
         "mylines", "$(G.testfile).orig.txt", "\s*#[^\n]*", "\s*;;\s*", 50, 9999
-      );
+      ),
+      if => fileexists("$(G.testfile).orig.txt");
 
     "file"
       slist => {
diff --git a/tests/acceptance/01_vars/04_containers/readjson.cf b/tests/acceptance/01_vars/04_containers/readjson.cf
index a4a1998f314..3317af28d2f 100644
--- a/tests/acceptance/01_vars/04_containers/readjson.cf
+++ b/tests/acceptance/01_vars/04_containers/readjson.cf
@@ -40,7 +40,8 @@ bundle edit_line init_insert_lines
 bundle agent test
 {
   vars:
-    "load" data => readjson("$(G.testfile).json", 1024);
+    "load" data => readjson("$(G.testfile).json", 1024),
+      if => fileexists("$(G.testfile).json");
 
   files:
     "$(G.testfile).actual"
diff --git a/tests/acceptance/01_vars/04_containers/readjson_arrays.cf b/tests/acceptance/01_vars/04_containers/readjson_arrays.cf
index 004676f31d4..bc120e55e8a 100644
--- a/tests/acceptance/01_vars/04_containers/readjson_arrays.cf
+++ b/tests/acceptance/01_vars/04_containers/readjson_arrays.cf
@@ -43,7 +43,8 @@ bundle edit_line init_insert_lines
 bundle agent test
 {
   vars:
-    "load" data => readjson("$(G.testfile).json", 1024);
+    "load" data => readjson("$(G.testfile).json", 1024),
+      if => fileexists("$(G.testfile).json");
 
   files:
     "$(G.testfile).actual"
diff --git a/tests/acceptance/01_vars/04_containers/readjson_new.cf b/tests/acceptance/01_vars/04_containers/readjson_new.cf
index 6d453e4a67e..a411f6614b9 100644
--- a/tests/acceptance/01_vars/04_containers/readjson_new.cf
+++ b/tests/acceptance/01_vars/04_containers/readjson_new.cf
@@ -40,7 +40,8 @@ bundle edit_line init_insert_lines
 bundle agent test
 {
   vars:
-    "load" data => readjson("$(G.testfile).json");
+    "load" data => readjson("$(G.testfile).json"),
+      if => fileexists("$(G.testfile).json");
 
   files:
     "$(G.testfile).actual"
diff --git a/tests/acceptance/01_vars/04_containers/readjson_null.cf b/tests/acceptance/01_vars/04_containers/readjson_null.cf
index fed055cb2e3..92309aa6386 100644
--- a/tests/acceptance/01_vars/04_containers/readjson_null.cf
+++ b/tests/acceptance/01_vars/04_containers/readjson_null.cf
@@ -39,7 +39,8 @@ bundle edit_line init_insert_lines
 bundle agent test
 {
   vars:
-    "load" data => readjson("$(G.testfile).json", 1024);
+    "load" data => readjson("$(G.testfile).json", 1024),
+      if => fileexists("$(G.testfile).json");
 
   files:
     "$(G.testfile).actual"
diff --git a/tests/acceptance/01_vars/04_containers/readjson_objects.cf b/tests/acceptance/01_vars/04_containers/readjson_objects.cf
index 137670afd03..54422b46662 100644
--- a/tests/acceptance/01_vars/04_containers/readjson_objects.cf
+++ b/tests/acceptance/01_vars/04_containers/readjson_objects.cf
@@ -40,7 +40,8 @@ bundle edit_line init_insert_lines
 bundle agent test
 {
   vars:
-    "load" data => readjson("$(G.testfile).json", 1024);
+    "load" data => readjson("$(G.testfile).json", 1024),
+      if => fileexists("$(G.testfile).json");
 
   files:
     "$(G.testfile).actual"
diff --git a/tests/acceptance/01_vars/04_containers/readjson_scalar.cf b/tests/acceptance/01_vars/04_containers/readjson_scalar.cf
index f1fe8bc9172..ba32e03860b 100644
--- a/tests/acceptance/01_vars/04_containers/readjson_scalar.cf
+++ b/tests/acceptance/01_vars/04_containers/readjson_scalar.cf
@@ -39,7 +39,8 @@ bundle edit_line init_insert_lines
 bundle agent test
 {
   vars:
-    "load" data => readjson("$(G.testfile).json", 1024);
+    "load" data => readjson("$(G.testfile).json", 1024),
+      if => fileexists("$(G.testfile).json");
 
   files:
     "$(G.testfile).actual"
diff --git a/tests/acceptance/01_vars/04_containers/readjson_subindex.cf b/tests/acceptance/01_vars/04_containers/readjson_subindex.cf
index 7cbdf379d2d..bd669b3ddae 100644
--- a/tests/acceptance/01_vars/04_containers/readjson_subindex.cf
+++ b/tests/acceptance/01_vars/04_containers/readjson_subindex.cf
@@ -41,7 +41,8 @@ bundle edit_line init_insert_lines
 bundle agent test
 {
   vars:
-    "load" data => readjson("$(G.testfile).json", 1024);
+    "load" data => readjson("$(G.testfile).json", 1024),
+      if => fileexists("$(G.testfile).json");
 
   files:
     "$(G.testfile).actual"
diff --git a/tests/acceptance/01_vars/04_containers/readjson_subindex_quoted.cf b/tests/acceptance/01_vars/04_containers/readjson_subindex_quoted.cf
index 39e203f37df..17d8c7fadf2 100644
--- a/tests/acceptance/01_vars/04_containers/readjson_subindex_quoted.cf
+++ b/tests/acceptance/01_vars/04_containers/readjson_subindex_quoted.cf
@@ -41,7 +41,8 @@ bundle edit_line init_insert_lines
 bundle agent test
 {
   vars:
-    "load" data => readjson("$(G.testfile).json", 1024);
+    "load" data => readjson("$(G.testfile).json", 1024),
+      if => fileexists("$(G.testfile).json");
 
   files:
     "$(G.testfile).actual"
diff --git a/tests/acceptance/08_commands/arglist.cf b/tests/acceptance/08_commands/arglist.cf
index c86411e7173..1948f33e815 100644
--- a/tests/acceptance/08_commands/arglist.cf
+++ b/tests/acceptance/08_commands/arglist.cf
@@ -46,7 +46,8 @@ bundle agent test
 bundle agent check
 {
   vars:
-    "actual" string => readfile("$(G.testfile).actual");
+    "actual" string => readfile("$(G.testfile).actual"),
+      if => fileexists("$(G.testfile).actual");
     "expected" string => "one
 two
 three
diff --git a/tests/acceptance/10_files/09_insert_lines/preserve_block_blank_lines.cf b/tests/acceptance/10_files/09_insert_lines/preserve_block_blank_lines.cf
index 79810047971..d39a6f50b73 100644
--- a/tests/acceptance/10_files/09_insert_lines/preserve_block_blank_lines.cf
+++ b/tests/acceptance/10_files/09_insert_lines/preserve_block_blank_lines.cf
@@ -38,7 +38,8 @@ bundle agent check
 
     Bad 3
 ";
-    "actual" string => readfile("$(init.test_file)", "inf");
+    "actual" string => readfile("$(init.test_file)", "inf"),
+      if => fileexists("$(init.test_file)");
 
   classes:
     "ok" expression => strcmp("$(expected)", "$(actual)");
diff --git a/tests/acceptance/10_files/templating/empty_template_empty_file.cf b/tests/acceptance/10_files/templating/empty_template_empty_file.cf
index de9a28342b7..38cc6730655 100644
--- a/tests/acceptance/10_files/templating/empty_template_empty_file.cf
+++ b/tests/acceptance/10_files/templating/empty_template_empty_file.cf
@@ -53,7 +53,8 @@ bundle agent check
 {
   vars:
     "expect" string => "";
-    "actual" string => readfile("$(G.testfile)", 1000);
+    "actual" string => readfile("$(G.testfile)", 1000),
+      if => fileexists("$(G.testfile)");
 
   classes:
     "ok" expression => regcmp("$(expect)", "$(actual)");
diff --git a/tests/acceptance/10_files/templating/mustache_abuse.cf b/tests/acceptance/10_files/templating/mustache_abuse.cf
index a2b6eaa47d1..01ae5a2c531 100644
--- a/tests/acceptance/10_files/templating/mustache_abuse.cf
+++ b/tests/acceptance/10_files/templating/mustache_abuse.cf
@@ -99,7 +99,8 @@ bundle agent check
       );
 
     "actual_$(init.tests)"
-      string => readfile("$(G.testfile).$(init.tests)", 10000);
+      string => readfile("$(G.testfile).$(init.tests)", 10000),
+      if => fileexists("$(G.testfile).$(init.tests)");
 
   classes:
     "ok_$(init.tests)"
diff --git a/tests/acceptance/10_files/templating/mustache_datastate_demo.cf b/tests/acceptance/10_files/templating/mustache_datastate_demo.cf
index 0725484f444..43f2cc0a920 100644
--- a/tests/acceptance/10_files/templating/mustache_datastate_demo.cf
+++ b/tests/acceptance/10_files/templating/mustache_datastate_demo.cf
@@ -101,7 +101,8 @@ bundle agent check
 }"
 ';
 
-    "actual" string => readfile("$(G.testfile)", inf);
+    "actual" string => readfile("$(G.testfile)", inf),
+      if => fileexists("$(G.testfile)");
 
   classes:
     "ok" expression => strcmp($(expect), $(actual));
diff --git a/tests/acceptance/10_files/templating/mustache_demo.cf b/tests/acceptance/10_files/templating/mustache_demo.cf
index 76bffa647e4..3b016edaedb 100644
--- a/tests/acceptance/10_files/templating/mustache_demo.cf
+++ b/tests/acceptance/10_files/templating/mustache_demo.cf
@@ -49,7 +49,8 @@ bundle agent check
 {
   vars:
     "expect" string => readfile("$(init.origtestdir)/demo.expected", 10000);
-    "actual" string => readfile("$(G.testfile)", 10000);
+    "actual" string => readfile("$(G.testfile)", 10000),
+      if => fileexists("$(G.testfile)");
 
   classes:
     "ok" expression => regcmp("$(expect)", "$(actual)");
diff --git a/tests/acceptance/10_files/templating/mustache_expect_list_find_string.cf b/tests/acceptance/10_files/templating/mustache_expect_list_find_string.cf
index 7c69a7d9619..52b0077414c 100644
--- a/tests/acceptance/10_files/templating/mustache_expect_list_find_string.cf
+++ b/tests/acceptance/10_files/templating/mustache_expect_list_find_string.cf
@@ -85,8 +85,10 @@ bundle agent test
 
   vars:
     "template" string => "$(this.promise_filename).mustache";
-    "actual_good" string => readfile("$(G.testfile).good", 4096);
-    "actual_bad" string => readfile("$(G.testfile).bad", 4096);
+    "actual_good" string => readfile("$(G.testfile).good", 4096),
+      if => fileexists("$(G.testfile).good");
+    "actual_bad" string => readfile("$(G.testfile).bad", 4096),
+      if => fileexists("$(G.testfile).bad");
 }
 
 #######################################################
diff --git a/tests/acceptance/10_files/templating/mustache_html_escape.cf b/tests/acceptance/10_files/templating/mustache_html_escape.cf
index decc658f9ff..2f4a3b958eb 100644
--- a/tests/acceptance/10_files/templating/mustache_html_escape.cf
+++ b/tests/acceptance/10_files/templating/mustache_html_escape.cf
@@ -54,7 +54,8 @@ bundle agent check
 {
   vars:
     "expect" string => readfile("$(this.promise_filename).expected", 10000);
-    "actual" string => readfile("$(G.testfile)", 10000);
+    "actual" string => readfile("$(G.testfile)", 10000),
+      if => fileexists("$(G.testfile)");
 
   classes:
     "ok" expression => strcmp("$(expect)", "$(actual)");
diff --git a/tests/acceptance/10_files/templating/mustache_inline_demo.cf b/tests/acceptance/10_files/templating/mustache_inline_demo.cf
index d03e2d90681..6ae16b65a4d 100644
--- a/tests/acceptance/10_files/templating/mustache_inline_demo.cf
+++ b/tests/acceptance/10_files/templating/mustache_inline_demo.cf
@@ -52,7 +52,8 @@ bundle agent check
     "expect"
       string => readfile("$(init.origtestdir)/inline_demo.expected", 10000);
 
-    "actual" string => readfile("$(G.testfile)", 10000);
+    "actual" string => readfile("$(G.testfile)", 10000),
+      if => fileexists("$(G.testfile)");
 
   classes:
     "ok" expression => regcmp("$(expect)", "$(actual)");
diff --git a/tests/acceptance/10_files/templating/mustache_render_quote.cf b/tests/acceptance/10_files/templating/mustache_render_quote.cf
index 5ba4ba3ae9a..4def7b9364b 100644
--- a/tests/acceptance/10_files/templating/mustache_render_quote.cf
+++ b/tests/acceptance/10_files/templating/mustache_render_quote.cf
@@ -54,7 +54,8 @@ bundle agent check
 {
   vars:
     "expect" string => readfile("$(this.promise_filename).expected", 4000);
-    "actual" string => readfile("$(G.testfile)", 4000);
+    "actual" string => readfile("$(G.testfile)", 4000),
+      if => fileexists("$(G.testfile)");
 
   classes:
     "ok" expression => regcmp("$(expect)", "$(actual)");
diff --git a/tests/acceptance/10_files/templating/mustache_repair_existing.cf b/tests/acceptance/10_files/templating/mustache_repair_existing.cf
index e2a1991d973..2429e350ed6 100644
--- a/tests/acceptance/10_files/templating/mustache_repair_existing.cf
+++ b/tests/acceptance/10_files/templating/mustache_repair_existing.cf
@@ -50,7 +50,8 @@ bundle agent check
 {
   vars:
     "expect" string => readfile("$(init.origtestdir)/demo.expected", 4096);
-    "actual" string => readfile("$(G.testfile)", 4096);
+    "actual" string => readfile("$(G.testfile)", 4096),
+      if => fileexists("$(G.testfile)");
 
   classes:
     "content_ok" expression => regcmp("$(expect)", "$(actual)");
diff --git a/tests/acceptance/31_tickets/CFE-3866/test.cf b/tests/acceptance/31_tickets/CFE-3866/test.cf
index 5a8dd626451..c90c082ed48 100644
--- a/tests/acceptance/31_tickets/CFE-3866/test.cf
+++ b/tests/acceptance/31_tickets/CFE-3866/test.cf
@@ -68,7 +68,8 @@ bundle agent check
     "expected" string => "[section]
 key=value
 ";
-    "actual" string => readfile("$(G.testfile)", "1000");
+    "actual" string => readfile("$(G.testfile)", "1000"),
+      if => fileexists("$(G.testfile)");
 
   classes:
     "ok" expression => strcmp("$(expected)", "$(actual)");

From 8716a17de2f06818ca3ba2ddcb6ba52dd51ad82c Mon Sep 17 00:00:00 2001
From: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
Date: Thu, 15 Oct 2026 14:44:08 +0300
Subject: [PATCH 03/11] Indented command output in dcs_passif_output() DEBUG
 report

Errors printed by the command were reported on lines starting with "error:", so testall mistook them for errors of the test itself.

Ticket: CFE-3041

Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
---
 tests/acceptance/dcs.sub.cf | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/acceptance/dcs.sub.cf b/tests/acceptance/dcs.sub.cf
index e752cf24c7d..33dd9422428 100644
--- a/tests/acceptance/dcs.sub.cf
+++ b/tests/acceptance/dcs.sub.cf
@@ -1097,6 +1097,10 @@ bundle agent dcs_passif_output(wanted, unwanted, command, test)
       string => execresult($(command), "useshell"),
       meta => { "simulate_safe" };
 
+    # Indent the command output in the DEBUG report, so that errors printed
+    # by the command are not mistaken for errors of the test by testall
+    "subout_indented" string => regex_replace($(subout), "^", "  | ", "gm");
+
   classes:
     "__passif_output_unwanted" expression => regcmp($(unwanted), $(subout));
     "__passif_output_wanted" expression => regcmp($(wanted), $(subout));
@@ -1128,7 +1132,7 @@ bundle agent dcs_passif_output(wanted, unwanted, command, test)
         if => "!__passif_output_unwanted";
 
     DEBUG::
-      "$(this.bundle): the output of command '$(command)' was: '$(subout)'";
+      "$(this.bundle): the output of command '$(command)' was: '$(subout_indented)'";
 }
 
 bundle agent dcs_passif_output1(wanted, command, test)

From 2a0d747844a96d53e8b55059c91e8956317aca9b Mon Sep 17 00:00:00 2001
From: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
Date: Thu, 15 Oct 2026 14:50:11 +0300
Subject: [PATCH 04/11] Added guards to reads of files created later in
 acceptance tests

These tests read files and directories created by their own policy, but pre-evaluation calls the functions before they exist, logging errors which now fail regular tests.

Ticket: CFE-3041
Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
---
 .../01_vars/02_functions/findfiles_up.cf       | 18 ++++++++++++------
 .../01_vars/02_functions/getfields.cf          |  3 ++-
 .../01_vars/02_functions/regextract.cf         |  3 ++-
 .../cancel_attribute_persistent_lmdb.cf        |  6 ++++--
 .../persistent_timer_policy_default_lmdb.cf    |  9 ++++++---
 .../02_functions/classesmatching_inherit_2.cf  |  3 ++-
 .../09_insert_lines/multi-files-dirs.cf        |  9 ++++++---
 .../templating/large_template_blocks.cf        |  3 ++-
 .../mustache_container_serialization.cf        |  3 ++-
 .../classic_evaluation_long_policy.cf          |  6 ++++--
 .../top_down_evaluation_long_policy.cf         |  6 ++++--
 .../simulate_safe_functions.cf                 |  3 +++
 12 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/tests/acceptance/01_vars/02_functions/findfiles_up.cf b/tests/acceptance/01_vars/02_functions/findfiles_up.cf
index f8ac71214c2..faf55b5abb3 100755
--- a/tests/acceptance/01_vars/02_functions/findfiles_up.cf
+++ b/tests/acceptance/01_vars/02_functions/findfiles_up.cf
@@ -46,27 +46,33 @@ bundle agent test
     "t1"
       data => findfiles_up(
         "$(G.testdir)/core/libntech/libutils/", ".gitignore", "inf"
-      );
+      ),
+      if => isdir("$(G.testdir)/core/libntech/libutils/");
 
     "t2"
-      data => findfiles_up("$(G.testdir)/core/libntech/libutils/", "string.?");
+      data => findfiles_up("$(G.testdir)/core/libntech/libutils/", "string.?"),
+      if => isdir("$(G.testdir)/core/libntech/libutils/");
 
-    "t3" data => findfiles_up("$(G.testdir)/core/libntech/libutils/", ".git/");
+    "t3" data => findfiles_up("$(G.testdir)/core/libntech/libutils/", ".git/"),
+      if => isdir("$(G.testdir)/core/libntech/libutils/");
 
     "t4"
       data => findfiles_up(
         "$(G.testdir)/core/libntech/libutils/", ".git/", "1"
-      );
+      ),
+      if => isdir("$(G.testdir)/core/libntech/libutils/");
 
     "t5"
       data => findfiles_up(
         "$(G.testdir)/core/libntech/libutils/", ".git/config"
-      );
+      ),
+      if => isdir("$(G.testdir)/core/libntech/libutils/");
 
     "t6"
       data => findfiles_up(
         "$(G.testdir)/core/libntech/libutils/", "*/cf?{lex,parse}.[ly]"
-      );
+      ),
+      if => isdir("$(G.testdir)/core/libntech/libutils/");
 }
 
 bundle agent check
diff --git a/tests/acceptance/01_vars/02_functions/getfields.cf b/tests/acceptance/01_vars/02_functions/getfields.cf
index 7af6fdbd12d..b1f1adc32f8 100644
--- a/tests/acceptance/01_vars/02_functions/getfields.cf
+++ b/tests/acceptance/01_vars/02_functions/getfields.cf
@@ -41,7 +41,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "num_matching" int => getfields("t.*", "$(G.testfile)", ":", "fields");
+    "num_matching" int => getfields("t.*", "$(G.testfile)", ":", "fields"),
+      if => fileexists("$(G.testfile)");
 }
 
 #######################################################
diff --git a/tests/acceptance/01_vars/02_functions/regextract.cf b/tests/acceptance/01_vars/02_functions/regextract.cf
index ee882bc0969..e356e5f0879 100644
--- a/tests/acceptance/01_vars/02_functions/regextract.cf
+++ b/tests/acceptance/01_vars/02_functions/regextract.cf
@@ -32,7 +32,8 @@ bundle agent test
     "lefts" string => "$(init.pair[1])";
     "lefti" int => "$(init.pair[1])";
     "rights" string => "$(init.pair[2])";
-    "rightr" real => "$(init.pair[2])";
+    "rightr" real => "$(init.pair[2])",
+      if => isvariable("init.pair[2]");
 }
 
 #######################################################
diff --git a/tests/acceptance/02_classes/01_basic/cancel_attribute_persistent_lmdb.cf b/tests/acceptance/02_classes/01_basic/cancel_attribute_persistent_lmdb.cf
index 27f78438256..d520a35347d 100644
--- a/tests/acceptance/02_classes/01_basic/cancel_attribute_persistent_lmdb.cf
+++ b/tests/acceptance/02_classes/01_basic/cancel_attribute_persistent_lmdb.cf
@@ -58,8 +58,10 @@ bundle agent test
 bundle agent check
 {
   vars:
-    "before" string => readfile("$(G.testdir)/cancel_lmdb_before", 4096);
-    "after" string => readfile("$(G.testdir)/cancel_lmdb_after", 4096);
+    "before" string => readfile("$(G.testdir)/cancel_lmdb_before", 4096),
+      if => fileexists("$(G.testdir)/cancel_lmdb_before");
+    "after" string => readfile("$(G.testdir)/cancel_lmdb_after", 4096),
+      if => fileexists("$(G.testdir)/cancel_lmdb_after");
 
   classes:
     # The class was stored in the LMDB by run 1 ...
diff --git a/tests/acceptance/02_classes/01_basic/persistent_timer_policy_default_lmdb.cf b/tests/acceptance/02_classes/01_basic/persistent_timer_policy_default_lmdb.cf
index 775c583ef04..080fc04affa 100644
--- a/tests/acceptance/02_classes/01_basic/persistent_timer_policy_default_lmdb.cf
+++ b/tests/acceptance/02_classes/01_basic/persistent_timer_policy_default_lmdb.cf
@@ -78,9 +78,12 @@ bundle agent test
 bundle agent check
 {
   vars:
-    "policy" string => readfile("$(G.testdir)/lmdb_policy", 4096);
-    "e1" string => readfile("$(G.testdir)/lmdb_expires1", 4096);
-    "e2" string => readfile("$(G.testdir)/lmdb_expires2", 4096);
+    "policy" string => readfile("$(G.testdir)/lmdb_policy", 4096),
+      if => fileexists("$(G.testdir)/lmdb_policy");
+    "e1" string => readfile("$(G.testdir)/lmdb_expires1", 4096),
+      if => fileexists("$(G.testdir)/lmdb_expires1");
+    "e2" string => readfile("$(G.testdir)/lmdb_expires2", 4096),
+      if => fileexists("$(G.testdir)/lmdb_expires2");
 
   classes:
     # #1 The default classes: promise stored its persistent class with
diff --git a/tests/acceptance/02_classes/02_functions/classesmatching_inherit_2.cf b/tests/acceptance/02_classes/02_functions/classesmatching_inherit_2.cf
index f0b25fa0685..ad2062ed2d1 100644
--- a/tests/acceptance/02_classes/02_functions/classesmatching_inherit_2.cf
+++ b/tests/acceptance/02_classes/02_functions/classesmatching_inherit_2.cf
@@ -59,7 +59,8 @@ bundle agent check
         "defined_classes: defined_in_second$(const.n)"
       );
 
-    "actual" string => readfile("$(common.logfile)", inf);
+    "actual" string => readfile("$(common.logfile)", inf),
+      if => fileexists("$(common.logfile)");
 
   reports:
     "$(this.promise_filename) Pass" if => strcmp($(expected), $(actual));
diff --git a/tests/acceptance/10_files/09_insert_lines/multi-files-dirs.cf b/tests/acceptance/10_files/09_insert_lines/multi-files-dirs.cf
index 310c8a68553..43b9fac0d5d 100644
--- a/tests/acceptance/10_files/09_insert_lines/multi-files-dirs.cf
+++ b/tests/acceptance/10_files/09_insert_lines/multi-files-dirs.cf
@@ -54,9 +54,12 @@ bundle agent check
   vars:
     "expect" string => "one two three test";
     "results" slist => { "resultA", "resultB", "resultC" };
-    "resultA" string => readfile("$(G.testdir)/dirA/testfa", "33");
-    "resultB" string => readfile("$(G.testdir)/dirB/testfb", "33");
-    "resultC" string => readfile("$(G.testdir)/dirC/testfc", "33");
+    "resultA" string => readfile("$(G.testdir)/dirA/testfa", "33"),
+      if => fileexists("$(G.testdir)/dirA/testfa");
+    "resultB" string => readfile("$(G.testdir)/dirB/testfb", "33"),
+      if => fileexists("$(G.testdir)/dirB/testfb");
+    "resultC" string => readfile("$(G.testdir)/dirC/testfc", "33"),
+      if => fileexists("$(G.testdir)/dirC/testfc");
 
   classes:
     "ok_A" expression => strcmp("$(expect)", "$(resultA)");
diff --git a/tests/acceptance/10_files/templating/large_template_blocks.cf b/tests/acceptance/10_files/templating/large_template_blocks.cf
index 398a1f3028a..2f3fedeba3a 100644
--- a/tests/acceptance/10_files/templating/large_template_blocks.cf
+++ b/tests/acceptance/10_files/templating/large_template_blocks.cf
@@ -50,7 +50,8 @@ bundle agent check
 {
   vars:
     "expected" int => "110";
-    "actual" int => countlinesmatching(".*0123456789.*", "$(G.testfile)");
+    "actual" int => countlinesmatching(".*0123456789.*", "$(G.testfile)"),
+      if => fileexists("$(G.testfile)");
 
   classes:
     "ok" expression => strcmp("$(expected)", "$(actual)");
diff --git a/tests/acceptance/10_files/templating/mustache_container_serialization.cf b/tests/acceptance/10_files/templating/mustache_container_serialization.cf
index e6fdfb8cbe0..d41dcf9e398 100644
--- a/tests/acceptance/10_files/templating/mustache_container_serialization.cf
+++ b/tests/acceptance/10_files/templating/mustache_container_serialization.cf
@@ -64,7 +64,8 @@ bundle edit_line readthem
 {
   vars:
     "test" slist => { @(test.test) };
-    "read_$(test)" string => readfile("$(G.testdir)/$(test)", 1k);
+    "read_$(test)" string => readfile("$(G.testdir)/$(test)", 1k),
+      if => fileexists("$(G.testdir)/$(test)");
 
   insert_lines:
     "$(read_$(test))";
diff --git a/tests/acceptance/15_control/01_common/classic_evaluation_long_policy.cf b/tests/acceptance/15_control/01_common/classic_evaluation_long_policy.cf
index 077fffdbd95..3fedb3a4bcd 100644
--- a/tests/acceptance/15_control/01_common/classic_evaluation_long_policy.cf
+++ b/tests/acceptance/15_control/01_common/classic_evaluation_long_policy.cf
@@ -34,7 +34,8 @@ bundle agent test
     "/tmp/example" content => "fourth";
 
   vars:
-    "content" string => readfile("/tmp/example");
+    "content" string => readfile("/tmp/example"),
+      if => fileexists("/tmp/example");
     "result" string => concat("$(result)", ", $(content)");
 
   classes:
@@ -48,7 +49,8 @@ bundle agent test
     "/tmp/otherfile" content => "something";
 
   vars:
-    "othercontent" string => readfile("/tmp/otherfile");
+    "othercontent" string => readfile("/tmp/otherfile"),
+      if => fileexists("/tmp/otherfile");
 
   files:
     "/tmp/otherfile" delete => tidy;
diff --git a/tests/acceptance/15_control/01_common/top_down_evaluation_long_policy.cf b/tests/acceptance/15_control/01_common/top_down_evaluation_long_policy.cf
index 5d85ecbb5a9..a60342fd22b 100644
--- a/tests/acceptance/15_control/01_common/top_down_evaluation_long_policy.cf
+++ b/tests/acceptance/15_control/01_common/top_down_evaluation_long_policy.cf
@@ -34,7 +34,8 @@ bundle agent test
     "/tmp/example" content => "fourth";
 
   vars:
-    "content" string => readfile("/tmp/example");
+    "content" string => readfile("/tmp/example"),
+      if => fileexists("/tmp/example");
     "result" string => concat("$(result)", ", $(content)");
 
   classes:
@@ -48,7 +49,8 @@ bundle agent test
     "/tmp/otherfile" content => "something";
 
   vars:
-    "othercontent" string => readfile("/tmp/otherfile");
+    "othercontent" string => readfile("/tmp/otherfile"),
+      if => fileexists("/tmp/otherfile");
 
   files:
     "/tmp/otherfile" delete => tidy;
diff --git a/tests/acceptance/29_simulate_mode/simulate_safe_functions.cf b/tests/acceptance/29_simulate_mode/simulate_safe_functions.cf
index 289f5811d5a..484869b968b 100644
--- a/tests/acceptance/29_simulate_mode/simulate_safe_functions.cf
+++ b/tests/acceptance/29_simulate_mode/simulate_safe_functions.cf
@@ -56,6 +56,9 @@ bundle agent check
     "result"
       string => readfile(
         "$(sys.workdir)$(const.dirsep)state$(const.dirsep)agent.log"
+      ),
+      if => fileexists(
+        "$(sys.workdir)$(const.dirsep)state$(const.dirsep)agent.log"
       );
 
   methods:

From 565e854842aea570db93a8700f45d256c9e59159 Mon Sep 17 00:00:00 2001
From: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
Date: Thu, 15 Oct 2026 14:56:07 +0300
Subject: [PATCH 05/11] Renamed 00_basics/def.json test directory to def_json

The agent loads def.json from the directory of the input policy file, so tests in 00_basics/ tried to read this directory as their augments file and logged "Could not open JSON file" errors.

Ticket: CFE-3041
Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
---
 tests/acceptance/00_basics/{def.json => def_json}/augments.cf     | 0
 .../00_basics/{def.json => def_json}/augments.cf.augmenter.json   | 0
 .../acceptance/00_basics/{def.json => def_json}/augments.cf.json  | 0
 .../{def.json => def_json}/augments_classes/augments_classes.cf   | 0
 .../00_basics/{def.json => def_json}/augments_classes/def.json    | 0
 .../acceptance/00_basics/{def.json => def_json}/augments_order.cf | 0
 .../{def.json => def_json}/augments_order.cf.augmenter.json       | 0
 .../00_basics/{def.json => def_json}/augments_order.cf.json       | 0
 tests/acceptance/00_basics/{def.json => def_json}/bad-json.cf     | 0
 .../00_basics/{def.json => def_json}/bad-json.cf.x.json           | 0
 .../{def.json => def_json}/class_from_classexpression.cf          | 0
 .../{def.json => def_json}/class_from_classexpression.cf.json     | 0
 tests/acceptance/00_basics/{def.json => def_json}/classes.cf      | 0
 tests/acceptance/00_basics/{def.json => def_json}/classes.cf.json | 0
 .../00_basics/{def.json => def_json}/classes_with_ns.cf           | 0
 .../00_basics/{def.json => def_json}/classes_with_ns.cf.json      | 0
 .../00_basics/{def.json => def_json}/classes_with_ns_tags.cf      | 0
 .../00_basics/{def.json => def_json}/classes_with_ns_tags.cf.json | 0
 .../concurrent-vars-and-variables-keys/both-can-define-vars.cf    | 0
 .../concurrent-vars-and-variables-keys/def.json                   | 0
 .../variables-wins-variables-listed-first/def.json                | 0
 .../variables-wins-variables-listed-first/variables-wins.cf       | 0
 .../concurrent-vars-and-variables-keys/variables-wins.cf          | 0
 tests/acceptance/00_basics/{def.json => def_json}/def.json        | 0
 .../00_basics/{def.json => def_json}/def_preferred.json/def.json  | 0
 .../{def.json => def_json}/def_preferred.json/def_preferred.cf    | 0
 .../{def.json => def_json}/def_preferred.json/def_preferred.json  | 0
 tests/acceptance/00_basics/{def.json => def_json}/inputs.cf       | 0
 tests/acceptance/00_basics/{def.json => def_json}/inputs.cf.json  | 0
 .../00_basics/{def.json => def_json}/json-inputs-not-array.cf     | 0
 .../{def.json => def_json}/json-inputs-not-array.cf.json          | 0
 .../{def.json => def_json}/json-inputs-not-auto-applied.cf        | 0
 .../{def.json => def_json}/json-inputs-not-auto-applied.cf.json   | 0
 .../00_basics/{def.json => def_json}/policy_server_classes.cf     | 0
 .../{def.json => def_json}/policy_server_classes.cf.json          | 0
 .../acceptance/00_basics/{def.json => def_json}/show_vars_JSON.cf | 0
 .../00_basics/{def.json => def_json}/show_vars_JSON.cf.json       | 0
 tests/acceptance/00_basics/{def.json => def_json}/state.cf        | 0
 .../00_basics/{def.json => def_json}/state.cf.expected.json       | 0
 tests/acceptance/00_basics/{def.json => def_json}/variables.cf    | 0
 .../acceptance/00_basics/{def.json => def_json}/variables.cf.json | 0
 .../00_basics/{def.json => def_json}/variables_bare_array.cf      | 0
 .../00_basics/{def.json => def_json}/variables_bare_array.cf.json | 0
 .../00_basics/{def.json => def_json}/variables_bare_string.cf     | 0
 .../{def.json => def_json}/variables_bare_string.cf.json          | 0
 .../00_basics/{def.json => def_json}/variables_with_bundle.cf     | 0
 .../{def.json => def_json}/variables_with_bundle.cf.json          | 0
 .../00_basics/{def.json => def_json}/variables_with_ns.cf         | 0
 .../00_basics/{def.json => def_json}/variables_with_ns.cf.json    | 0
 tests/acceptance/00_basics/{def.json => def_json}/vars.cf         | 0
 tests/acceptance/00_basics/{def.json => def_json}/vars.cf.json    | 0
 .../00_basics/{def.json => def_json}/vars_with_bundle.cf          | 0
 .../00_basics/{def.json => def_json}/vars_with_bundle.cf.json     | 0
 tests/acceptance/00_basics/{def.json => def_json}/vars_with_ns.cf | 0
 .../00_basics/{def.json => def_json}/vars_with_ns.cf.json         | 0
 55 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/acceptance/00_basics/{def.json => def_json}/augments.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/augments.cf.augmenter.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/augments.cf.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/augments_classes/augments_classes.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/augments_classes/def.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/augments_order.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/augments_order.cf.augmenter.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/augments_order.cf.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/bad-json.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/bad-json.cf.x.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/class_from_classexpression.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/class_from_classexpression.cf.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/classes.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/classes.cf.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/classes_with_ns.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/classes_with_ns.cf.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/classes_with_ns_tags.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/classes_with_ns_tags.cf.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/concurrent-vars-and-variables-keys/both-can-define-vars.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/concurrent-vars-and-variables-keys/def.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/concurrent-vars-and-variables-keys/variables-wins-variables-listed-first/def.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/concurrent-vars-and-variables-keys/variables-wins-variables-listed-first/variables-wins.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/concurrent-vars-and-variables-keys/variables-wins.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/def.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/def_preferred.json/def.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/def_preferred.json/def_preferred.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/def_preferred.json/def_preferred.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/inputs.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/inputs.cf.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/json-inputs-not-array.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/json-inputs-not-array.cf.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/json-inputs-not-auto-applied.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/json-inputs-not-auto-applied.cf.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/policy_server_classes.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/policy_server_classes.cf.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/show_vars_JSON.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/show_vars_JSON.cf.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/state.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/state.cf.expected.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/variables.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/variables.cf.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/variables_bare_array.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/variables_bare_array.cf.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/variables_bare_string.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/variables_bare_string.cf.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/variables_with_bundle.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/variables_with_bundle.cf.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/variables_with_ns.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/variables_with_ns.cf.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/vars.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/vars.cf.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/vars_with_bundle.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/vars_with_bundle.cf.json (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/vars_with_ns.cf (100%)
 rename tests/acceptance/00_basics/{def.json => def_json}/vars_with_ns.cf.json (100%)

diff --git a/tests/acceptance/00_basics/def.json/augments.cf b/tests/acceptance/00_basics/def_json/augments.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/augments.cf
rename to tests/acceptance/00_basics/def_json/augments.cf
diff --git a/tests/acceptance/00_basics/def.json/augments.cf.augmenter.json b/tests/acceptance/00_basics/def_json/augments.cf.augmenter.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/augments.cf.augmenter.json
rename to tests/acceptance/00_basics/def_json/augments.cf.augmenter.json
diff --git a/tests/acceptance/00_basics/def.json/augments.cf.json b/tests/acceptance/00_basics/def_json/augments.cf.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/augments.cf.json
rename to tests/acceptance/00_basics/def_json/augments.cf.json
diff --git a/tests/acceptance/00_basics/def.json/augments_classes/augments_classes.cf b/tests/acceptance/00_basics/def_json/augments_classes/augments_classes.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/augments_classes/augments_classes.cf
rename to tests/acceptance/00_basics/def_json/augments_classes/augments_classes.cf
diff --git a/tests/acceptance/00_basics/def.json/augments_classes/def.json b/tests/acceptance/00_basics/def_json/augments_classes/def.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/augments_classes/def.json
rename to tests/acceptance/00_basics/def_json/augments_classes/def.json
diff --git a/tests/acceptance/00_basics/def.json/augments_order.cf b/tests/acceptance/00_basics/def_json/augments_order.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/augments_order.cf
rename to tests/acceptance/00_basics/def_json/augments_order.cf
diff --git a/tests/acceptance/00_basics/def.json/augments_order.cf.augmenter.json b/tests/acceptance/00_basics/def_json/augments_order.cf.augmenter.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/augments_order.cf.augmenter.json
rename to tests/acceptance/00_basics/def_json/augments_order.cf.augmenter.json
diff --git a/tests/acceptance/00_basics/def.json/augments_order.cf.json b/tests/acceptance/00_basics/def_json/augments_order.cf.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/augments_order.cf.json
rename to tests/acceptance/00_basics/def_json/augments_order.cf.json
diff --git a/tests/acceptance/00_basics/def.json/bad-json.cf b/tests/acceptance/00_basics/def_json/bad-json.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/bad-json.cf
rename to tests/acceptance/00_basics/def_json/bad-json.cf
diff --git a/tests/acceptance/00_basics/def.json/bad-json.cf.x.json b/tests/acceptance/00_basics/def_json/bad-json.cf.x.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/bad-json.cf.x.json
rename to tests/acceptance/00_basics/def_json/bad-json.cf.x.json
diff --git a/tests/acceptance/00_basics/def.json/class_from_classexpression.cf b/tests/acceptance/00_basics/def_json/class_from_classexpression.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/class_from_classexpression.cf
rename to tests/acceptance/00_basics/def_json/class_from_classexpression.cf
diff --git a/tests/acceptance/00_basics/def.json/class_from_classexpression.cf.json b/tests/acceptance/00_basics/def_json/class_from_classexpression.cf.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/class_from_classexpression.cf.json
rename to tests/acceptance/00_basics/def_json/class_from_classexpression.cf.json
diff --git a/tests/acceptance/00_basics/def.json/classes.cf b/tests/acceptance/00_basics/def_json/classes.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/classes.cf
rename to tests/acceptance/00_basics/def_json/classes.cf
diff --git a/tests/acceptance/00_basics/def.json/classes.cf.json b/tests/acceptance/00_basics/def_json/classes.cf.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/classes.cf.json
rename to tests/acceptance/00_basics/def_json/classes.cf.json
diff --git a/tests/acceptance/00_basics/def.json/classes_with_ns.cf b/tests/acceptance/00_basics/def_json/classes_with_ns.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/classes_with_ns.cf
rename to tests/acceptance/00_basics/def_json/classes_with_ns.cf
diff --git a/tests/acceptance/00_basics/def.json/classes_with_ns.cf.json b/tests/acceptance/00_basics/def_json/classes_with_ns.cf.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/classes_with_ns.cf.json
rename to tests/acceptance/00_basics/def_json/classes_with_ns.cf.json
diff --git a/tests/acceptance/00_basics/def.json/classes_with_ns_tags.cf b/tests/acceptance/00_basics/def_json/classes_with_ns_tags.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/classes_with_ns_tags.cf
rename to tests/acceptance/00_basics/def_json/classes_with_ns_tags.cf
diff --git a/tests/acceptance/00_basics/def.json/classes_with_ns_tags.cf.json b/tests/acceptance/00_basics/def_json/classes_with_ns_tags.cf.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/classes_with_ns_tags.cf.json
rename to tests/acceptance/00_basics/def_json/classes_with_ns_tags.cf.json
diff --git a/tests/acceptance/00_basics/def.json/concurrent-vars-and-variables-keys/both-can-define-vars.cf b/tests/acceptance/00_basics/def_json/concurrent-vars-and-variables-keys/both-can-define-vars.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/concurrent-vars-and-variables-keys/both-can-define-vars.cf
rename to tests/acceptance/00_basics/def_json/concurrent-vars-and-variables-keys/both-can-define-vars.cf
diff --git a/tests/acceptance/00_basics/def.json/concurrent-vars-and-variables-keys/def.json b/tests/acceptance/00_basics/def_json/concurrent-vars-and-variables-keys/def.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/concurrent-vars-and-variables-keys/def.json
rename to tests/acceptance/00_basics/def_json/concurrent-vars-and-variables-keys/def.json
diff --git a/tests/acceptance/00_basics/def.json/concurrent-vars-and-variables-keys/variables-wins-variables-listed-first/def.json b/tests/acceptance/00_basics/def_json/concurrent-vars-and-variables-keys/variables-wins-variables-listed-first/def.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/concurrent-vars-and-variables-keys/variables-wins-variables-listed-first/def.json
rename to tests/acceptance/00_basics/def_json/concurrent-vars-and-variables-keys/variables-wins-variables-listed-first/def.json
diff --git a/tests/acceptance/00_basics/def.json/concurrent-vars-and-variables-keys/variables-wins-variables-listed-first/variables-wins.cf b/tests/acceptance/00_basics/def_json/concurrent-vars-and-variables-keys/variables-wins-variables-listed-first/variables-wins.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/concurrent-vars-and-variables-keys/variables-wins-variables-listed-first/variables-wins.cf
rename to tests/acceptance/00_basics/def_json/concurrent-vars-and-variables-keys/variables-wins-variables-listed-first/variables-wins.cf
diff --git a/tests/acceptance/00_basics/def.json/concurrent-vars-and-variables-keys/variables-wins.cf b/tests/acceptance/00_basics/def_json/concurrent-vars-and-variables-keys/variables-wins.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/concurrent-vars-and-variables-keys/variables-wins.cf
rename to tests/acceptance/00_basics/def_json/concurrent-vars-and-variables-keys/variables-wins.cf
diff --git a/tests/acceptance/00_basics/def.json/def.json b/tests/acceptance/00_basics/def_json/def.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/def.json
rename to tests/acceptance/00_basics/def_json/def.json
diff --git a/tests/acceptance/00_basics/def.json/def_preferred.json/def.json b/tests/acceptance/00_basics/def_json/def_preferred.json/def.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/def_preferred.json/def.json
rename to tests/acceptance/00_basics/def_json/def_preferred.json/def.json
diff --git a/tests/acceptance/00_basics/def.json/def_preferred.json/def_preferred.cf b/tests/acceptance/00_basics/def_json/def_preferred.json/def_preferred.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/def_preferred.json/def_preferred.cf
rename to tests/acceptance/00_basics/def_json/def_preferred.json/def_preferred.cf
diff --git a/tests/acceptance/00_basics/def.json/def_preferred.json/def_preferred.json b/tests/acceptance/00_basics/def_json/def_preferred.json/def_preferred.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/def_preferred.json/def_preferred.json
rename to tests/acceptance/00_basics/def_json/def_preferred.json/def_preferred.json
diff --git a/tests/acceptance/00_basics/def.json/inputs.cf b/tests/acceptance/00_basics/def_json/inputs.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/inputs.cf
rename to tests/acceptance/00_basics/def_json/inputs.cf
diff --git a/tests/acceptance/00_basics/def.json/inputs.cf.json b/tests/acceptance/00_basics/def_json/inputs.cf.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/inputs.cf.json
rename to tests/acceptance/00_basics/def_json/inputs.cf.json
diff --git a/tests/acceptance/00_basics/def.json/json-inputs-not-array.cf b/tests/acceptance/00_basics/def_json/json-inputs-not-array.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/json-inputs-not-array.cf
rename to tests/acceptance/00_basics/def_json/json-inputs-not-array.cf
diff --git a/tests/acceptance/00_basics/def.json/json-inputs-not-array.cf.json b/tests/acceptance/00_basics/def_json/json-inputs-not-array.cf.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/json-inputs-not-array.cf.json
rename to tests/acceptance/00_basics/def_json/json-inputs-not-array.cf.json
diff --git a/tests/acceptance/00_basics/def.json/json-inputs-not-auto-applied.cf b/tests/acceptance/00_basics/def_json/json-inputs-not-auto-applied.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/json-inputs-not-auto-applied.cf
rename to tests/acceptance/00_basics/def_json/json-inputs-not-auto-applied.cf
diff --git a/tests/acceptance/00_basics/def.json/json-inputs-not-auto-applied.cf.json b/tests/acceptance/00_basics/def_json/json-inputs-not-auto-applied.cf.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/json-inputs-not-auto-applied.cf.json
rename to tests/acceptance/00_basics/def_json/json-inputs-not-auto-applied.cf.json
diff --git a/tests/acceptance/00_basics/def.json/policy_server_classes.cf b/tests/acceptance/00_basics/def_json/policy_server_classes.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/policy_server_classes.cf
rename to tests/acceptance/00_basics/def_json/policy_server_classes.cf
diff --git a/tests/acceptance/00_basics/def.json/policy_server_classes.cf.json b/tests/acceptance/00_basics/def_json/policy_server_classes.cf.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/policy_server_classes.cf.json
rename to tests/acceptance/00_basics/def_json/policy_server_classes.cf.json
diff --git a/tests/acceptance/00_basics/def.json/show_vars_JSON.cf b/tests/acceptance/00_basics/def_json/show_vars_JSON.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/show_vars_JSON.cf
rename to tests/acceptance/00_basics/def_json/show_vars_JSON.cf
diff --git a/tests/acceptance/00_basics/def.json/show_vars_JSON.cf.json b/tests/acceptance/00_basics/def_json/show_vars_JSON.cf.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/show_vars_JSON.cf.json
rename to tests/acceptance/00_basics/def_json/show_vars_JSON.cf.json
diff --git a/tests/acceptance/00_basics/def.json/state.cf b/tests/acceptance/00_basics/def_json/state.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/state.cf
rename to tests/acceptance/00_basics/def_json/state.cf
diff --git a/tests/acceptance/00_basics/def.json/state.cf.expected.json b/tests/acceptance/00_basics/def_json/state.cf.expected.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/state.cf.expected.json
rename to tests/acceptance/00_basics/def_json/state.cf.expected.json
diff --git a/tests/acceptance/00_basics/def.json/variables.cf b/tests/acceptance/00_basics/def_json/variables.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/variables.cf
rename to tests/acceptance/00_basics/def_json/variables.cf
diff --git a/tests/acceptance/00_basics/def.json/variables.cf.json b/tests/acceptance/00_basics/def_json/variables.cf.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/variables.cf.json
rename to tests/acceptance/00_basics/def_json/variables.cf.json
diff --git a/tests/acceptance/00_basics/def.json/variables_bare_array.cf b/tests/acceptance/00_basics/def_json/variables_bare_array.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/variables_bare_array.cf
rename to tests/acceptance/00_basics/def_json/variables_bare_array.cf
diff --git a/tests/acceptance/00_basics/def.json/variables_bare_array.cf.json b/tests/acceptance/00_basics/def_json/variables_bare_array.cf.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/variables_bare_array.cf.json
rename to tests/acceptance/00_basics/def_json/variables_bare_array.cf.json
diff --git a/tests/acceptance/00_basics/def.json/variables_bare_string.cf b/tests/acceptance/00_basics/def_json/variables_bare_string.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/variables_bare_string.cf
rename to tests/acceptance/00_basics/def_json/variables_bare_string.cf
diff --git a/tests/acceptance/00_basics/def.json/variables_bare_string.cf.json b/tests/acceptance/00_basics/def_json/variables_bare_string.cf.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/variables_bare_string.cf.json
rename to tests/acceptance/00_basics/def_json/variables_bare_string.cf.json
diff --git a/tests/acceptance/00_basics/def.json/variables_with_bundle.cf b/tests/acceptance/00_basics/def_json/variables_with_bundle.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/variables_with_bundle.cf
rename to tests/acceptance/00_basics/def_json/variables_with_bundle.cf
diff --git a/tests/acceptance/00_basics/def.json/variables_with_bundle.cf.json b/tests/acceptance/00_basics/def_json/variables_with_bundle.cf.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/variables_with_bundle.cf.json
rename to tests/acceptance/00_basics/def_json/variables_with_bundle.cf.json
diff --git a/tests/acceptance/00_basics/def.json/variables_with_ns.cf b/tests/acceptance/00_basics/def_json/variables_with_ns.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/variables_with_ns.cf
rename to tests/acceptance/00_basics/def_json/variables_with_ns.cf
diff --git a/tests/acceptance/00_basics/def.json/variables_with_ns.cf.json b/tests/acceptance/00_basics/def_json/variables_with_ns.cf.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/variables_with_ns.cf.json
rename to tests/acceptance/00_basics/def_json/variables_with_ns.cf.json
diff --git a/tests/acceptance/00_basics/def.json/vars.cf b/tests/acceptance/00_basics/def_json/vars.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/vars.cf
rename to tests/acceptance/00_basics/def_json/vars.cf
diff --git a/tests/acceptance/00_basics/def.json/vars.cf.json b/tests/acceptance/00_basics/def_json/vars.cf.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/vars.cf.json
rename to tests/acceptance/00_basics/def_json/vars.cf.json
diff --git a/tests/acceptance/00_basics/def.json/vars_with_bundle.cf b/tests/acceptance/00_basics/def_json/vars_with_bundle.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/vars_with_bundle.cf
rename to tests/acceptance/00_basics/def_json/vars_with_bundle.cf
diff --git a/tests/acceptance/00_basics/def.json/vars_with_bundle.cf.json b/tests/acceptance/00_basics/def_json/vars_with_bundle.cf.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/vars_with_bundle.cf.json
rename to tests/acceptance/00_basics/def_json/vars_with_bundle.cf.json
diff --git a/tests/acceptance/00_basics/def.json/vars_with_ns.cf b/tests/acceptance/00_basics/def_json/vars_with_ns.cf
similarity index 100%
rename from tests/acceptance/00_basics/def.json/vars_with_ns.cf
rename to tests/acceptance/00_basics/def_json/vars_with_ns.cf
diff --git a/tests/acceptance/00_basics/def.json/vars_with_ns.cf.json b/tests/acceptance/00_basics/def_json/vars_with_ns.cf.json
similarity index 100%
rename from tests/acceptance/00_basics/def.json/vars_with_ns.cf.json
rename to tests/acceptance/00_basics/def_json/vars_with_ns.cf.json

From cbb8e52168a704c4bb39cc530d863808f929089b Mon Sep 17 00:00:00 2001
From: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
Date: Thu, 15 Oct 2026 15:03:29 +0300
Subject: [PATCH 06/11] Fixed execresult_action_immediate.cf logging errors

The test used the 'immediate' body from plucked.sub.cf before it was
loaded during pre-evaluation, so the promise is now skipped until the
test framework is loaded.

Ticket: CFE-3041
Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
---
 .../execresult_action_immediate.cf             | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/tests/acceptance/01_vars/02_functions/execresult_action_immediate.cf b/tests/acceptance/01_vars/02_functions/execresult_action_immediate.cf
index 0181e9569e6..1e0634a6098 100644
--- a/tests/acceptance/01_vars/02_functions/execresult_action_immediate.cf
+++ b/tests/acceptance/01_vars/02_functions/execresult_action_immediate.cf
@@ -7,14 +7,23 @@ body common control
   version => "1.0";
 }
 
+# The 'immediate' body comes from plucked.sub.cf, which is not loaded yet when
+# the policy is pre-evaluated, so promises using it are skipped until then
+bundle common framework
+{
+  classes:
+    "framework_loaded" expression => isvariable("G.testdir");
+}
+
 bundle agent check_date(x)
 {
   vars:
     "reports_file" string => "$(G.testdir)/execresult_action_immediate_report";
 
-    "date"
-      string => execresult("date; sleep 1", "useshell"),
-      action => immediate;
+    framework_loaded::
+      "date"
+        string => execresult("date; sleep 1", "useshell"),
+        action => immediate;
 
   reports:
     "Date for ${x}: ${date}" report_to_file => "$(reports_file)";
@@ -41,7 +50,8 @@ bundle agent check
     "content"
       slist => readstringlist(
         "$(check_date.reports_file)", "", '$(const.n)', inf, inf
-      );
+      ),
+      if => fileexists("$(check_date.reports_file)");
 
     "count" int => length(content);
 

From bef57e9a474c272c62015460841865cac3b4a341 Mon Sep 17 00:00:00 2001
From: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
Date: Thu, 15 Oct 2026 15:03:30 +0300
Subject: [PATCH 07/11] Fixed classic_evaluation_custom_promise_types.cf
 logging errors

The test referred to a promise module which never existed and did not run its init and cleanup bundles.

Ticket: CFE-3041
Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
---
 ...classic_evaluation_custom_promise_types.cf | 10 +++--
 .../01_common/dummy_promise_type.py           | 40 +++++++++++++++++++
 2 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 tests/acceptance/15_control/01_common/dummy_promise_type.py

diff --git a/tests/acceptance/15_control/01_common/classic_evaluation_custom_promise_types.cf b/tests/acceptance/15_control/01_common/classic_evaluation_custom_promise_types.cf
index 379663d0b9a..4976b216f4c 100644
--- a/tests/acceptance/15_control/01_common/classic_evaluation_custom_promise_types.cf
+++ b/tests/acceptance/15_control/01_common/classic_evaluation_custom_promise_types.cf
@@ -1,13 +1,13 @@
 body common control
 {
   inputs => { "../../default.sub.cf" };
-  bundlesequence => { "test" };
+  bundlesequence => { "init", "test", "cleanup" };
   evaluation_order => "classic";
 }
 
 promise agent dummy
 {
-  path => "$(this.promise_dirname)/top_down/dummy_promise_type.py";
+  path => "$(this.promise_dirname)/dummy_promise_type.py";
   interpreter => "/usr/bin/python3";
 }
 
@@ -23,13 +23,15 @@ bundle agent test
     "/tmp/dummyfile" smth => "hello";
 
   vars:
-    "content" string => readfile("/tmp/dummyfile");
+    "content" string => readfile("/tmp/dummyfile"),
+      if => fileexists("/tmp/dummyfile");
 
   files:
     "/tmp/dummyfile" content => "ok";
 
   vars:
-    "content" string => readfile("/tmp/dummyfile");
+    "content" string => readfile("/tmp/dummyfile"),
+      if => fileexists("/tmp/dummyfile");
 
   classes:
     "ok" expression => strcmp("$(content)", "ok");
diff --git a/tests/acceptance/15_control/01_common/dummy_promise_type.py b/tests/acceptance/15_control/01_common/dummy_promise_type.py
new file mode 100644
index 00000000000..506733d056a
--- /dev/null
+++ b/tests/acceptance/15_control/01_common/dummy_promise_type.py
@@ -0,0 +1,40 @@
+#!/usr/bin/python3
+#
+# Minimal custom promise module which accepts any promise and does nothing,
+# used to have a custom promise type in evaluation order tests.
+
+import sys
+
+
+def read_request():
+    request = {}
+    for line in sys.stdin:
+        line = line.rstrip("\n")
+        if not line:
+            return request
+        key, _, value = line.partition("=")
+        request[key] = value
+    sys.exit(0)
+
+
+def write_response(operation, result):
+    sys.stdout.write("operation=%s\nresult=%s\n\n" % (operation, result))
+    sys.stdout.flush()
+
+
+# Skip the header from the agent and send ours
+read_request()
+sys.stdout.write("dummy_promise_type 0.0.1 v1 line_based\n\n")
+sys.stdout.flush()
+
+while True:
+    operation = read_request().get("operation")
+    if operation == "validate_promise":
+        write_response(operation, "valid")
+    elif operation == "evaluate_promise":
+        write_response(operation, "kept")
+    elif operation == "terminate":
+        write_response(operation, "success")
+        sys.exit(0)
+    else:
+        write_response(operation, "error")

From a752534670dc0f390db1e7dc6680b9438a21d91f Mon Sep 17 00:00:00 2001
From: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
Date: Thu, 15 Oct 2026 15:51:01 +0300
Subject: [PATCH 08/11] Fixed changes_silent.cf logging errors

The check bundle counted lines in files which do not exist until the test bundle has run, but the agent evaluates the functions of all promises before any bundle runs.

Ticket: CFE-3041
Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
---
 .../10_files/02_maintain/changes_silent.cf    | 52 +++++++++++--------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/tests/acceptance/10_files/02_maintain/changes_silent.cf b/tests/acceptance/10_files/02_maintain/changes_silent.cf
index db87d61d5c6..0a27de9e1cf 100644
--- a/tests/acceptance/10_files/02_maintain/changes_silent.cf
+++ b/tests/acceptance/10_files/02_maintain/changes_silent.cf
@@ -95,38 +95,47 @@ bundle agent check
     "n_quiet_content"
       int => countlinesmatching(
         ".*quiet_content\.txt,C,Content changed.*", "$(log)"
-      );
+      ),
+      if => fileexists("$(log)");
 
     "n_quiet_all_content"
       int => countlinesmatching(
         ".*quiet_all\.txt,C,Content changed.*", "$(log)"
-      );
+      ),
+      if => fileexists("$(log)");
 
     "n_quiet_all_stats"
-      int => countlinesmatching(".*quiet_all\.txt,S,.*", "$(log)");
+      int => countlinesmatching(".*quiet_all\.txt,S,.*", "$(log)"),
+      if => fileexists("$(log)");
 
   classes:
-    "leaked"
-      expression => isgreaterthan(
-        countlinesmatching(".*$(must_be_absent).*", "$(test.output)"), "0"
-      );
-
-    "missing"
-      expression => islessthan(
-        countlinesmatching(".*$(must_be_present).*", "$(test.output)"), "1"
-      );
-
-    "audit_ok"
-      and => {
-        isgreaterthan("$(n_quiet_content)", "0"),
-        isgreaterthan("$(n_quiet_all_content)", "0"),
-        isgreaterthan("$(n_quiet_all_stats)", "0"),
-      };
+    # The output is read only once it exists, since the functions are also
+    # evaluated before the test bundle runs
+    "output_exists" expression => fileexists("$(test.output)");
+
+    output_exists::
+      "leaked"
+        expression => isgreaterthan(
+          countlinesmatching(".*$(must_be_absent).*", "$(test.output)"), "0"
+        );
+
+      "missing"
+        expression => islessthan(
+          countlinesmatching(".*$(must_be_present).*", "$(test.output)"), "1"
+        );
+
+    any::
+      "audit_ok"
+        and => {
+          isgreaterthan("$(n_quiet_content)", "0"),
+          isgreaterthan("$(n_quiet_all_content)", "0"),
+          isgreaterthan("$(n_quiet_all_stats)", "0"),
+        };
 
-    "ok" and => { "!leaked", "!missing", "audit_ok" };
+      "ok" and => { "output_exists", "!leaked", "!missing", "audit_ok" };
 
   reports:
-    DEBUG::
+    DEBUG.output_exists::
       "silence leaked an alert matching '$(must_be_absent)'"
         if => isgreaterthan(
           countlinesmatching(".*$(must_be_absent).*", "$(test.output)"), "0"
@@ -137,6 +146,7 @@ bundle agent check
           countlinesmatching(".*$(must_be_present).*", "$(test.output)"), "1"
         );
 
+    DEBUG::
       "Output of $(this.promise_filename).sub is in '$(test.output)'";
 
     DEBUG.!audit_ok::

From 0a1fb72f5920e827f6b63975027cbae1584946c2 Mon Sep 17 00:00:00 2001
From: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
Date: Thu, 15 Oct 2026 16:00:33 +0300
Subject: [PATCH 09/11] Fixed wrong-bundle-type.cf and ifelse.cf logging errors

wrong-bundle-type.cf printed the sub-agent output in its DEBUG report, so the sub-agent errors were mistaken for errors of the test, and ifelse.cf used invalid class expressions as false conditions.

Ticket: CFE-3041
Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
---
 tests/acceptance/00_basics/04_bundles/wrong-bundle-type.cf | 6 +++++-
 tests/acceptance/01_vars/02_functions/ifelse.cf            | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/acceptance/00_basics/04_bundles/wrong-bundle-type.cf b/tests/acceptance/00_basics/04_bundles/wrong-bundle-type.cf
index db2641cbe6d..e1e1e57b980 100644
--- a/tests/acceptance/00_basics/04_bundles/wrong-bundle-type.cf
+++ b/tests/acceptance/00_basics/04_bundles/wrong-bundle-type.cf
@@ -20,6 +20,10 @@ bundle agent test
         "${sys.cf_agent} -Kf $(this.promise_dirname)/wrong-bundle-type.sub.x.cf",
         "noshell"
       );
+
+    # Indent the output in the DEBUG report, so that errors printed by the
+    # sub-agent are not mistaken for errors of this test by testall
+    "subout_indented" string => regex_replace($(subout), "^", "  | ", "gm");
 }
 
 bundle agent check
@@ -29,7 +33,7 @@ bundle agent check
 
   reports:
     DEBUG::
-      "$(test.subout)";
+      "$(test.subout_indented)";
 
     ok::
       "$(this.promise_filename) Pass";
diff --git a/tests/acceptance/01_vars/02_functions/ifelse.cf b/tests/acceptance/01_vars/02_functions/ifelse.cf
index bc3ffe9fadb..55a6d7b9910 100644
--- a/tests/acceptance/01_vars/02_functions/ifelse.cf
+++ b/tests/acceptance/01_vars/02_functions/ifelse.cf
@@ -35,9 +35,9 @@ bundle agent test
 
     "five"
       string => ifelse(
-        "this is not true",
+        "this_is_not_true",
         "5 parameters broken",
-        "this is also not true",
+        "this_is_also_not_true",
         "5 parameters broken 2",
         "5 parameters OK"
       );

From 089e2a1212ac3d81be267a7cfcf80a95d922b964 Mon Sep 17 00:00:00 2001
From: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
Date: Thu, 15 Oct 2026 16:00:33 +0300
Subject: [PATCH 10/11] Renamed acceptance tests which log errors on purpose to
 .error.pass.cf

These tests intentionally exercise error paths, the reason is documented in the header of each test.

Ticket: CFE-3041
Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
---
 .../{string_contexts.cf => string_contexts.error.pass.cf}     | 4 ++++
 ...ected.json => string_contexts.error.pass.cf.expected.json} | 0
 .../acceptance/01_vars/01_basic/{013.cf => 013.error.pass.cf} | 4 ++++
 ... can_not_define_variables_in_remote_bundles.error.pass.cf} | 4 ++++
 .../01_vars/02_functions/{006.cf => 006.error.pass.cf}        | 3 +++
 .../02_functions/{CFE-2704-0.cf => CFE-2704-0.error.pass.cf}  | 4 ++++
 .../02_functions/{CFE-2704-1.cf => CFE-2704-1.error.pass.cf}  | 4 ++++
 .../02_functions/countlinesmatching_errors_on_absent_file.cf  | 2 +-
 ...inesmatching_returns_0_on_inaccessable_file.error.pass.cf} | 3 +++
 .../01_vars/02_functions/{lsdir.cf => lsdir.error.pass.cf}    | 3 +++
 .../{nth_datacontainer.cf => nth_datacontainer.error.pass.cf} | 4 ++++
 ...r.cf.expected => nth_datacontainer.error.pass.cf.expected} | 0
 ...container.cf.json => nth_datacontainer.error.pass.cf.json} | 0
 ...e-endless-loop.cf => read-file-endless-loop.error.pass.cf} | 4 ++++
 .../02_functions/{readdata.cf => readdata.error.pass.cf}      | 4 ++++
 .../{readdata.cf.csv => readdata.error.pass.cf.csv}           | 0
 ...readdata.cf.csv.guess => readdata.error.pass.cf.csv.guess} | 0
 .../{readdata.cf.env => readdata.error.pass.cf.env}           | 2 +-
 ....cf.expected.json => readdata.error.pass.cf.expected.json} | 0
 .../{readdata.cf.json => readdata.error.pass.cf.json}         | 0
 ...addata.cf.json.guess => readdata.error.pass.cf.json.guess} | 0
 .../{readdata_yaml.cf => readdata_yaml.error.pass.cf}         | 4 ++++
 ...xpected.json => readdata_yaml.error.pass.cf.expected.json} | 0
 ...readdata_yaml.cf.yaml => readdata_yaml.error.pass.cf.yaml} | 0
 ...l.cf.yaml.guess => readdata_yaml.error.pass.cf.yaml.guess} | 0
 .../{readdata_yaml.cf.yml => readdata_yaml.error.pass.cf.yml} | 0
 ...iner_conflict.cf => mergecontainer_conflict.error.pass.cf} | 3 +++
 .../{parseyaml_abuse.cf => parseyaml_abuse.error.pass.cf}     | 3 +++
 ...cf => common_bundle_select_class_empty_list.error.pass.cf} | 3 +++
 ...le_select_class_variable_expands_empty_list.error.pass.cf} | 3 +++
 ...subnet-valid-ip.cf => isipinsubnet-valid-ip.error.pass.cf} | 3 +++
 ...select_fncalls.cf => process_select_fncalls.error.pass.cf} | 3 +++
 32 files changed, 65 insertions(+), 2 deletions(-)
 rename tests/acceptance/00_basics/01_compiler/{string_contexts.cf => string_contexts.error.pass.cf} (93%)
 rename tests/acceptance/00_basics/01_compiler/{string_contexts.cf.expected.json => string_contexts.error.pass.cf.expected.json} (100%)
 rename tests/acceptance/01_vars/01_basic/{013.cf => 013.error.pass.cf} (88%)
 rename tests/acceptance/01_vars/01_basic/{can_not_define_variables_in_remote_bundles.cf => can_not_define_variables_in_remote_bundles.error.pass.cf} (93%)
 rename tests/acceptance/01_vars/02_functions/{006.cf => 006.error.pass.cf} (91%)
 rename tests/acceptance/01_vars/02_functions/{CFE-2704-0.cf => CFE-2704-0.error.pass.cf} (74%)
 rename tests/acceptance/01_vars/02_functions/{CFE-2704-1.cf => CFE-2704-1.error.pass.cf} (74%)
 rename tests/acceptance/01_vars/02_functions/{countlinesmatching_returns_0_on_inaccessable_file.cf => countlinesmatching_returns_0_on_inaccessable_file.error.pass.cf} (89%)
 rename tests/acceptance/01_vars/02_functions/{lsdir.cf => lsdir.error.pass.cf} (94%)
 rename tests/acceptance/01_vars/02_functions/{nth_datacontainer.cf => nth_datacontainer.error.pass.cf} (94%)
 rename tests/acceptance/01_vars/02_functions/{nth_datacontainer.cf.expected => nth_datacontainer.error.pass.cf.expected} (100%)
 rename tests/acceptance/01_vars/02_functions/{nth_datacontainer.cf.json => nth_datacontainer.error.pass.cf.json} (100%)
 rename tests/acceptance/01_vars/02_functions/{read-file-endless-loop.cf => read-file-endless-loop.error.pass.cf} (77%)
 rename tests/acceptance/01_vars/02_functions/{readdata.cf => readdata.error.pass.cf} (91%)
 rename tests/acceptance/01_vars/02_functions/{readdata.cf.csv => readdata.error.pass.cf.csv} (100%)
 rename tests/acceptance/01_vars/02_functions/{readdata.cf.csv.guess => readdata.error.pass.cf.csv.guess} (100%)
 rename tests/acceptance/01_vars/02_functions/{readdata.cf.env => readdata.error.pass.cf.env} (93%)
 rename tests/acceptance/01_vars/02_functions/{readdata.cf.expected.json => readdata.error.pass.cf.expected.json} (100%)
 rename tests/acceptance/01_vars/02_functions/{readdata.cf.json => readdata.error.pass.cf.json} (100%)
 rename tests/acceptance/01_vars/02_functions/{readdata.cf.json.guess => readdata.error.pass.cf.json.guess} (100%)
 rename tests/acceptance/01_vars/02_functions/{readdata_yaml.cf => readdata_yaml.error.pass.cf} (87%)
 rename tests/acceptance/01_vars/02_functions/{readdata_yaml.cf.expected.json => readdata_yaml.error.pass.cf.expected.json} (100%)
 rename tests/acceptance/01_vars/02_functions/{readdata_yaml.cf.yaml => readdata_yaml.error.pass.cf.yaml} (100%)
 rename tests/acceptance/01_vars/02_functions/{readdata_yaml.cf.yaml.guess => readdata_yaml.error.pass.cf.yaml.guess} (100%)
 rename tests/acceptance/01_vars/02_functions/{readdata_yaml.cf.yml => readdata_yaml.error.pass.cf.yml} (100%)
 rename tests/acceptance/01_vars/04_containers/{mergecontainer_conflict.cf => mergecontainer_conflict.error.pass.cf} (90%)
 rename tests/acceptance/01_vars/04_containers/{parseyaml_abuse.cf => parseyaml_abuse.error.pass.cf} (87%)
 rename tests/acceptance/02_classes/01_basic/{common_bundle_select_class_empty_list.cf => common_bundle_select_class_empty_list.error.pass.cf} (86%)
 rename tests/acceptance/02_classes/01_basic/{common_bundle_select_class_variable_expands_empty_list.cf => common_bundle_select_class_variable_expands_empty_list.error.pass.cf} (81%)
 rename tests/acceptance/02_classes/02_functions/{isipinsubnet-valid-ip.cf => isipinsubnet-valid-ip.error.pass.cf} (92%)
 rename tests/acceptance/05_processes/01_matching/{process_select_fncalls.cf => process_select_fncalls.error.pass.cf} (95%)

diff --git a/tests/acceptance/00_basics/01_compiler/string_contexts.cf b/tests/acceptance/00_basics/01_compiler/string_contexts.error.pass.cf
similarity index 93%
rename from tests/acceptance/00_basics/01_compiler/string_contexts.cf
rename to tests/acceptance/00_basics/01_compiler/string_contexts.error.pass.cf
index 0bf5503ac25..3d3f99d453b 100644
--- a/tests/acceptance/00_basics/01_compiler/string_contexts.cf
+++ b/tests/acceptance/00_basics/01_compiler/string_contexts.error.pass.cf
@@ -1,5 +1,9 @@
 # fixes https://dev.cfengine.com/issues/2504
 # using variables in string contexts
+#
+# This is an .error.pass.cf test, because the 'cf engine' class context
+# (words separated by whitespace without an operator) is invalid on
+# purpose and logs an error.
 body common control
 {
   inputs => { "../../default.sub.cf" };
diff --git a/tests/acceptance/00_basics/01_compiler/string_contexts.cf.expected.json b/tests/acceptance/00_basics/01_compiler/string_contexts.error.pass.cf.expected.json
similarity index 100%
rename from tests/acceptance/00_basics/01_compiler/string_contexts.cf.expected.json
rename to tests/acceptance/00_basics/01_compiler/string_contexts.error.pass.cf.expected.json
diff --git a/tests/acceptance/01_vars/01_basic/013.cf b/tests/acceptance/01_vars/01_basic/013.error.pass.cf
similarity index 88%
rename from tests/acceptance/01_vars/01_basic/013.cf
rename to tests/acceptance/01_vars/01_basic/013.error.pass.cf
index 4bf5fdfc56c..87d40432ef9 100644
--- a/tests/acceptance/01_vars/01_basic/013.cf
+++ b/tests/acceptance/01_vars/01_basic/013.error.pass.cf
@@ -2,6 +2,10 @@
 #
 # Test that 'classes' body works on 'vars' promises
 #
+# This is an .error.pass.cf test, because execresult() of the
+# non-existent '/nonexisting' fails on purpose and logs errors, to test
+# that repair_failed classes are set.
+#
 #######################################################
 body common control
 {
diff --git a/tests/acceptance/01_vars/01_basic/can_not_define_variables_in_remote_bundles.cf b/tests/acceptance/01_vars/01_basic/can_not_define_variables_in_remote_bundles.error.pass.cf
similarity index 93%
rename from tests/acceptance/01_vars/01_basic/can_not_define_variables_in_remote_bundles.cf
rename to tests/acceptance/01_vars/01_basic/can_not_define_variables_in_remote_bundles.error.pass.cf
index ea9f92b962f..aba335f5e66 100644
--- a/tests/acceptance/01_vars/01_basic/can_not_define_variables_in_remote_bundles.cf
+++ b/tests/acceptance/01_vars/01_basic/can_not_define_variables_in_remote_bundles.error.pass.cf
@@ -2,6 +2,10 @@
 #
 # Test that it is invalid to define variables in remote bundles
 #
+# This is an .error.pass.cf test, because defining a variable in a
+# remote bundle is rejected with errors, which is what this test checks
+# (CFE-1915).
+#
 #######################################################
 body common control
 {
diff --git a/tests/acceptance/01_vars/02_functions/006.cf b/tests/acceptance/01_vars/02_functions/006.error.pass.cf
similarity index 91%
rename from tests/acceptance/01_vars/02_functions/006.cf
rename to tests/acceptance/01_vars/02_functions/006.error.pass.cf
index 62914fdb892..63d85cbeb29 100644
--- a/tests/acceptance/01_vars/02_functions/006.cf
+++ b/tests/acceptance/01_vars/02_functions/006.error.pass.cf
@@ -2,6 +2,9 @@
 #
 # Test diskfree()
 #
+# This is an .error.pass.cf test, because diskfree() is called on the
+# non-existent path '/lkjqeroiu' on purpose and logs an error.
+#
 #######################################################
 body common control
 {
diff --git a/tests/acceptance/01_vars/02_functions/CFE-2704-0.cf b/tests/acceptance/01_vars/02_functions/CFE-2704-0.error.pass.cf
similarity index 74%
rename from tests/acceptance/01_vars/02_functions/CFE-2704-0.cf
rename to tests/acceptance/01_vars/02_functions/CFE-2704-0.error.pass.cf
index 27b521a02bc..06279efded8 100644
--- a/tests/acceptance/01_vars/02_functions/CFE-2704-0.cf
+++ b/tests/acceptance/01_vars/02_functions/CFE-2704-0.error.pass.cf
@@ -1,3 +1,7 @@
+# This is an .error.pass.cf test, because mergedata() is given data
+# which is not a container on purpose and logs an error, the test checks
+# that the agent does not crash.
+
 body common control
 {
   inputs => { "../../default.sub.cf" };
diff --git a/tests/acceptance/01_vars/02_functions/CFE-2704-1.cf b/tests/acceptance/01_vars/02_functions/CFE-2704-1.error.pass.cf
similarity index 74%
rename from tests/acceptance/01_vars/02_functions/CFE-2704-1.cf
rename to tests/acceptance/01_vars/02_functions/CFE-2704-1.error.pass.cf
index a475b51d68f..10acfccee9a 100644
--- a/tests/acceptance/01_vars/02_functions/CFE-2704-1.cf
+++ b/tests/acceptance/01_vars/02_functions/CFE-2704-1.error.pass.cf
@@ -1,3 +1,7 @@
+# This is an .error.pass.cf test, because mergedata() is given data
+# which is not a container on purpose and logs an error, the test checks
+# that the agent does not crash.
+
 body common control
 {
   inputs => { "../../default.sub.cf" };
diff --git a/tests/acceptance/01_vars/02_functions/countlinesmatching_errors_on_absent_file.cf b/tests/acceptance/01_vars/02_functions/countlinesmatching_errors_on_absent_file.cf
index 7df7778733f..3b2766f3932 100644
--- a/tests/acceptance/01_vars/02_functions/countlinesmatching_errors_on_absent_file.cf
+++ b/tests/acceptance/01_vars/02_functions/countlinesmatching_errors_on_absent_file.cf
@@ -25,7 +25,7 @@ bundle agent test
   vars:
     "subout"
       string => execresult(
-        "$(sys.cf_agent) -Kv --define AUTO -f $(this.promise_dirname)/countlinesmatching_returns_0_on_inaccessable_file.cf 2>&1 | $(G.grep) countlinesmatching",
+        "$(sys.cf_agent) -Kv --define AUTO -f $(this.promise_dirname)/countlinesmatching_returns_0_on_inaccessable_file.error.pass.cf 2>&1 | $(G.grep) countlinesmatching",
         "useshell"
       );
 }
diff --git a/tests/acceptance/01_vars/02_functions/countlinesmatching_returns_0_on_inaccessable_file.cf b/tests/acceptance/01_vars/02_functions/countlinesmatching_returns_0_on_inaccessable_file.error.pass.cf
similarity index 89%
rename from tests/acceptance/01_vars/02_functions/countlinesmatching_returns_0_on_inaccessable_file.cf
rename to tests/acceptance/01_vars/02_functions/countlinesmatching_returns_0_on_inaccessable_file.error.pass.cf
index 514d65a20aa..87f5a3769c7 100644
--- a/tests/acceptance/01_vars/02_functions/countlinesmatching_returns_0_on_inaccessable_file.cf
+++ b/tests/acceptance/01_vars/02_functions/countlinesmatching_returns_0_on_inaccessable_file.error.pass.cf
@@ -2,6 +2,9 @@
 #
 # Test countlinesmatching() with some kind of failure expected
 #
+# This is an .error.pass.cf test, because countlinesmatching() is called
+# on an inaccessible file on purpose and logs an error.
+#
 #######################################################
 body common control
 {
diff --git a/tests/acceptance/01_vars/02_functions/lsdir.cf b/tests/acceptance/01_vars/02_functions/lsdir.error.pass.cf
similarity index 94%
rename from tests/acceptance/01_vars/02_functions/lsdir.cf
rename to tests/acceptance/01_vars/02_functions/lsdir.error.pass.cf
index 50c103319b2..773dfd6caa2 100644
--- a/tests/acceptance/01_vars/02_functions/lsdir.cf
+++ b/tests/acceptance/01_vars/02_functions/lsdir.error.pass.cf
@@ -2,6 +2,9 @@
 #
 # Test lsdir()
 #
+# This is an .error.pass.cf test, because lsdir() is called on the
+# non-existent directory '$(G.testdir)/b' on purpose and logs an error.
+#
 #######################################################
 body common control
 {
diff --git a/tests/acceptance/01_vars/02_functions/nth_datacontainer.cf b/tests/acceptance/01_vars/02_functions/nth_datacontainer.error.pass.cf
similarity index 94%
rename from tests/acceptance/01_vars/02_functions/nth_datacontainer.cf
rename to tests/acceptance/01_vars/02_functions/nth_datacontainer.error.pass.cf
index e6090255eeb..6b5101c360d 100644
--- a/tests/acceptance/01_vars/02_functions/nth_datacontainer.cf
+++ b/tests/acceptance/01_vars/02_functions/nth_datacontainer.error.pass.cf
@@ -2,6 +2,10 @@
 #
 # Test nth() with data container input
 #
+# This is an .error.pass.cf test, because nth() is called with keys
+# which are not valid list indices (e.g. 'foo' or '') on purpose and
+# logs errors.
+#
 #######################################################
 body common control
 {
diff --git a/tests/acceptance/01_vars/02_functions/nth_datacontainer.cf.expected b/tests/acceptance/01_vars/02_functions/nth_datacontainer.error.pass.cf.expected
similarity index 100%
rename from tests/acceptance/01_vars/02_functions/nth_datacontainer.cf.expected
rename to tests/acceptance/01_vars/02_functions/nth_datacontainer.error.pass.cf.expected
diff --git a/tests/acceptance/01_vars/02_functions/nth_datacontainer.cf.json b/tests/acceptance/01_vars/02_functions/nth_datacontainer.error.pass.cf.json
similarity index 100%
rename from tests/acceptance/01_vars/02_functions/nth_datacontainer.cf.json
rename to tests/acceptance/01_vars/02_functions/nth_datacontainer.error.pass.cf.json
diff --git a/tests/acceptance/01_vars/02_functions/read-file-endless-loop.cf b/tests/acceptance/01_vars/02_functions/read-file-endless-loop.error.pass.cf
similarity index 77%
rename from tests/acceptance/01_vars/02_functions/read-file-endless-loop.cf
rename to tests/acceptance/01_vars/02_functions/read-file-endless-loop.error.pass.cf
index 1cfaa98e160..46fe379f29d 100644
--- a/tests/acceptance/01_vars/02_functions/read-file-endless-loop.cf
+++ b/tests/acceptance/01_vars/02_functions/read-file-endless-loop.error.pass.cf
@@ -1,5 +1,9 @@
 # Test that regline, getfields and countlinesmatching do not loop endlessly if
 # supplied with a directory (Redmine #2453)
+#
+# This is an .error.pass.cf test, because regline(), getfields() and
+# countlinesmatching() are given the directory '/' on purpose and log
+# errors.
 body common control
 {
   inputs => { "../../default.sub.cf" };
diff --git a/tests/acceptance/01_vars/02_functions/readdata.cf b/tests/acceptance/01_vars/02_functions/readdata.error.pass.cf
similarity index 91%
rename from tests/acceptance/01_vars/02_functions/readdata.cf
rename to tests/acceptance/01_vars/02_functions/readdata.error.pass.cf
index 59767849337..09bba95c9ec 100644
--- a/tests/acceptance/01_vars/02_functions/readdata.cf
+++ b/tests/acceptance/01_vars/02_functions/readdata.error.pass.cf
@@ -2,6 +2,10 @@
 #
 # Test readdata() with YAML
 #
+# This is an .error.pass.cf test, because readdata() is given data in a
+# format it cannot parse on purpose (the failed_* and guess_csv
+# variables) and logs errors.
+#
 ###########################################################
 body common control
 {
diff --git a/tests/acceptance/01_vars/02_functions/readdata.cf.csv b/tests/acceptance/01_vars/02_functions/readdata.error.pass.cf.csv
similarity index 100%
rename from tests/acceptance/01_vars/02_functions/readdata.cf.csv
rename to tests/acceptance/01_vars/02_functions/readdata.error.pass.cf.csv
diff --git a/tests/acceptance/01_vars/02_functions/readdata.cf.csv.guess b/tests/acceptance/01_vars/02_functions/readdata.error.pass.cf.csv.guess
similarity index 100%
rename from tests/acceptance/01_vars/02_functions/readdata.cf.csv.guess
rename to tests/acceptance/01_vars/02_functions/readdata.error.pass.cf.csv.guess
diff --git a/tests/acceptance/01_vars/02_functions/readdata.cf.env b/tests/acceptance/01_vars/02_functions/readdata.error.pass.cf.env
similarity index 93%
rename from tests/acceptance/01_vars/02_functions/readdata.cf.env
rename to tests/acceptance/01_vars/02_functions/readdata.error.pass.cf.env
index 71aaa7dd272..ac93f45f3d2 100644
--- a/tests/acceptance/01_vars/02_functions/readdata.cf.env
+++ b/tests/acceptance/01_vars/02_functions/readdata.error.pass.cf.env
@@ -1,4 +1,4 @@
-# Example env file used for acceptance test readdata.cf
+# Example env file used for acceptance test readdata.error.pass.cf
 # We can't test for all weird possibilites,
 # but this should serve most use cases
 
diff --git a/tests/acceptance/01_vars/02_functions/readdata.cf.expected.json b/tests/acceptance/01_vars/02_functions/readdata.error.pass.cf.expected.json
similarity index 100%
rename from tests/acceptance/01_vars/02_functions/readdata.cf.expected.json
rename to tests/acceptance/01_vars/02_functions/readdata.error.pass.cf.expected.json
diff --git a/tests/acceptance/01_vars/02_functions/readdata.cf.json b/tests/acceptance/01_vars/02_functions/readdata.error.pass.cf.json
similarity index 100%
rename from tests/acceptance/01_vars/02_functions/readdata.cf.json
rename to tests/acceptance/01_vars/02_functions/readdata.error.pass.cf.json
diff --git a/tests/acceptance/01_vars/02_functions/readdata.cf.json.guess b/tests/acceptance/01_vars/02_functions/readdata.error.pass.cf.json.guess
similarity index 100%
rename from tests/acceptance/01_vars/02_functions/readdata.cf.json.guess
rename to tests/acceptance/01_vars/02_functions/readdata.error.pass.cf.json.guess
diff --git a/tests/acceptance/01_vars/02_functions/readdata_yaml.cf b/tests/acceptance/01_vars/02_functions/readdata_yaml.error.pass.cf
similarity index 87%
rename from tests/acceptance/01_vars/02_functions/readdata_yaml.cf
rename to tests/acceptance/01_vars/02_functions/readdata_yaml.error.pass.cf
index 7e3fc3edd97..84922593d62 100644
--- a/tests/acceptance/01_vars/02_functions/readdata_yaml.cf
+++ b/tests/acceptance/01_vars/02_functions/readdata_yaml.error.pass.cf
@@ -2,6 +2,10 @@
 #
 # Test readdata() with YAML
 #
+# This is an .error.pass.cf test, because readdata() is given data in a
+# format it cannot parse on purpose (the failed_explicit_yaml and
+# guess_yaml variables) and logs errors.
+#
 ###########################################################
 body common control
 {
diff --git a/tests/acceptance/01_vars/02_functions/readdata_yaml.cf.expected.json b/tests/acceptance/01_vars/02_functions/readdata_yaml.error.pass.cf.expected.json
similarity index 100%
rename from tests/acceptance/01_vars/02_functions/readdata_yaml.cf.expected.json
rename to tests/acceptance/01_vars/02_functions/readdata_yaml.error.pass.cf.expected.json
diff --git a/tests/acceptance/01_vars/02_functions/readdata_yaml.cf.yaml b/tests/acceptance/01_vars/02_functions/readdata_yaml.error.pass.cf.yaml
similarity index 100%
rename from tests/acceptance/01_vars/02_functions/readdata_yaml.cf.yaml
rename to tests/acceptance/01_vars/02_functions/readdata_yaml.error.pass.cf.yaml
diff --git a/tests/acceptance/01_vars/02_functions/readdata_yaml.cf.yaml.guess b/tests/acceptance/01_vars/02_functions/readdata_yaml.error.pass.cf.yaml.guess
similarity index 100%
rename from tests/acceptance/01_vars/02_functions/readdata_yaml.cf.yaml.guess
rename to tests/acceptance/01_vars/02_functions/readdata_yaml.error.pass.cf.yaml.guess
diff --git a/tests/acceptance/01_vars/02_functions/readdata_yaml.cf.yml b/tests/acceptance/01_vars/02_functions/readdata_yaml.error.pass.cf.yml
similarity index 100%
rename from tests/acceptance/01_vars/02_functions/readdata_yaml.cf.yml
rename to tests/acceptance/01_vars/02_functions/readdata_yaml.error.pass.cf.yml
diff --git a/tests/acceptance/01_vars/04_containers/mergecontainer_conflict.cf b/tests/acceptance/01_vars/04_containers/mergecontainer_conflict.error.pass.cf
similarity index 90%
rename from tests/acceptance/01_vars/04_containers/mergecontainer_conflict.cf
rename to tests/acceptance/01_vars/04_containers/mergecontainer_conflict.error.pass.cf
index 64c72b206a4..cf578d5dbdb 100644
--- a/tests/acceptance/01_vars/04_containers/mergecontainer_conflict.cf
+++ b/tests/acceptance/01_vars/04_containers/mergecontainer_conflict.error.pass.cf
@@ -2,6 +2,9 @@
 #
 # Test mergejson() with mismatched datas
 #
+# This is an .error.pass.cf test, because parsejson() is given invalid
+# JSON on purpose and logs an error, so that mergedata() fails.
+#
 #######################################################
 body common control
 {
diff --git a/tests/acceptance/01_vars/04_containers/parseyaml_abuse.cf b/tests/acceptance/01_vars/04_containers/parseyaml_abuse.error.pass.cf
similarity index 87%
rename from tests/acceptance/01_vars/04_containers/parseyaml_abuse.cf
rename to tests/acceptance/01_vars/04_containers/parseyaml_abuse.error.pass.cf
index 316b0ac7576..0878b53f51a 100644
--- a/tests/acceptance/01_vars/04_containers/parseyaml_abuse.cf
+++ b/tests/acceptance/01_vars/04_containers/parseyaml_abuse.error.pass.cf
@@ -2,6 +2,9 @@
 #
 # Abuse parseyaml()
 #
+# This is an .error.pass.cf test, because parseyaml() is given strings
+# which are not valid YAML containers on purpose and logs errors.
+#
 #######################################################
 body common control
 {
diff --git a/tests/acceptance/02_classes/01_basic/common_bundle_select_class_empty_list.cf b/tests/acceptance/02_classes/01_basic/common_bundle_select_class_empty_list.error.pass.cf
similarity index 86%
rename from tests/acceptance/02_classes/01_basic/common_bundle_select_class_empty_list.cf
rename to tests/acceptance/02_classes/01_basic/common_bundle_select_class_empty_list.error.pass.cf
index d8e0d02a920..deabdd53c7e 100644
--- a/tests/acceptance/02_classes/01_basic/common_bundle_select_class_empty_list.cf
+++ b/tests/acceptance/02_classes/01_basic/common_bundle_select_class_empty_list.error.pass.cf
@@ -1,4 +1,7 @@
 # Test that select_class is skipped when no classes are given
+#
+# This is an .error.pass.cf test, because select_class is given an empty
+# list on purpose and logs an error.
 body common control
 {
   inputs => { "../../default.sub.cf" };
diff --git a/tests/acceptance/02_classes/01_basic/common_bundle_select_class_variable_expands_empty_list.cf b/tests/acceptance/02_classes/01_basic/common_bundle_select_class_variable_expands_empty_list.error.pass.cf
similarity index 81%
rename from tests/acceptance/02_classes/01_basic/common_bundle_select_class_variable_expands_empty_list.cf
rename to tests/acceptance/02_classes/01_basic/common_bundle_select_class_variable_expands_empty_list.error.pass.cf
index 833304f5120..cdf9cd73d8b 100644
--- a/tests/acceptance/02_classes/01_basic/common_bundle_select_class_variable_expands_empty_list.cf
+++ b/tests/acceptance/02_classes/01_basic/common_bundle_select_class_variable_expands_empty_list.error.pass.cf
@@ -1,4 +1,7 @@
 # Test that select class is skipped when the list of classes is empty
+#
+# This is an .error.pass.cf test, because select_class is given a list
+# variable which expands to an empty list on purpose and logs an error.
 body common control
 {
   inputs => { "../../default.sub.cf" };
diff --git a/tests/acceptance/02_classes/02_functions/isipinsubnet-valid-ip.cf b/tests/acceptance/02_classes/02_functions/isipinsubnet-valid-ip.error.pass.cf
similarity index 92%
rename from tests/acceptance/02_classes/02_functions/isipinsubnet-valid-ip.cf
rename to tests/acceptance/02_classes/02_functions/isipinsubnet-valid-ip.error.pass.cf
index c23da722aea..d1929a2a910 100644
--- a/tests/acceptance/02_classes/02_functions/isipinsubnet-valid-ip.cf
+++ b/tests/acceptance/02_classes/02_functions/isipinsubnet-valid-ip.error.pass.cf
@@ -2,6 +2,9 @@
 #
 # Test isipinsubnet()
 #
+# This is an .error.pass.cf test, because isipinsubnet() is given
+# 'not-an-ip-address' on purpose and logs an error.
+#
 #######################################################
 body common control
 {
diff --git a/tests/acceptance/05_processes/01_matching/process_select_fncalls.cf b/tests/acceptance/05_processes/01_matching/process_select_fncalls.error.pass.cf
similarity index 95%
rename from tests/acceptance/05_processes/01_matching/process_select_fncalls.cf
rename to tests/acceptance/05_processes/01_matching/process_select_fncalls.error.pass.cf
index 027efcc2828..bba2f72dacd 100644
--- a/tests/acceptance/05_processes/01_matching/process_select_fncalls.cf
+++ b/tests/acceptance/05_processes/01_matching/process_select_fncalls.error.pass.cf
@@ -1,3 +1,6 @@
+# This is an .error.pass.cf test, because getuid() is called for the
+# non-existent user 'nosuchuser' on purpose and logs errors (CFE-1968).
+
 body common control
 {
   inputs => { "../../default.sub.cf" };

From 7ef494040cbaeac3b94177504d392048e33dcd07 Mon Sep 17 00:00:00 2001
From: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
Date: Thu, 15 Oct 2026 16:18:37 +0300
Subject: [PATCH 11/11] Fixed linting issues

Signed-off-by: Ihor Aleksandrychiev <ihor.aleksandrychiev@northern.tech>
---
 tests/acceptance/01_vars/02_functions/011.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/012.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/013.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/014.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/015.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/016.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/017.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/018.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/019.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/020.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/021.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/024.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/025.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/026.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/027.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/028.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/029.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/030.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/031.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/032.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/033.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/034.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/037.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/038.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/039.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/040.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/041.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/042.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/043.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/044.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/045.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/046.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/047.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/050.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/410.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/420.cf         |  3 ++-
 tests/acceptance/01_vars/02_functions/421.cf         |  3 ++-
 tests/acceptance/01_vars/02_functions/447.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/520.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/521.cf         |  4 +++-
 tests/acceptance/01_vars/02_functions/620.cf         |  3 ++-
 tests/acceptance/01_vars/02_functions/621.cf         |  3 ++-
 .../01_vars/02_functions/CFE-2704-0.error.pass.cf    |  1 -
 .../01_vars/02_functions/CFE-2704-1.error.pass.cf    |  1 -
 .../acceptance/01_vars/02_functions/findfiles_up.cf  |  3 ++-
 tests/acceptance/01_vars/02_functions/getfields.cf   |  3 ++-
 .../02_functions/long_string_from_text_file.cf       |  4 +++-
 ...ray_weird_indices_real_comments_noemptyfields2.cf |  4 +++-
 .../01_vars/02_functions/read_empty_file.cf          |  7 +++++--
 tests/acceptance/01_vars/02_functions/regextract.cf  |  4 +++-
 tests/acceptance/01_vars/04_containers/readjson.cf   |  3 ++-
 .../01_vars/04_containers/readjson_arrays.cf         |  3 ++-
 .../acceptance/01_vars/04_containers/readjson_new.cf |  3 ++-
 .../01_vars/04_containers/readjson_null.cf           |  3 ++-
 .../01_vars/04_containers/readjson_objects.cf        |  3 ++-
 .../01_vars/04_containers/readjson_scalar.cf         |  3 ++-
 .../01_vars/04_containers/readjson_subindex.cf       |  3 ++-
 .../04_containers/readjson_subindex_quoted.cf        |  3 ++-
 .../01_basic/cancel_attribute_persistent_lmdb.cf     |  7 +++++--
 .../01_basic/persistent_timer_policy_default_lmdb.cf | 11 ++++++++---
 .../02_functions/classesmatching_inherit_2.cf        |  3 ++-
 .../01_matching/process_select_fncalls.error.pass.cf |  1 -
 tests/acceptance/08_commands/arglist.cf              |  4 +++-
 .../10_files/09_insert_lines/multi-files-dirs.cf     | 12 +++++++++---
 .../09_insert_lines/preserve_block_blank_lines.cf    |  4 +++-
 .../10_files/templating/empty_template_empty_file.cf |  4 +++-
 .../10_files/templating/large_template_blocks.cf     |  4 +++-
 .../templating/mustache_container_serialization.cf   |  4 +++-
 .../10_files/templating/mustache_datastate_demo.cf   |  3 ++-
 .../acceptance/10_files/templating/mustache_demo.cf  |  4 +++-
 .../templating/mustache_expect_list_find_string.cf   |  8 ++++++--
 .../10_files/templating/mustache_html_escape.cf      |  4 +++-
 .../10_files/templating/mustache_inline_demo.cf      |  3 ++-
 .../10_files/templating/mustache_render_quote.cf     |  4 +++-
 .../10_files/templating/mustache_repair_existing.cf  |  4 +++-
 .../classic_evaluation_custom_promise_types.cf       |  6 ++++--
 .../01_common/classic_evaluation_long_policy.cf      |  7 +++++--
 .../01_common/top_down_evaluation_long_policy.cf     |  7 +++++--
 tests/acceptance/31_tickets/CFE-3866/test.cf         |  4 +++-
 79 files changed, 234 insertions(+), 89 deletions(-)

diff --git a/tests/acceptance/01_vars/02_functions/011.cf b/tests/acceptance/01_vars/02_functions/011.cf
index 93a5a1c3384..b9a7aebe1e6 100644
--- a/tests/acceptance/01_vars/02_functions/011.cf
+++ b/tests/acceptance/01_vars/02_functions/011.cf
@@ -37,8 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+    "nums"
+      slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/012.cf b/tests/acceptance/01_vars/02_functions/012.cf
index 55de4ce5573..7ce4aa0c051 100644
--- a/tests/acceptance/01_vars/02_functions/012.cf
+++ b/tests/acceptance/01_vars/02_functions/012.cf
@@ -38,8 +38,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+    "nums"
+      slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/013.cf b/tests/acceptance/01_vars/02_functions/013.cf
index 4e493478c13..37821656b07 100644
--- a/tests/acceptance/01_vars/02_functions/013.cf
+++ b/tests/acceptance/01_vars/02_functions/013.cf
@@ -37,8 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+    "nums"
+      slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/014.cf b/tests/acceptance/01_vars/02_functions/014.cf
index c981a70bac4..ba82a13c2bc 100644
--- a/tests/acceptance/01_vars/02_functions/014.cf
+++ b/tests/acceptance/01_vars/02_functions/014.cf
@@ -37,8 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\.", 5, 100),
+    "nums"
+      slist => readstringlist("$(G.testfile)", "NoComment", "\.", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/015.cf b/tests/acceptance/01_vars/02_functions/015.cf
index f96df7ab224..9071d657bdc 100644
--- a/tests/acceptance/01_vars/02_functions/015.cf
+++ b/tests/acceptance/01_vars/02_functions/015.cf
@@ -37,8 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+    "nums"
+      slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/016.cf b/tests/acceptance/01_vars/02_functions/016.cf
index 2b7482ddb8f..c646ecc710f 100644
--- a/tests/acceptance/01_vars/02_functions/016.cf
+++ b/tests/acceptance/01_vars/02_functions/016.cf
@@ -38,8 +38,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+    "nums"
+      slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/017.cf b/tests/acceptance/01_vars/02_functions/017.cf
index 0b15619d31e..3a61a27d7e5 100644
--- a/tests/acceptance/01_vars/02_functions/017.cf
+++ b/tests/acceptance/01_vars/02_functions/017.cf
@@ -38,8 +38,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+    "nums"
+      slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/018.cf b/tests/acceptance/01_vars/02_functions/018.cf
index 4173999135b..29a8a437490 100644
--- a/tests/acceptance/01_vars/02_functions/018.cf
+++ b/tests/acceptance/01_vars/02_functions/018.cf
@@ -37,8 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+    "nums"
+      slist => readstringlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/019.cf b/tests/acceptance/01_vars/02_functions/019.cf
index d269fda0c69..ce2cd9145e0 100644
--- a/tests/acceptance/01_vars/02_functions/019.cf
+++ b/tests/acceptance/01_vars/02_functions/019.cf
@@ -37,8 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "X", 5, 100),
+    "nums"
+      slist => readstringlist("$(G.testfile)", "NoComment", "X", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/020.cf b/tests/acceptance/01_vars/02_functions/020.cf
index 3a1a1fe0723..2429c9eb059 100644
--- a/tests/acceptance/01_vars/02_functions/020.cf
+++ b/tests/acceptance/01_vars/02_functions/020.cf
@@ -37,8 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", "\s", 5, 100),
+    "nums"
+      slist => readstringlist("$(G.testfile)", "NoComment", "\s", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/021.cf b/tests/acceptance/01_vars/02_functions/021.cf
index f62d85462bb..1e86c7e129e 100644
--- a/tests/acceptance/01_vars/02_functions/021.cf
+++ b/tests/acceptance/01_vars/02_functions/021.cf
@@ -37,8 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" slist => readstringlist("$(G.testfile)", "NoComment", ",", 5, 100),
+    "nums"
+      slist => readstringlist("$(G.testfile)", "NoComment", ",", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/024.cf b/tests/acceptance/01_vars/02_functions/024.cf
index 6f7382d12d2..fa2da9fc34b 100644
--- a/tests/acceptance/01_vars/02_functions/024.cf
+++ b/tests/acceptance/01_vars/02_functions/024.cf
@@ -36,8 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+    "nums"
+      ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/025.cf b/tests/acceptance/01_vars/02_functions/025.cf
index 4c7c07f1079..b138c0f236c 100644
--- a/tests/acceptance/01_vars/02_functions/025.cf
+++ b/tests/acceptance/01_vars/02_functions/025.cf
@@ -37,8 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+    "nums"
+      ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/026.cf b/tests/acceptance/01_vars/02_functions/026.cf
index 5e0ea912cc8..20a3158df7a 100644
--- a/tests/acceptance/01_vars/02_functions/026.cf
+++ b/tests/acceptance/01_vars/02_functions/026.cf
@@ -36,8 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+    "nums"
+      ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/027.cf b/tests/acceptance/01_vars/02_functions/027.cf
index 75e7c539cd5..84930ea5a8a 100644
--- a/tests/acceptance/01_vars/02_functions/027.cf
+++ b/tests/acceptance/01_vars/02_functions/027.cf
@@ -36,8 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\.", 5, 100),
+    "nums"
+      ilist => readintlist("$(G.testfile)", "NoComment", "\.", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/028.cf b/tests/acceptance/01_vars/02_functions/028.cf
index 850cbb5fc44..7ac8f774d9b 100644
--- a/tests/acceptance/01_vars/02_functions/028.cf
+++ b/tests/acceptance/01_vars/02_functions/028.cf
@@ -36,8 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+    "nums"
+      ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/029.cf b/tests/acceptance/01_vars/02_functions/029.cf
index b15d19dcffa..09ff4b92689 100644
--- a/tests/acceptance/01_vars/02_functions/029.cf
+++ b/tests/acceptance/01_vars/02_functions/029.cf
@@ -37,8 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+    "nums"
+      ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/030.cf b/tests/acceptance/01_vars/02_functions/030.cf
index 3938eda2acb..83d89216bf1 100644
--- a/tests/acceptance/01_vars/02_functions/030.cf
+++ b/tests/acceptance/01_vars/02_functions/030.cf
@@ -37,8 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+    "nums"
+      ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/031.cf b/tests/acceptance/01_vars/02_functions/031.cf
index dd199a7d122..2fb7d1e63f9 100644
--- a/tests/acceptance/01_vars/02_functions/031.cf
+++ b/tests/acceptance/01_vars/02_functions/031.cf
@@ -36,8 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+    "nums"
+      ilist => readintlist("$(G.testfile)", "NoComment", "\s+", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/032.cf b/tests/acceptance/01_vars/02_functions/032.cf
index 2c0d4cf6c0f..2827c7dd1b5 100644
--- a/tests/acceptance/01_vars/02_functions/032.cf
+++ b/tests/acceptance/01_vars/02_functions/032.cf
@@ -36,8 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "X", 5, 100),
+    "nums"
+      ilist => readintlist("$(G.testfile)", "NoComment", "X", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/033.cf b/tests/acceptance/01_vars/02_functions/033.cf
index 7e3a5d367d3..59680fe18f8 100644
--- a/tests/acceptance/01_vars/02_functions/033.cf
+++ b/tests/acceptance/01_vars/02_functions/033.cf
@@ -36,8 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", "\s", 5, 100),
+    "nums"
+      ilist => readintlist("$(G.testfile)", "NoComment", "\s", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/034.cf b/tests/acceptance/01_vars/02_functions/034.cf
index 38abced469c..7ac2dcfaef1 100644
--- a/tests/acceptance/01_vars/02_functions/034.cf
+++ b/tests/acceptance/01_vars/02_functions/034.cf
@@ -36,8 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" ilist => readintlist("$(G.testfile)", "NoComment", ",", 5, 100),
+    "nums"
+      ilist => readintlist("$(G.testfile)", "NoComment", ",", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/037.cf b/tests/acceptance/01_vars/02_functions/037.cf
index 6e65a785ceb..860710e89d7 100644
--- a/tests/acceptance/01_vars/02_functions/037.cf
+++ b/tests/acceptance/01_vars/02_functions/037.cf
@@ -36,8 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+    "nums"
+      rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/038.cf b/tests/acceptance/01_vars/02_functions/038.cf
index 4fc8fb18a79..303a3915e56 100644
--- a/tests/acceptance/01_vars/02_functions/038.cf
+++ b/tests/acceptance/01_vars/02_functions/038.cf
@@ -37,8 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+    "nums"
+      rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/039.cf b/tests/acceptance/01_vars/02_functions/039.cf
index 6f72f753c8c..0e67007ee63 100644
--- a/tests/acceptance/01_vars/02_functions/039.cf
+++ b/tests/acceptance/01_vars/02_functions/039.cf
@@ -36,8 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+    "nums"
+      rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/040.cf b/tests/acceptance/01_vars/02_functions/040.cf
index 4c10aaa8d9d..5b8cee5c36a 100644
--- a/tests/acceptance/01_vars/02_functions/040.cf
+++ b/tests/acceptance/01_vars/02_functions/040.cf
@@ -36,8 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\.", 5, 100),
+    "nums"
+      rlist => readreallist("$(G.testfile)", "NoComment", "\.", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/041.cf b/tests/acceptance/01_vars/02_functions/041.cf
index 7fefc1cb209..99c50764f8e 100644
--- a/tests/acceptance/01_vars/02_functions/041.cf
+++ b/tests/acceptance/01_vars/02_functions/041.cf
@@ -36,8 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+    "nums"
+      rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/042.cf b/tests/acceptance/01_vars/02_functions/042.cf
index a1e160b2a42..bbd55f03c90 100644
--- a/tests/acceptance/01_vars/02_functions/042.cf
+++ b/tests/acceptance/01_vars/02_functions/042.cf
@@ -37,8 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+    "nums"
+      rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/043.cf b/tests/acceptance/01_vars/02_functions/043.cf
index 54b5bff2c65..27fcc3ddfb3 100644
--- a/tests/acceptance/01_vars/02_functions/043.cf
+++ b/tests/acceptance/01_vars/02_functions/043.cf
@@ -37,8 +37,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+    "nums"
+      rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/044.cf b/tests/acceptance/01_vars/02_functions/044.cf
index a28458dcc12..81690b5133d 100644
--- a/tests/acceptance/01_vars/02_functions/044.cf
+++ b/tests/acceptance/01_vars/02_functions/044.cf
@@ -36,8 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
+    "nums"
+      rlist => readreallist("$(G.testfile)", "NoComment", "\s+", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/045.cf b/tests/acceptance/01_vars/02_functions/045.cf
index 4aaa3c1fd7f..5fe7c79764e 100644
--- a/tests/acceptance/01_vars/02_functions/045.cf
+++ b/tests/acceptance/01_vars/02_functions/045.cf
@@ -36,8 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "X", 5, 100),
+    "nums"
+      rlist => readreallist("$(G.testfile)", "NoComment", "X", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/046.cf b/tests/acceptance/01_vars/02_functions/046.cf
index 251535cd8bb..895e665f796 100644
--- a/tests/acceptance/01_vars/02_functions/046.cf
+++ b/tests/acceptance/01_vars/02_functions/046.cf
@@ -36,8 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\s", 5, 100),
+    "nums"
+      rlist => readreallist("$(G.testfile)", "NoComment", "\s", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/047.cf b/tests/acceptance/01_vars/02_functions/047.cf
index b6b1384ee9b..456b7637def 100644
--- a/tests/acceptance/01_vars/02_functions/047.cf
+++ b/tests/acceptance/01_vars/02_functions/047.cf
@@ -36,8 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", ",", 5, 100),
+    "nums"
+      rlist => readreallist("$(G.testfile)", "NoComment", ",", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/050.cf b/tests/acceptance/01_vars/02_functions/050.cf
index b53302a9df0..659225ef5d5 100644
--- a/tests/acceptance/01_vars/02_functions/050.cf
+++ b/tests/acceptance/01_vars/02_functions/050.cf
@@ -36,8 +36,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "nums" rlist => readreallist("$(G.testfile)", "NoComment", "\.", 5, 100),
+    "nums"
+      rlist => readreallist("$(G.testfile)", "NoComment", "\.", 5, 100),
       if => fileexists("$(G.testfile)");
+
     "sum" real => sum("nums");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/410.cf b/tests/acceptance/01_vars/02_functions/410.cf
index e05695088a1..3a0fa32e4bf 100644
--- a/tests/acceptance/01_vars/02_functions/410.cf
+++ b/tests/acceptance/01_vars/02_functions/410.cf
@@ -48,8 +48,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "cnt" int => readstringarray("ary", "$(G.testfile)", "^#.*", ":+", 10, 14),
+    "cnt"
+      int => readstringarray("ary", "$(G.testfile)", "^#.*", ":+", 10, 14),
       if => fileexists("$(G.testfile)");
+
     "num" int => "3";
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/420.cf b/tests/acceptance/01_vars/02_functions/420.cf
index 122a91e0c22..fb6947473ea 100644
--- a/tests/acceptance/01_vars/02_functions/420.cf
+++ b/tests/acceptance/01_vars/02_functions/420.cf
@@ -42,7 +42,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "teststr" string => readfile("$(G.testfile)", 1000),
+    "teststr"
+      string => readfile("$(G.testfile)", 1000),
       if => fileexists("$(G.testfile)");
 
     "cnt"
diff --git a/tests/acceptance/01_vars/02_functions/421.cf b/tests/acceptance/01_vars/02_functions/421.cf
index 9c5fb087d24..d571a65a372 100644
--- a/tests/acceptance/01_vars/02_functions/421.cf
+++ b/tests/acceptance/01_vars/02_functions/421.cf
@@ -42,7 +42,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "teststr" string => readfile("$(G.testfile)", 1000),
+    "teststr"
+      string => readfile("$(G.testfile)", 1000),
       if => fileexists("$(G.testfile)");
 
     "cnt"
diff --git a/tests/acceptance/01_vars/02_functions/447.cf b/tests/acceptance/01_vars/02_functions/447.cf
index 0632d00fc67..43379594bbf 100644
--- a/tests/acceptance/01_vars/02_functions/447.cf
+++ b/tests/acceptance/01_vars/02_functions/447.cf
@@ -48,8 +48,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "cnt" int => readstringarrayidx("ary", "$(G.testfile)", "", ":", 10, 1000),
+    "cnt"
+      int => readstringarrayidx("ary", "$(G.testfile)", "", ":", 10, 1000),
       if => fileexists("$(G.testfile)");
+
     "num" int => "9";
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/520.cf b/tests/acceptance/01_vars/02_functions/520.cf
index d1ab666bce3..b592f86c158 100644
--- a/tests/acceptance/01_vars/02_functions/520.cf
+++ b/tests/acceptance/01_vars/02_functions/520.cf
@@ -41,8 +41,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "teststr" string => readfile("$(G.testfile)", 1000),
+    "teststr"
+      string => readfile("$(G.testfile)", 1000),
       if => fileexists("$(G.testfile)");
+
     "cnt" int => parseintarray("ary", "$(teststr)", "NoComment", ":", 10, 1000);
     "num" int => "3";
 }
diff --git a/tests/acceptance/01_vars/02_functions/521.cf b/tests/acceptance/01_vars/02_functions/521.cf
index 84233e9db8b..79bc5877efe 100644
--- a/tests/acceptance/01_vars/02_functions/521.cf
+++ b/tests/acceptance/01_vars/02_functions/521.cf
@@ -41,8 +41,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "teststr" string => readfile("$(G.testfile)", 1000),
+    "teststr"
+      string => readfile("$(G.testfile)", 1000),
       if => fileexists("$(G.testfile)");
+
     "cnt" int => parseintarray("ary", "$(teststr)", "NoComment", ":", 10, 1000);
     "num" int => "3";
 }
diff --git a/tests/acceptance/01_vars/02_functions/620.cf b/tests/acceptance/01_vars/02_functions/620.cf
index 50f06d423e9..cdcb767c6ea 100644
--- a/tests/acceptance/01_vars/02_functions/620.cf
+++ b/tests/acceptance/01_vars/02_functions/620.cf
@@ -41,7 +41,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "teststr" string => readfile("$(G.testfile)", 1000),
+    "teststr"
+      string => readfile("$(G.testfile)", 1000),
       if => fileexists("$(G.testfile)");
 
     "cnt"
diff --git a/tests/acceptance/01_vars/02_functions/621.cf b/tests/acceptance/01_vars/02_functions/621.cf
index dc908d968cd..db38a789d46 100644
--- a/tests/acceptance/01_vars/02_functions/621.cf
+++ b/tests/acceptance/01_vars/02_functions/621.cf
@@ -41,7 +41,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "teststr" string => readfile("$(G.testfile)", 1000),
+    "teststr"
+      string => readfile("$(G.testfile)", 1000),
       if => fileexists("$(G.testfile)");
 
     "cnt"
diff --git a/tests/acceptance/01_vars/02_functions/CFE-2704-0.error.pass.cf b/tests/acceptance/01_vars/02_functions/CFE-2704-0.error.pass.cf
index 06279efded8..8ea6f4a21ca 100644
--- a/tests/acceptance/01_vars/02_functions/CFE-2704-0.error.pass.cf
+++ b/tests/acceptance/01_vars/02_functions/CFE-2704-0.error.pass.cf
@@ -1,7 +1,6 @@
 # This is an .error.pass.cf test, because mergedata() is given data
 # which is not a container on purpose and logs an error, the test checks
 # that the agent does not crash.
-
 body common control
 {
   inputs => { "../../default.sub.cf" };
diff --git a/tests/acceptance/01_vars/02_functions/CFE-2704-1.error.pass.cf b/tests/acceptance/01_vars/02_functions/CFE-2704-1.error.pass.cf
index 10acfccee9a..7538a59b762 100644
--- a/tests/acceptance/01_vars/02_functions/CFE-2704-1.error.pass.cf
+++ b/tests/acceptance/01_vars/02_functions/CFE-2704-1.error.pass.cf
@@ -1,7 +1,6 @@
 # This is an .error.pass.cf test, because mergedata() is given data
 # which is not a container on purpose and logs an error, the test checks
 # that the agent does not crash.
-
 body common control
 {
   inputs => { "../../default.sub.cf" };
diff --git a/tests/acceptance/01_vars/02_functions/findfiles_up.cf b/tests/acceptance/01_vars/02_functions/findfiles_up.cf
index faf55b5abb3..3cfd153bb36 100755
--- a/tests/acceptance/01_vars/02_functions/findfiles_up.cf
+++ b/tests/acceptance/01_vars/02_functions/findfiles_up.cf
@@ -53,7 +53,8 @@ bundle agent test
       data => findfiles_up("$(G.testdir)/core/libntech/libutils/", "string.?"),
       if => isdir("$(G.testdir)/core/libntech/libutils/");
 
-    "t3" data => findfiles_up("$(G.testdir)/core/libntech/libutils/", ".git/"),
+    "t3"
+      data => findfiles_up("$(G.testdir)/core/libntech/libutils/", ".git/"),
       if => isdir("$(G.testdir)/core/libntech/libutils/");
 
     "t4"
diff --git a/tests/acceptance/01_vars/02_functions/getfields.cf b/tests/acceptance/01_vars/02_functions/getfields.cf
index b1f1adc32f8..037a0e86e59 100644
--- a/tests/acceptance/01_vars/02_functions/getfields.cf
+++ b/tests/acceptance/01_vars/02_functions/getfields.cf
@@ -41,7 +41,8 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "num_matching" int => getfields("t.*", "$(G.testfile)", ":", "fields"),
+    "num_matching"
+      int => getfields("t.*", "$(G.testfile)", ":", "fields"),
       if => fileexists("$(G.testfile)");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/long_string_from_text_file.cf b/tests/acceptance/01_vars/02_functions/long_string_from_text_file.cf
index 25a0bbce723..9c0ff0128b3 100644
--- a/tests/acceptance/01_vars/02_functions/long_string_from_text_file.cf
+++ b/tests/acceptance/01_vars/02_functions/long_string_from_text_file.cf
@@ -26,7 +26,9 @@ bundle agent test
 {
   vars:
     "keyfile" string => "$(G.testfile).data";
-    "keys" slist => readstringlist("$(keyfile)", "#[^\n]*", "\n", 10, 3072),
+
+    "keys"
+      slist => readstringlist("$(keyfile)", "#[^\n]*", "\n", 10, 3072),
       if => fileexists("$(keyfile)");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/parsestringarray_weird_indices_real_comments_noemptyfields2.cf b/tests/acceptance/01_vars/02_functions/parsestringarray_weird_indices_real_comments_noemptyfields2.cf
index 79539da135d..6443272ee0f 100644
--- a/tests/acceptance/01_vars/02_functions/parsestringarray_weird_indices_real_comments_noemptyfields2.cf
+++ b/tests/acceptance/01_vars/02_functions/parsestringarray_weird_indices_real_comments_noemptyfields2.cf
@@ -48,8 +48,10 @@ body delete init_delete
 bundle agent test
 {
   vars:
-    "teststr" string => readfile("$(G.testfile)", 1000),
+    "teststr"
+      string => readfile("$(G.testfile)", 1000),
       if => fileexists("$(G.testfile)");
+
     "cnt" int => parsestringarray("ary", "$(teststr)", "^#.*", ":+", 10, 14);
     "num" int => "3";
 }
diff --git a/tests/acceptance/01_vars/02_functions/read_empty_file.cf b/tests/acceptance/01_vars/02_functions/read_empty_file.cf
index d1f37354b8a..ca4281153a6 100644
--- a/tests/acceptance/01_vars/02_functions/read_empty_file.cf
+++ b/tests/acceptance/01_vars/02_functions/read_empty_file.cf
@@ -15,9 +15,12 @@ bundle agent init
 bundle agent test
 {
   vars:
-    "value1" string => readfile("$(G.testfile)", 10000),
+    "value1"
+      string => readfile("$(G.testfile)", 10000),
       if => fileexists("$(G.testfile)");
-    "value2" string => readfile("$(G.testfile)", 0),
+
+    "value2"
+      string => readfile("$(G.testfile)", 0),
       if => fileexists("$(G.testfile)");
 }
 
diff --git a/tests/acceptance/01_vars/02_functions/regextract.cf b/tests/acceptance/01_vars/02_functions/regextract.cf
index e356e5f0879..ff7c86c7c9f 100644
--- a/tests/acceptance/01_vars/02_functions/regextract.cf
+++ b/tests/acceptance/01_vars/02_functions/regextract.cf
@@ -32,7 +32,9 @@ bundle agent test
     "lefts" string => "$(init.pair[1])";
     "lefti" int => "$(init.pair[1])";
     "rights" string => "$(init.pair[2])";
-    "rightr" real => "$(init.pair[2])",
+
+    "rightr"
+      real => "$(init.pair[2])",
       if => isvariable("init.pair[2]");
 }
 
diff --git a/tests/acceptance/01_vars/04_containers/readjson.cf b/tests/acceptance/01_vars/04_containers/readjson.cf
index 3317af28d2f..4774201ddf4 100644
--- a/tests/acceptance/01_vars/04_containers/readjson.cf
+++ b/tests/acceptance/01_vars/04_containers/readjson.cf
@@ -40,7 +40,8 @@ bundle edit_line init_insert_lines
 bundle agent test
 {
   vars:
-    "load" data => readjson("$(G.testfile).json", 1024),
+    "load"
+      data => readjson("$(G.testfile).json", 1024),
       if => fileexists("$(G.testfile).json");
 
   files:
diff --git a/tests/acceptance/01_vars/04_containers/readjson_arrays.cf b/tests/acceptance/01_vars/04_containers/readjson_arrays.cf
index bc120e55e8a..6e96734d8ca 100644
--- a/tests/acceptance/01_vars/04_containers/readjson_arrays.cf
+++ b/tests/acceptance/01_vars/04_containers/readjson_arrays.cf
@@ -43,7 +43,8 @@ bundle edit_line init_insert_lines
 bundle agent test
 {
   vars:
-    "load" data => readjson("$(G.testfile).json", 1024),
+    "load"
+      data => readjson("$(G.testfile).json", 1024),
       if => fileexists("$(G.testfile).json");
 
   files:
diff --git a/tests/acceptance/01_vars/04_containers/readjson_new.cf b/tests/acceptance/01_vars/04_containers/readjson_new.cf
index a411f6614b9..ebc1f19ff6b 100644
--- a/tests/acceptance/01_vars/04_containers/readjson_new.cf
+++ b/tests/acceptance/01_vars/04_containers/readjson_new.cf
@@ -40,7 +40,8 @@ bundle edit_line init_insert_lines
 bundle agent test
 {
   vars:
-    "load" data => readjson("$(G.testfile).json"),
+    "load"
+      data => readjson("$(G.testfile).json"),
       if => fileexists("$(G.testfile).json");
 
   files:
diff --git a/tests/acceptance/01_vars/04_containers/readjson_null.cf b/tests/acceptance/01_vars/04_containers/readjson_null.cf
index 92309aa6386..e9115b410cc 100644
--- a/tests/acceptance/01_vars/04_containers/readjson_null.cf
+++ b/tests/acceptance/01_vars/04_containers/readjson_null.cf
@@ -39,7 +39,8 @@ bundle edit_line init_insert_lines
 bundle agent test
 {
   vars:
-    "load" data => readjson("$(G.testfile).json", 1024),
+    "load"
+      data => readjson("$(G.testfile).json", 1024),
       if => fileexists("$(G.testfile).json");
 
   files:
diff --git a/tests/acceptance/01_vars/04_containers/readjson_objects.cf b/tests/acceptance/01_vars/04_containers/readjson_objects.cf
index 54422b46662..8ba8cf47110 100644
--- a/tests/acceptance/01_vars/04_containers/readjson_objects.cf
+++ b/tests/acceptance/01_vars/04_containers/readjson_objects.cf
@@ -40,7 +40,8 @@ bundle edit_line init_insert_lines
 bundle agent test
 {
   vars:
-    "load" data => readjson("$(G.testfile).json", 1024),
+    "load"
+      data => readjson("$(G.testfile).json", 1024),
       if => fileexists("$(G.testfile).json");
 
   files:
diff --git a/tests/acceptance/01_vars/04_containers/readjson_scalar.cf b/tests/acceptance/01_vars/04_containers/readjson_scalar.cf
index ba32e03860b..859aee42cc2 100644
--- a/tests/acceptance/01_vars/04_containers/readjson_scalar.cf
+++ b/tests/acceptance/01_vars/04_containers/readjson_scalar.cf
@@ -39,7 +39,8 @@ bundle edit_line init_insert_lines
 bundle agent test
 {
   vars:
-    "load" data => readjson("$(G.testfile).json", 1024),
+    "load"
+      data => readjson("$(G.testfile).json", 1024),
       if => fileexists("$(G.testfile).json");
 
   files:
diff --git a/tests/acceptance/01_vars/04_containers/readjson_subindex.cf b/tests/acceptance/01_vars/04_containers/readjson_subindex.cf
index bd669b3ddae..51f0ae06df6 100644
--- a/tests/acceptance/01_vars/04_containers/readjson_subindex.cf
+++ b/tests/acceptance/01_vars/04_containers/readjson_subindex.cf
@@ -41,7 +41,8 @@ bundle edit_line init_insert_lines
 bundle agent test
 {
   vars:
-    "load" data => readjson("$(G.testfile).json", 1024),
+    "load"
+      data => readjson("$(G.testfile).json", 1024),
       if => fileexists("$(G.testfile).json");
 
   files:
diff --git a/tests/acceptance/01_vars/04_containers/readjson_subindex_quoted.cf b/tests/acceptance/01_vars/04_containers/readjson_subindex_quoted.cf
index 17d8c7fadf2..dce9a2b4bf7 100644
--- a/tests/acceptance/01_vars/04_containers/readjson_subindex_quoted.cf
+++ b/tests/acceptance/01_vars/04_containers/readjson_subindex_quoted.cf
@@ -41,7 +41,8 @@ bundle edit_line init_insert_lines
 bundle agent test
 {
   vars:
-    "load" data => readjson("$(G.testfile).json", 1024),
+    "load"
+      data => readjson("$(G.testfile).json", 1024),
       if => fileexists("$(G.testfile).json");
 
   files:
diff --git a/tests/acceptance/02_classes/01_basic/cancel_attribute_persistent_lmdb.cf b/tests/acceptance/02_classes/01_basic/cancel_attribute_persistent_lmdb.cf
index d520a35347d..e1f4ea95d87 100644
--- a/tests/acceptance/02_classes/01_basic/cancel_attribute_persistent_lmdb.cf
+++ b/tests/acceptance/02_classes/01_basic/cancel_attribute_persistent_lmdb.cf
@@ -58,9 +58,12 @@ bundle agent test
 bundle agent check
 {
   vars:
-    "before" string => readfile("$(G.testdir)/cancel_lmdb_before", 4096),
+    "before"
+      string => readfile("$(G.testdir)/cancel_lmdb_before", 4096),
       if => fileexists("$(G.testdir)/cancel_lmdb_before");
-    "after" string => readfile("$(G.testdir)/cancel_lmdb_after", 4096),
+
+    "after"
+      string => readfile("$(G.testdir)/cancel_lmdb_after", 4096),
       if => fileexists("$(G.testdir)/cancel_lmdb_after");
 
   classes:
diff --git a/tests/acceptance/02_classes/01_basic/persistent_timer_policy_default_lmdb.cf b/tests/acceptance/02_classes/01_basic/persistent_timer_policy_default_lmdb.cf
index 080fc04affa..d4e4841e2a5 100644
--- a/tests/acceptance/02_classes/01_basic/persistent_timer_policy_default_lmdb.cf
+++ b/tests/acceptance/02_classes/01_basic/persistent_timer_policy_default_lmdb.cf
@@ -78,11 +78,16 @@ bundle agent test
 bundle agent check
 {
   vars:
-    "policy" string => readfile("$(G.testdir)/lmdb_policy", 4096),
+    "policy"
+      string => readfile("$(G.testdir)/lmdb_policy", 4096),
       if => fileexists("$(G.testdir)/lmdb_policy");
-    "e1" string => readfile("$(G.testdir)/lmdb_expires1", 4096),
+
+    "e1"
+      string => readfile("$(G.testdir)/lmdb_expires1", 4096),
       if => fileexists("$(G.testdir)/lmdb_expires1");
-    "e2" string => readfile("$(G.testdir)/lmdb_expires2", 4096),
+
+    "e2"
+      string => readfile("$(G.testdir)/lmdb_expires2", 4096),
       if => fileexists("$(G.testdir)/lmdb_expires2");
 
   classes:
diff --git a/tests/acceptance/02_classes/02_functions/classesmatching_inherit_2.cf b/tests/acceptance/02_classes/02_functions/classesmatching_inherit_2.cf
index ad2062ed2d1..8f661fa559d 100644
--- a/tests/acceptance/02_classes/02_functions/classesmatching_inherit_2.cf
+++ b/tests/acceptance/02_classes/02_functions/classesmatching_inherit_2.cf
@@ -59,7 +59,8 @@ bundle agent check
         "defined_classes: defined_in_second$(const.n)"
       );
 
-    "actual" string => readfile("$(common.logfile)", inf),
+    "actual"
+      string => readfile("$(common.logfile)", inf),
       if => fileexists("$(common.logfile)");
 
   reports:
diff --git a/tests/acceptance/05_processes/01_matching/process_select_fncalls.error.pass.cf b/tests/acceptance/05_processes/01_matching/process_select_fncalls.error.pass.cf
index bba2f72dacd..cccdc262618 100644
--- a/tests/acceptance/05_processes/01_matching/process_select_fncalls.error.pass.cf
+++ b/tests/acceptance/05_processes/01_matching/process_select_fncalls.error.pass.cf
@@ -1,6 +1,5 @@
 # This is an .error.pass.cf test, because getuid() is called for the
 # non-existent user 'nosuchuser' on purpose and logs errors (CFE-1968).
-
 body common control
 {
   inputs => { "../../default.sub.cf" };
diff --git a/tests/acceptance/08_commands/arglist.cf b/tests/acceptance/08_commands/arglist.cf
index 1948f33e815..bbf52686c0d 100644
--- a/tests/acceptance/08_commands/arglist.cf
+++ b/tests/acceptance/08_commands/arglist.cf
@@ -46,8 +46,10 @@ bundle agent test
 bundle agent check
 {
   vars:
-    "actual" string => readfile("$(G.testfile).actual"),
+    "actual"
+      string => readfile("$(G.testfile).actual"),
       if => fileexists("$(G.testfile).actual");
+
     "expected" string => "one
 two
 three
diff --git a/tests/acceptance/10_files/09_insert_lines/multi-files-dirs.cf b/tests/acceptance/10_files/09_insert_lines/multi-files-dirs.cf
index 43b9fac0d5d..9f0836b75d8 100644
--- a/tests/acceptance/10_files/09_insert_lines/multi-files-dirs.cf
+++ b/tests/acceptance/10_files/09_insert_lines/multi-files-dirs.cf
@@ -54,11 +54,17 @@ bundle agent check
   vars:
     "expect" string => "one two three test";
     "results" slist => { "resultA", "resultB", "resultC" };
-    "resultA" string => readfile("$(G.testdir)/dirA/testfa", "33"),
+
+    "resultA"
+      string => readfile("$(G.testdir)/dirA/testfa", "33"),
       if => fileexists("$(G.testdir)/dirA/testfa");
-    "resultB" string => readfile("$(G.testdir)/dirB/testfb", "33"),
+
+    "resultB"
+      string => readfile("$(G.testdir)/dirB/testfb", "33"),
       if => fileexists("$(G.testdir)/dirB/testfb");
-    "resultC" string => readfile("$(G.testdir)/dirC/testfc", "33"),
+
+    "resultC"
+      string => readfile("$(G.testdir)/dirC/testfc", "33"),
       if => fileexists("$(G.testdir)/dirC/testfc");
 
   classes:
diff --git a/tests/acceptance/10_files/09_insert_lines/preserve_block_blank_lines.cf b/tests/acceptance/10_files/09_insert_lines/preserve_block_blank_lines.cf
index d39a6f50b73..c2c4e60f067 100644
--- a/tests/acceptance/10_files/09_insert_lines/preserve_block_blank_lines.cf
+++ b/tests/acceptance/10_files/09_insert_lines/preserve_block_blank_lines.cf
@@ -38,7 +38,9 @@ bundle agent check
 
     Bad 3
 ";
-    "actual" string => readfile("$(init.test_file)", "inf"),
+
+    "actual"
+      string => readfile("$(init.test_file)", "inf"),
       if => fileexists("$(init.test_file)");
 
   classes:
diff --git a/tests/acceptance/10_files/templating/empty_template_empty_file.cf b/tests/acceptance/10_files/templating/empty_template_empty_file.cf
index 38cc6730655..f41409d8de4 100644
--- a/tests/acceptance/10_files/templating/empty_template_empty_file.cf
+++ b/tests/acceptance/10_files/templating/empty_template_empty_file.cf
@@ -53,7 +53,9 @@ bundle agent check
 {
   vars:
     "expect" string => "";
-    "actual" string => readfile("$(G.testfile)", 1000),
+
+    "actual"
+      string => readfile("$(G.testfile)", 1000),
       if => fileexists("$(G.testfile)");
 
   classes:
diff --git a/tests/acceptance/10_files/templating/large_template_blocks.cf b/tests/acceptance/10_files/templating/large_template_blocks.cf
index 2f3fedeba3a..c6c77f527aa 100644
--- a/tests/acceptance/10_files/templating/large_template_blocks.cf
+++ b/tests/acceptance/10_files/templating/large_template_blocks.cf
@@ -50,7 +50,9 @@ bundle agent check
 {
   vars:
     "expected" int => "110";
-    "actual" int => countlinesmatching(".*0123456789.*", "$(G.testfile)"),
+
+    "actual"
+      int => countlinesmatching(".*0123456789.*", "$(G.testfile)"),
       if => fileexists("$(G.testfile)");
 
   classes:
diff --git a/tests/acceptance/10_files/templating/mustache_container_serialization.cf b/tests/acceptance/10_files/templating/mustache_container_serialization.cf
index d41dcf9e398..b626ce3cea3 100644
--- a/tests/acceptance/10_files/templating/mustache_container_serialization.cf
+++ b/tests/acceptance/10_files/templating/mustache_container_serialization.cf
@@ -64,7 +64,9 @@ bundle edit_line readthem
 {
   vars:
     "test" slist => { @(test.test) };
-    "read_$(test)" string => readfile("$(G.testdir)/$(test)", 1k),
+
+    "read_$(test)"
+      string => readfile("$(G.testdir)/$(test)", 1k),
       if => fileexists("$(G.testdir)/$(test)");
 
   insert_lines:
diff --git a/tests/acceptance/10_files/templating/mustache_datastate_demo.cf b/tests/acceptance/10_files/templating/mustache_datastate_demo.cf
index 43f2cc0a920..ee5724997ab 100644
--- a/tests/acceptance/10_files/templating/mustache_datastate_demo.cf
+++ b/tests/acceptance/10_files/templating/mustache_datastate_demo.cf
@@ -101,7 +101,8 @@ bundle agent check
 }"
 ';
 
-    "actual" string => readfile("$(G.testfile)", inf),
+    "actual"
+      string => readfile("$(G.testfile)", inf),
       if => fileexists("$(G.testfile)");
 
   classes:
diff --git a/tests/acceptance/10_files/templating/mustache_demo.cf b/tests/acceptance/10_files/templating/mustache_demo.cf
index 3b016edaedb..1e321f5bbb5 100644
--- a/tests/acceptance/10_files/templating/mustache_demo.cf
+++ b/tests/acceptance/10_files/templating/mustache_demo.cf
@@ -49,7 +49,9 @@ bundle agent check
 {
   vars:
     "expect" string => readfile("$(init.origtestdir)/demo.expected", 10000);
-    "actual" string => readfile("$(G.testfile)", 10000),
+
+    "actual"
+      string => readfile("$(G.testfile)", 10000),
       if => fileexists("$(G.testfile)");
 
   classes:
diff --git a/tests/acceptance/10_files/templating/mustache_expect_list_find_string.cf b/tests/acceptance/10_files/templating/mustache_expect_list_find_string.cf
index 52b0077414c..3092114d1d9 100644
--- a/tests/acceptance/10_files/templating/mustache_expect_list_find_string.cf
+++ b/tests/acceptance/10_files/templating/mustache_expect_list_find_string.cf
@@ -85,9 +85,13 @@ bundle agent test
 
   vars:
     "template" string => "$(this.promise_filename).mustache";
-    "actual_good" string => readfile("$(G.testfile).good", 4096),
+
+    "actual_good"
+      string => readfile("$(G.testfile).good", 4096),
       if => fileexists("$(G.testfile).good");
-    "actual_bad" string => readfile("$(G.testfile).bad", 4096),
+
+    "actual_bad"
+      string => readfile("$(G.testfile).bad", 4096),
       if => fileexists("$(G.testfile).bad");
 }
 
diff --git a/tests/acceptance/10_files/templating/mustache_html_escape.cf b/tests/acceptance/10_files/templating/mustache_html_escape.cf
index 2f4a3b958eb..e3d85d91240 100644
--- a/tests/acceptance/10_files/templating/mustache_html_escape.cf
+++ b/tests/acceptance/10_files/templating/mustache_html_escape.cf
@@ -54,7 +54,9 @@ bundle agent check
 {
   vars:
     "expect" string => readfile("$(this.promise_filename).expected", 10000);
-    "actual" string => readfile("$(G.testfile)", 10000),
+
+    "actual"
+      string => readfile("$(G.testfile)", 10000),
       if => fileexists("$(G.testfile)");
 
   classes:
diff --git a/tests/acceptance/10_files/templating/mustache_inline_demo.cf b/tests/acceptance/10_files/templating/mustache_inline_demo.cf
index 6ae16b65a4d..97c841e004a 100644
--- a/tests/acceptance/10_files/templating/mustache_inline_demo.cf
+++ b/tests/acceptance/10_files/templating/mustache_inline_demo.cf
@@ -52,7 +52,8 @@ bundle agent check
     "expect"
       string => readfile("$(init.origtestdir)/inline_demo.expected", 10000);
 
-    "actual" string => readfile("$(G.testfile)", 10000),
+    "actual"
+      string => readfile("$(G.testfile)", 10000),
       if => fileexists("$(G.testfile)");
 
   classes:
diff --git a/tests/acceptance/10_files/templating/mustache_render_quote.cf b/tests/acceptance/10_files/templating/mustache_render_quote.cf
index 4def7b9364b..1d70e421b53 100644
--- a/tests/acceptance/10_files/templating/mustache_render_quote.cf
+++ b/tests/acceptance/10_files/templating/mustache_render_quote.cf
@@ -54,7 +54,9 @@ bundle agent check
 {
   vars:
     "expect" string => readfile("$(this.promise_filename).expected", 4000);
-    "actual" string => readfile("$(G.testfile)", 4000),
+
+    "actual"
+      string => readfile("$(G.testfile)", 4000),
       if => fileexists("$(G.testfile)");
 
   classes:
diff --git a/tests/acceptance/10_files/templating/mustache_repair_existing.cf b/tests/acceptance/10_files/templating/mustache_repair_existing.cf
index 2429e350ed6..c7c78943fed 100644
--- a/tests/acceptance/10_files/templating/mustache_repair_existing.cf
+++ b/tests/acceptance/10_files/templating/mustache_repair_existing.cf
@@ -50,7 +50,9 @@ bundle agent check
 {
   vars:
     "expect" string => readfile("$(init.origtestdir)/demo.expected", 4096);
-    "actual" string => readfile("$(G.testfile)", 4096),
+
+    "actual"
+      string => readfile("$(G.testfile)", 4096),
       if => fileexists("$(G.testfile)");
 
   classes:
diff --git a/tests/acceptance/15_control/01_common/classic_evaluation_custom_promise_types.cf b/tests/acceptance/15_control/01_common/classic_evaluation_custom_promise_types.cf
index 4976b216f4c..d5ea9e47962 100644
--- a/tests/acceptance/15_control/01_common/classic_evaluation_custom_promise_types.cf
+++ b/tests/acceptance/15_control/01_common/classic_evaluation_custom_promise_types.cf
@@ -23,14 +23,16 @@ bundle agent test
     "/tmp/dummyfile" smth => "hello";
 
   vars:
-    "content" string => readfile("/tmp/dummyfile"),
+    "content"
+      string => readfile("/tmp/dummyfile"),
       if => fileexists("/tmp/dummyfile");
 
   files:
     "/tmp/dummyfile" content => "ok";
 
   vars:
-    "content" string => readfile("/tmp/dummyfile"),
+    "content"
+      string => readfile("/tmp/dummyfile"),
       if => fileexists("/tmp/dummyfile");
 
   classes:
diff --git a/tests/acceptance/15_control/01_common/classic_evaluation_long_policy.cf b/tests/acceptance/15_control/01_common/classic_evaluation_long_policy.cf
index 3fedb3a4bcd..1a06957f2e9 100644
--- a/tests/acceptance/15_control/01_common/classic_evaluation_long_policy.cf
+++ b/tests/acceptance/15_control/01_common/classic_evaluation_long_policy.cf
@@ -34,8 +34,10 @@ bundle agent test
     "/tmp/example" content => "fourth";
 
   vars:
-    "content" string => readfile("/tmp/example"),
+    "content"
+      string => readfile("/tmp/example"),
       if => fileexists("/tmp/example");
+
     "result" string => concat("$(result)", ", $(content)");
 
   classes:
@@ -49,7 +51,8 @@ bundle agent test
     "/tmp/otherfile" content => "something";
 
   vars:
-    "othercontent" string => readfile("/tmp/otherfile"),
+    "othercontent"
+      string => readfile("/tmp/otherfile"),
       if => fileexists("/tmp/otherfile");
 
   files:
diff --git a/tests/acceptance/15_control/01_common/top_down_evaluation_long_policy.cf b/tests/acceptance/15_control/01_common/top_down_evaluation_long_policy.cf
index a60342fd22b..01151c1248f 100644
--- a/tests/acceptance/15_control/01_common/top_down_evaluation_long_policy.cf
+++ b/tests/acceptance/15_control/01_common/top_down_evaluation_long_policy.cf
@@ -34,8 +34,10 @@ bundle agent test
     "/tmp/example" content => "fourth";
 
   vars:
-    "content" string => readfile("/tmp/example"),
+    "content"
+      string => readfile("/tmp/example"),
       if => fileexists("/tmp/example");
+
     "result" string => concat("$(result)", ", $(content)");
 
   classes:
@@ -49,7 +51,8 @@ bundle agent test
     "/tmp/otherfile" content => "something";
 
   vars:
-    "othercontent" string => readfile("/tmp/otherfile"),
+    "othercontent"
+      string => readfile("/tmp/otherfile"),
       if => fileexists("/tmp/otherfile");
 
   files:
diff --git a/tests/acceptance/31_tickets/CFE-3866/test.cf b/tests/acceptance/31_tickets/CFE-3866/test.cf
index c90c082ed48..dd8c0a1d98d 100644
--- a/tests/acceptance/31_tickets/CFE-3866/test.cf
+++ b/tests/acceptance/31_tickets/CFE-3866/test.cf
@@ -68,7 +68,9 @@ bundle agent check
     "expected" string => "[section]
 key=value
 ";
-    "actual" string => readfile("$(G.testfile)", "1000"),
+
+    "actual"
+      string => readfile("$(G.testfile)", "1000"),
       if => fileexists("$(G.testfile)");
 
   classes: