Merge pull request #5325 from Lex-2008/win-acceptance-3.21.x

Fix win acceptance tests - 3.21.x

tests/acceptance/00_basics/02_switches/dry_run_perms_doesnt_lie.cf

@@ -19,6 +19,13 @@ bundle agent init
                   running with dry-run.";
 }
 
+bundle agent test
+{
+  meta:
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10217" };
+}
+
 bundle agent check
 {
   vars:

tests/acceptance/00_basics/03_bodies/dynamic_inputs_findfiles.cf

@@ -36,9 +36,6 @@ bundle agent init
 
 bundle agent test
 {
-  meta:
-    "test_suppress_fail" string => "windows",
-      meta => { "redmine4730" };
 }
 
 bundle agent check

tests/acceptance/00_basics/03_bodies/dynamic_inputs_maplist.cf

@@ -37,9 +37,6 @@ bundle agent init
 
 bundle agent test
 {
-  meta:
-    "test_suppress_fail" string => "windows",
-      meta => { "redmine4730" };
 }
 
 bundle agent check

tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/dynamic_inputs_based_on_list_variable_dependent_on_class.cf

@@ -13,13 +13,21 @@ bundle common inventory
       !this_is_true::
         "inputs"  slist => { };
         "bundles" slist => { "bad" };
-      this_is_true::
+      this_is_true.!windows::
         "inputs"  slist => { "$(this.promise_filename).sub" };
         "bundles" slist => { "good" };
+      windows::
+        "bundles" slist => { "skip" };
 }
 
 bundle agent bad
 {
     reports:
         "$(this.promise_filename) FAIL";
 }
+
+bundle agent skip
+{
+    reports:
+        "$(this.promise_filename) Skip/unsupported";
+}

tests/acceptance/00_basics/04_bundles/namespaced.cf

@@ -16,6 +16,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
 }
 
 bundle agent check

tests/acceptance/00_basics/def.json/bad-json.cf

@@ -10,8 +10,12 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
+
   methods:
-      "" usebundle => file_copy("$(this.promise_filename).json", "$(sys.inputdir)/def.json");
+      "" usebundle => file_copy("$(this.promise_filename).json", "$(sys.inputdir)$(const.dirsep)def.json");
 }
 
 #######################################################
@@ -22,5 +26,5 @@ bundle agent check
     "command" string => "$(sys.cf_promises) -v|$(G.grep) JSON";
 
   methods:
-      "" usebundle => dcs_passif_output(".*Could not parse JSON file $(sys.inputdir)/def.json.*", "", $(command), $(this.promise_filename));
+      "" usebundle => dcs_passif_output(".*Could not parse JSON file $(sys.inputdir)$(const.dirsep)def.json.*", "", $(command), $(this.promise_filename));
 }

tests/acceptance/00_basics/def.json/state.cf

@@ -8,6 +8,12 @@ body common control
 
 #######################################################
 
+bundle agent test
+{
+}
+
+#######################################################
+
 bundle agent check
 {
   methods:

tests/acceptance/00_basics/macros/if_triple.cf

@@ -1,7 +1,6 @@
 ######################################################
 #
 #  Test that @if works with patch level
-#
 #####################################################
 
 body common control
@@ -13,7 +12,7 @@ body common control
 bundle agent init
 {
   files:
-      "$(G.testdir)/test.cf"
+      "$(G.testdir)$(const.dirsep)test.cf"
         create => "true",
         edit_template => "$(this.promise_filename).sub.template",
         template_method => "mustache";
@@ -22,9 +21,15 @@ bundle agent init
 bundle agent check
 {
   methods:
-      "check" usebundle => dcs_passif_output(".*$(G.testdir)/test.cf Pass.*",
+      # Note: dcs_passif_output expects first argument to be regexp.
+      # To convert Windows-style path (with backslashes) to a regex which will match this path,
+      # we need to convert all backslashes to double-backslashes.
+      # In the command below, each backslash is escaped twice:
+      # once for regex, and once for CFEngine string parser.
+      "check" usebundle => dcs_passif_output(regex_replace(".*$(G.testdir)$(const.dirsep)test.cf Pass.*",
+                                                           "\\\\", "\\\\\\\\", "g"),
                                              ".*FAIL.*",
-                                             "$(sys.cf_agent) -D AUTO -Kf $(G.testdir)/test.cf",
+                                             "$(sys.cf_agent) -D AUTO -Kf $(G.testdir)$(const.dirsep)test.cf",
                                              $(this.promise_filename));
 }
 

tests/acceptance/01_vars/01_basic/namespaces/bundle_qualified_refs/1/main.cf

@@ -13,6 +13,13 @@ bundle agent __main__
         "bundlesequence"  usebundle => default("$(this.promise_filename)");
 }
 
+bundle agent init
+{
+  commands:
+    windows::
+      "$(G.dos2unix) $(this.promise_dirname)/expected_output.txt" -> { "ENT-10433" };
+}
+
 bundle agent test
 {
   meta:

tests/acceptance/01_vars/01_basic/namespaces/bundle_qualified_refs/2/main.cf

@@ -13,6 +13,13 @@ bundle agent __main__
         "bundlesequence"  usebundle => default("$(this.promise_filename)");
 }
 
+bundle agent init
+{
+  commands:
+    windows::
+      "$(G.dos2unix) $(this.promise_dirname)/expected_output.txt" -> { "ENT-10433" };
+}
+
 bundle agent test
 {
   meta:

tests/acceptance/01_vars/01_basic/sysvars.cf

@@ -32,6 +32,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
 }
 
 #######################################################

tests/acceptance/01_vars/02_functions/execresult.cf

@@ -29,6 +29,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10217" };
   vars:
       "dummy" string => "dummy";
 }

tests/acceptance/01_vars/02_functions/execresult_action_immediate.cf

@@ -26,6 +26,8 @@ bundle agent test
   meta:
       "description" -> {"ENT-7478"}
         string => "If 'ifelapsed => 0' is used, execresult() should run the given command every time";
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10217" };
 
   methods:
       "foo" usebundle => check_date("foo");

tests/acceptance/01_vars/02_functions/execresult_select.cf

@@ -18,6 +18,8 @@ bundle agent test
   meta:
       "description" -> { "CFE-3108" }
         string => "Test that you can select stderr/stdout in execresult";
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10217" };
 
   vars:
       "result_with_stdout_stderr"

tests/acceptance/01_vars/02_functions/execresult_stderr.cf

@@ -18,6 +18,8 @@ bundle agent test
   meta:
       "description" -> { "CFE-3103" }
         string => "Test that execresult captures both stdout and stderr";
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10217" };
 
   vars:
       "result_with_stdout_stderr"

tests/acceptance/01_vars/02_functions/findfiles.cf

@@ -41,7 +41,7 @@ bundle agent test
 {
   meta:
       "test_suppress_fail" string => "windows",
-        meta => { "redmine4730" };
+        meta => { "redmine4730,ENT-2145" };
 
   vars:
       "patterns[a]" string => "$(G.testdir)/?";

tests/acceptance/01_vars/02_functions/findfiles_up.cf

@@ -78,6 +78,8 @@ bundle agent test
   meta:
       "description" -> { "CFE-3577" }
         string => "Test for expected results from policy function search_up";
+      "test_skip_needs_work" string => "windows",
+        meta => { "ENT-10250" };
 
   methods:
        "Test 0"

tests/acceptance/01_vars/02_functions/getindices_returns_expected_list_from_array.cf

@@ -37,10 +37,6 @@ bundle agent init
 
 bundle agent test
 {
-  meta:
-      "test_soft_fail" string => "!any",
-        meta => { "redmine7116" };
-
   vars:
     "values_data_1" slist => getindices("init.data[bar]");
     "values_data_2" slist => getindices("init.data[zebra][lion]");

tests/acceptance/01_vars/02_functions/getindices_returns_expected_list_from_datacontainer.cf

@@ -30,10 +30,6 @@ bundle agent init
 
 bundle agent test
 {
-  meta:
-      "test_soft_fail" string => "!any",
-        meta => { "redmine7116" };
-
   vars:
       # expected: one, two
       "values_data" slist => getindices("init.data[bar]");

tests/acceptance/01_vars/02_functions/getuserinfo.cf

@@ -13,6 +13,9 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10217" };
   vars:
       # this is pretty much all we can test across platforms
       "info_root" string => nth(getuserinfo("root"), "username");

tests/acceptance/01_vars/02_functions/nth_datacontainer.cf

@@ -25,7 +25,6 @@ bundle agent init
 bundle common test_common
 {
   vars:
-
       "data"    data   => readjson("$(this.promise_filename).json", "100k");
       "datastr" string => format("%S", data);
 

tests/acceptance/01_vars/02_functions/readdata.cf

@@ -15,6 +15,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10252" };
+
   vars:
       "explicit_csv" data => readdata("$(this.promise_filename).csv", "CSV");
       "explicit_env" data => readdata("$(this.promise_filename).env", "ENV");

tests/acceptance/01_vars/02_functions/shuffle-exact.cf

@@ -32,8 +32,8 @@ bundle agent test
       # for some reason, shuffle() produces different results on 64bit RHEL 4
       # and Debian 4 than everywhere else
       "test_soft_fail"
-        string => "(centos_4|centos_5|debian_4).64_bit",
-        meta => { "CFE-2301" };
+        string => "((centos_4|centos_5|debian_4).64_bit)|windows",
+        meta => { "CFE-2301,ENT-10254" };
   vars:
       "lists" slist => { "a", "b" };
       "seeds" slist => { "skruf", "cormorant", "dollhouse" };

tests/acceptance/01_vars/02_functions/sort.cf

@@ -61,8 +61,10 @@ bundle agent init
 bundle agent test
 {
   meta:
-      "test_soft_fail" string => "hpux|sunos_5_9|windows",
+      "test_soft_fail" string => "hpux|sunos_5_9",
         meta => { "redmine4934", "redmine5107" };
+      "test_flakey_fail" string => "windows",
+        meta => { "ENT-10254" };
 
 
   vars:

tests/acceptance/01_vars/02_functions/strftime.cf

@@ -50,6 +50,10 @@ bundle edit_line init_insert
 
 bundle agent test
 {
+    meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10253" };
+
   vars:
       "vals" slist => {
                         strftime('gmtime', '%F %T', 100000000),

tests/acceptance/01_vars/02_functions/url_get_local.cf

@@ -33,6 +33,8 @@ bundle agent test
 {
   meta:
       "test_skip_unsupported" string => "!feature_curl";
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
 
   vars:
       "kept" data => mergedata(

tests/acceptance/01_vars/02_functions/validjson_trailing_bogus_data.cf

@@ -18,6 +18,8 @@ bundle agent test
   meta:
       "description" -> { "CFE-4080" }
         string => "Test validjson() with trailing bogus data";
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
 }
 
 ##############################################################################

tests/acceptance/01_vars/04_containers/iterate_over_data_container_with_nulls.cf

@@ -7,6 +7,9 @@ body common control
 
 bundle agent init
 {
+  commands:
+    windows::
+      "$(G.dos2unix) $(this.promise_filename).expected" -> { "ENT-10433" };
 
   files:
       "$(G.testdir)/actual.txt"

tests/acceptance/01_vars/04_containers/multiple_cmerge_variable_dynamic.cf

@@ -31,6 +31,10 @@ bundle agent init
   vars:
       "autorun" slist => bundlesmatching(".*", "autorun");
 
+  commands:
+    windows::
+      "$(G.dos2unix) $(this.promise_filename).expected" -> { "ENT-10433" };
+
   files:
       "$(G.testfile)"
         edit_line => empty;

tests/acceptance/01_vars/04_containers/multiple_cmerge_variable_static.cf

@@ -12,6 +12,10 @@ bundle agent init
   vars:
       "autorun" slist => bundlesmatching(".*", "autorun");
 
+  commands:
+    windows::
+      "$(G.dos2unix) $(this.promise_filename).expected" -> { "ENT-10433" };
+
   files:
       "$(G.testfile)"
         edit_line => empty;

tests/acceptance/01_vars/04_containers/pass_variable_container.cf

@@ -18,6 +18,10 @@ bundle agent init
   meta:
     "tags" slist => { "find" };
 
+  commands:
+    windows::
+      "$(G.dos2unix) $(this.promise_filename).expected" -> { "ENT-10433" };
+
   vars:
 # We want to be sure we can reference this data subsequently
   "d" data => parsejson( '{

tests/acceptance/01_vars/04_containers/pass_variable_container_index.cf

@@ -17,6 +17,10 @@ bundle agent init
 {
   meta:
       "tags" slist => { "find" };
+  commands:
+    windows::
+      "$(G.dos2unix) $(this.promise_filename).expected" -> { "ENT-10433" };
+
 }
 
 bundle agent test

tests/acceptance/01_vars/deep_delayed_expansion/main.cf

@@ -8,6 +8,8 @@ bundle agent test
 {
   meta:
     "description" string => "Test that variables containing other variales are de-referenced";
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10256" };
 }
 
 bundle agent check