Fixes #15192: Modify ncf tests bundles to better handle the dry run s…

…tack
Normation · Jul 10, 2019 · 296778e · 296778e
1 parent 202b6f8
commit 296778e
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/tests/acceptance/default_ncf.cf.sub b/tests/acceptance/default_ncf.cf.sub
@@ -125,8 +125,10 @@ bundle agent apply_gm(name, args, status, result_class, mode)
       "expected_classes" usebundle => define_expected_classes("${class_prefix}", "${status}", "class_prefix_${result_class}");
       "expected_classes" usebundle => define_expected_classes("${old_class_prefix}", "${status}", "old_class_prefix_${result_class}");
 
-    audit::
-      "enable_${class_prefix}" usebundle => set_dry_run_mode("true");
+    audit.pass1.!pass2::
+      "enable_${result_class}" usebundle => push_dry_run_mode("true");
+    !audit.pass1.!pass2::
+      "enable_${result_class}" usebundle => push_dry_run_mode("false");
 
     1_arg::
       "execute_gm" usebundle => ${name}("${arg0}");
@@ -145,8 +147,8 @@ bundle agent apply_gm(name, args, status, result_class, mode)
     8_arg::
       "execute_gm" usebundle => ${name}("${arg0}", "${arg1}", "${arg2}", "${arg3}", "${arg4}", "${arg5}", "${arg6}", "${arg7}");
 
-    pass3.audit::
-      "disable_${class_prefix}" usebundle => set_dry_run_mode("false");
+    pass3::
+      "disable_${result_class}" usebundle => pop_dry_run_mode();
 
     pass3::
       "cancel_classes" usebundle => _classes_cancel("${class_prefix}");