Convert win lineendings to Unix for tests which need it on Windows

Also install dos2unix for this and remove cf-secret workaround, since we package it now Ticket: ENT-10433 Changelog: none
cfengine · Jul 27, 2023 · 9a9d10d · 9a9d10d
1 parent 1c93e72
commit 9a9d10d
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 3 deletions.
diff --git a/.github/workflows/windows_acceptance_tests.yml b/.github/workflows/windows_acceptance_tests.yml
@@ -14,6 +14,7 @@ jobs:
       - uses: msys2/setup-msys2@v2
         with:
           install: >-
+            dos2unix
             diffutils
             util-linux
             python-pip
@@ -46,9 +47,6 @@ jobs:
       - name: run cf-agent
         run: "'/c/Program Files/Cfengine/bin/cf-agent.exe' --version"
 
-      - name: dummy cf-secret, ENT-10405
-        run: "touch 'c:/Program Files/Cfengine/bin/cf-secret.exe' && chmod a+x 'c:/Program Files/Cfengine/bin/cf-secret.exe'"
-
       - name: expect an unknown synthax error in packagesmatching.cf, ENT-10422
         run: "cd tests/acceptance/01_vars/02_functions/ && mv packagesmatching.cf packagesmatching.x.cf"
 

diff --git a/tests/acceptance/01_vars/01_basic/namespaces/bundle_qualified_refs/1/main.cf b/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:

diff --git a/tests/acceptance/01_vars/01_basic/namespaces/bundle_qualified_refs/2/main.cf b/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:

diff --git a/tests/acceptance/01_vars/04_containers/iterate_over_data_container_with_nulls.cf b/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"

diff --git a/tests/acceptance/01_vars/04_containers/multiple_cmerge_variable_dynamic.cf b/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;

diff --git a/tests/acceptance/01_vars/04_containers/multiple_cmerge_variable_static.cf b/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;

diff --git a/tests/acceptance/01_vars/04_containers/pass_variable_container.cf b/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( '{

diff --git a/tests/acceptance/01_vars/04_containers/pass_variable_container_index.cf b/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

diff --git a/tests/acceptance/14_reports/00_output/report_printfile_from_bot.cf b/tests/acceptance/14_reports/00_output/report_printfile_from_bot.cf
@@ -22,6 +22,8 @@ bundle agent check
   classes:
     "passed" expression => strcmp("$(test.expected)", "$(test.actual)");
   reports:
+    windows::
+      "$(this.promise_filename) SFAIL/ENT-10433";
     DEBUG::
       "Expected: '$(test.expected)'";
       "Found: '$(test.actual)'";

diff --git a/tests/acceptance/14_reports/00_output/report_printfile_from_top.cf b/tests/acceptance/14_reports/00_output/report_printfile_from_top.cf
@@ -22,6 +22,8 @@ bundle agent check
   classes:
     "passed" expression => strcmp("$(test.expected)", "$(test.actual)");
   reports:
+    windows::
+      "$(this.promise_filename) SFAIL/ENT-10433";
     DEBUG::
       "Expected: '$(test.expected)'";
       "Found: '$(test.actual)'";

diff --git a/tests/acceptance/21_methods/call_methods_using_array_expansion.cf b/tests/acceptance/21_methods/call_methods_using_array_expansion.cf
@@ -13,6 +13,10 @@ body common control
 
 bundle agent init
 {
+  commands:
+    windows::
+      "$(G.dos2unix) $(this.promise_filename).expected.txt" -> { "ENT-10433" };
+
   files:
       "$(G.testdir)/reports.txt"
         delete => tidy;

diff --git a/tests/acceptance/dcs.cf.sub b/tests/acceptance/dcs.cf.sub
@@ -24,6 +24,7 @@ bundle common G
       # General commands.
       "cmds" slist => { "date",
                         "dd",
+                        "dos2unix",
                         "diff",
                         "cat",
                         "colordiff",