Merge branch 'branches/rudder/8.0'

Normation · Oct 11, 2023 · dffc142 · dffc142
2 parents f426541 + 5ee0a27
commit dffc142
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 2 deletions.
diff --git a/policies/rudderc/src/backends/unix/prelude.cf b/policies/rudderc/src/backends/unix/prelude.cf
@@ -72,6 +72,12 @@ bundle agent rudder_test_init {
       "tmp" string => getenv("TMP_DIR","2048");
       # Read params for current test case
       "test_case" data => readyaml("${cwd}/${params}", 100k);
+      # Define conditions
+      "conditions" slist => getvalues("test_case[conditions]");
+
+  classes:
+      "${conditions}" expression => "any",
+                           scope => "namespace";
 
   methods:
     # lib ("ncf") init, including modules update

diff --git a/policies/rudderc/src/test.rs b/policies/rudderc/src/test.rs
@@ -12,7 +12,11 @@
 
 // Test file specifications. Do we want several test cases in one file?
 
-use std::{collections::HashMap, path::Path, process::Command};
+use std::{
+    collections::{HashMap, HashSet},
+    path::Path,
+    process::Command,
+};
 
 use anyhow::{bail, Result};
 use rudder_commons::logs::ok_output;
@@ -30,6 +34,9 @@ pub struct TestCase {
     #[serde(rename = "params")]
     #[serde(default)]
     parameters: HashMap<String, String>,
+    /// Conditions to define before running the test
+    #[serde(default)]
+    conditions: HashSet<String>,
     /// Test setup steps
     #[serde(default)]
     setup: Vec<Step>,

diff --git a/policies/rudderc/tests/cases/test/one_param/technique.yml b/policies/rudderc/tests/cases/test/one_param/technique.yml
@@ -13,6 +13,7 @@ items:
   - name: "Ensure correct ntp configuration"
     id: d86ce2e5-d5b6-45cc-87e8-c11cca71d907
     method: file_content
+    condition: my_cond
     params:
       path: "/tmp/rudderc_test_one"
       lines: "${server}"

diff --git a/policies/rudderc/tests/cases/test/one_param/tests/case1.yml b/policies/rudderc/tests/cases/test/one_param/tests/case1.yml
@@ -1,6 +1,9 @@
 # Parameters for the technique
 params:
   server: "rudder.io"
+# Conditions to define before running the test
+conditions:
+  - my_cond
 # Prepare env
 setup:
   - sh: "rm -f /tmp/rudderc_test_one"

diff --git a/policies/rudderc/tests/lib/common/10_ncf_internals/initialization.cf b/policies/rudderc/tests/lib/common/10_ncf_internals/initialization.cf
@@ -1,3 +1,5 @@
 bundle agent initialization {}
 bundle agent rudder_reporting_context_v4(a, b, c, d, e, f) {}
-bundle agent _method_reporting_context_v4(d, e, f) {}
+bundle agent _method_reporting_context_v4(d, e, f) {}
+bundle agent _classes_noop(a) {}
+bundle agent log_rudder(message, class_parameter, old_class_prefix, class_prefix, args) {}