From 8c3fd2f8d265b0b307fa3070accfa4e567881685 Mon Sep 17 00:00:00 2001 From: Aleksei Shpakovskii Date: Fri, 14 Jul 2023 12:39:38 +0200 Subject: [PATCH 1/3] remove .gitattributes file It was a temporary workaround to make some tests pass on Windows Ticket: ENT-10254 Changelog: none --- tests/acceptance/.gitattributes | 1 - 1 file changed, 1 deletion(-) delete mode 100644 tests/acceptance/.gitattributes diff --git a/tests/acceptance/.gitattributes b/tests/acceptance/.gitattributes deleted file mode 100644 index fa1385d99a..0000000000 --- a/tests/acceptance/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* -text From 1c93e72c9aa1e83dc504fbd42e1883cd240a5f2e Mon Sep 17 00:00:00 2001 From: Aleksei Shpakovskii Date: Tue, 18 Jul 2023 15:17:42 +0200 Subject: [PATCH 2/3] un-soft-fail passing tests After removing .gitattributes file, some tests started passing Ticket: ENT-10254 Changelog: none --- tests/acceptance/00_basics/01_compiler/string_contexts.cf | 4 ---- tests/acceptance/00_basics/01_compiler/with_iteration.cf | 4 ---- tests/acceptance/00_basics/def.json/state.cf | 3 --- tests/acceptance/01_vars/01_basic/this_variables.cf | 3 --- tests/acceptance/01_vars/02_functions/cf_version.cf | 3 --- tests/acceptance/01_vars/02_functions/data_expand.cf | 3 --- tests/acceptance/01_vars/02_functions/every_some_none.cf | 3 --- tests/acceptance/01_vars/02_functions/filter.cf | 3 --- tests/acceptance/01_vars/02_functions/format_edge_case.cf | 3 --- tests/acceptance/01_vars/02_functions/getindices.cf | 3 --- .../getindices_returns_expected_list_from_array.cf | 4 ---- .../getindices_returns_expected_list_from_datacontainer.cf | 4 ---- tests/acceptance/01_vars/02_functions/gettags.cf | 4 ---- tests/acceptance/01_vars/02_functions/getvalues.cf | 4 ---- tests/acceptance/01_vars/02_functions/getvalues_containers.cf | 4 ---- ...ll_values_for_given_datacontainer_index_merging_strings.cf | 4 ---- tests/acceptance/01_vars/02_functions/ifelse.cf | 4 ---- tests/acceptance/01_vars/02_functions/ifelse_isvariable.cf | 2 -- tests/acceptance/01_vars/02_functions/inline_json.cf | 4 ---- tests/acceptance/01_vars/02_functions/join.cf | 4 ---- tests/acceptance/01_vars/02_functions/length.cf | 4 ---- tests/acceptance/01_vars/02_functions/maparray.cf | 4 ---- tests/acceptance/01_vars/02_functions/maparray_multi_index.cf | 4 ---- tests/acceptance/01_vars/02_functions/maplist.cf | 4 ---- .../acceptance/01_vars/02_functions/mergedata-json-strings.cf | 2 -- tests/acceptance/01_vars/02_functions/network/url_get.cf | 2 -- tests/acceptance/01_vars/02_functions/nth_datacontainer.cf | 4 ---- tests/acceptance/01_vars/02_functions/readdata_yaml.cf | 4 ---- tests/acceptance/01_vars/02_functions/regex_replace.cf | 4 ---- tests/acceptance/01_vars/02_functions/reverse.cf | 4 ---- .../02_functions/setop_unique_difference_intersection.cf | 3 --- tests/acceptance/01_vars/02_functions/storejson.cf | 3 --- tests/acceptance/01_vars/02_functions/storejson_edge_case.cf | 3 --- tests/acceptance/01_vars/02_functions/string_mustache.cf | 4 ---- tests/acceptance/01_vars/02_functions/string_replace.cf | 4 ---- tests/acceptance/01_vars/02_functions/string_trim.cf | 4 ---- tests/acceptance/01_vars/02_functions/sublist.cf | 4 ---- tests/acceptance/01_vars/02_functions/sum_and_product.cf | 4 ---- tests/acceptance/01_vars/02_functions/text_xform.cf | 4 ---- tests/acceptance/01_vars/02_functions/type.cf | 2 -- tests/acceptance/01_vars/02_functions/validdata.cf | 4 ---- tests/acceptance/01_vars/02_functions/variablesmatching.cf | 4 ---- .../acceptance/01_vars/02_functions/wrap_container_fncalls.cf | 4 ---- tests/acceptance/01_vars/04_containers/inline_json.cf | 4 ---- tests/acceptance/01_vars/04_containers/inline_yaml.cf | 4 ---- .../01_vars/04_containers/iterate_over_data_array.cf | 2 -- tests/acceptance/02_classes/01_basic/from_json_booleans.cf | 4 ---- tests/acceptance/02_classes/02_functions/iprange.cf | 4 ---- tests/acceptance/02_classes/02_functions/isipinsubnet.cf | 4 ---- .../acceptance/10_files/09_insert_lines/insert-large-lines.cf | 3 --- .../mustache_missing_variable_is_empty_string_by_default.cf | 4 ---- .../10_files/mustache_render_multiline_template_data.cf | 4 ---- .../10_files/templating/mustache_top_level_iteration.cf | 4 ---- 53 files changed, 190 deletions(-) diff --git a/tests/acceptance/00_basics/01_compiler/string_contexts.cf b/tests/acceptance/00_basics/01_compiler/string_contexts.cf index 980cf7ab04..835fd8f3f6 100644 --- a/tests/acceptance/00_basics/01_compiler/string_contexts.cf +++ b/tests/acceptance/00_basics/01_compiler/string_contexts.cf @@ -12,10 +12,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - defaults: "s1" string => "1"; "s2" string => "2"; diff --git a/tests/acceptance/00_basics/01_compiler/with_iteration.cf b/tests/acceptance/00_basics/01_compiler/with_iteration.cf index 3b7a903a4a..9ea16ee9a0 100644 --- a/tests/acceptance/00_basics/01_compiler/with_iteration.cf +++ b/tests/acceptance/00_basics/01_compiler/with_iteration.cf @@ -15,10 +15,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "probe" string => "0"; "iter" slist => { "1", "2", "3" }; diff --git a/tests/acceptance/00_basics/def.json/state.cf b/tests/acceptance/00_basics/def.json/state.cf index e2a33b1396..5fee065ed2 100644 --- a/tests/acceptance/00_basics/def.json/state.cf +++ b/tests/acceptance/00_basics/def.json/state.cf @@ -10,9 +10,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; } ####################################################### diff --git a/tests/acceptance/01_vars/01_basic/this_variables.cf b/tests/acceptance/01_vars/01_basic/this_variables.cf index fe30882040..d24a4cebab 100644 --- a/tests/acceptance/01_vars/01_basic/this_variables.cf +++ b/tests/acceptance/01_vars/01_basic/this_variables.cf @@ -18,9 +18,6 @@ bundle agent init bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; vars: "var" slist => { "var in test" }; "var_test" slist => { "var_test in test" }; diff --git a/tests/acceptance/01_vars/02_functions/cf_version.cf b/tests/acceptance/01_vars/02_functions/cf_version.cf index dd4a9e86d0..242f2070ad 100644 --- a/tests/acceptance/01_vars/02_functions/cf_version.cf +++ b/tests/acceptance/01_vars/02_functions/cf_version.cf @@ -15,9 +15,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; vars: "after_newer" string => "yes", if => cf_version_after("1.0.0"); diff --git a/tests/acceptance/01_vars/02_functions/data_expand.cf b/tests/acceptance/01_vars/02_functions/data_expand.cf index c211a579f2..3d45a407a5 100644 --- a/tests/acceptance/01_vars/02_functions/data_expand.cf +++ b/tests/acceptance/01_vars/02_functions/data_expand.cf @@ -15,9 +15,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; vars: "x" string => "foo"; "y" int => "200"; diff --git a/tests/acceptance/01_vars/02_functions/every_some_none.cf b/tests/acceptance/01_vars/02_functions/every_some_none.cf index d8938e5752..9e75f1c470 100644 --- a/tests/acceptance/01_vars/02_functions/every_some_none.cf +++ b/tests/acceptance/01_vars/02_functions/every_some_none.cf @@ -15,9 +15,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; methods: "pretest"; "collect"; diff --git a/tests/acceptance/01_vars/02_functions/filter.cf b/tests/acceptance/01_vars/02_functions/filter.cf index 5770348349..541f14a536 100644 --- a/tests/acceptance/01_vars/02_functions/filter.cf +++ b/tests/acceptance/01_vars/02_functions/filter.cf @@ -15,9 +15,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; vars: "tests" slist => { "fgrep09", "exact1", "exactdot", "regexdot", "invert", "max2", "max0", "grep09" }; "lists" slist => { "s1", "d1", "d2", "dempty" }; diff --git a/tests/acceptance/01_vars/02_functions/format_edge_case.cf b/tests/acceptance/01_vars/02_functions/format_edge_case.cf index 6a8bbebc75..818ae3168f 100644 --- a/tests/acceptance/01_vars/02_functions/format_edge_case.cf +++ b/tests/acceptance/01_vars/02_functions/format_edge_case.cf @@ -12,9 +12,6 @@ body common control ########################################################## bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; vars: "str" string => format('%s', 'Hello, everyone! This is the LONGEST TEXT EVER! I was inspired by the various other longest texts ever on the internet, and I wanted to make my own. So here it is! This is going to be a WORLD RECORD! This is actually my third attempt at doing this. The first time, I didnt save it. The second time, the Neocities editor crashed. Now Im writing this in Notepad, then copying it into the Neocities editor instead of typing it directly in the Neocities editor to avoid crashing. It sucks that my past two attempts are gone now. Those actually got pretty long. Not the longest, but still pretty long. I hope this one wont get lost somehow. Anyways, lets talk about WAFFLES! I like waffles. Waffles are cool. Waffles is a funny word. Theres a Teen Titans Go episode called Waffles where the word Waffles is said a hundred-something times. Its pretty annoying. Theres also a Teen Titans Go episode about Pig Latin. Dont know what Pig Latin is? Its a language where you take all the consonants before the first vowel, move them to the end, and add -ay to the end. If the word begins with a vowel, you just add -way to the end. For example, Waffles becomes Afflesway. Ive been speaking Pig Latin fluently since the fourth grade, so it surprised me when I saw the episode for the first time. I speak Pig Latin with my sister sometimes. Its pretty fun. I like speaking it in public so that everyone around us gets confused. Thats never actually happened before, but if it ever does, twill be pretty funny. By the way, twill is a word I invented recently, and its a contraction of it will. I really hope it gains popularity in the near future, because twill is WAY more fun than saying itll. Itll is too boring. Nobody likes boring. This is nowhere near being the longest text ever, but eventually it will be! I might still be writing this a decade later, who knows? But right now, its not very long. But Ill just keep writing until it is the longest! Have you ever heard the song Dau Dau by Awesome Scampis? Its an amazing song. Look it up on YouTube! I play that song all the time around my sister! It drives her crazy, and I love it. Another way I like driving my sister crazy is by speaking my own made up language to her. She hates the languages I make! The only language that we both speak besides English is Pig Latin. I think you already knew that. Whatever. I think Im gonna go for now. Bye! Hi, Im back now. Im gonna contribute more to this soon-to-be giant wall of text. I just realised I have a giant stuffed frog on my bed. I forgot his name. Im pretty sure it was something stupid though. I think it was FROG in Morse Code or something. Morse Code is cool. I know a bit of it, but Im not very good at it. Im also not very good at French. I barely know anything in French, and my pronunciation probably sucks. But Im learning it, at least. Im also learning Esperanto. Its this language that was made up by some guy a long time ago to be the universal language. A lot of people speak it. I am such a language nerd. Half of this text is probably gonna be about languages. But hey, as long as its long! Ha, get it? As LONG as its LONG? Im so funny, right? No, Im not. I should probably get some sleep. Goodnight! Hello, Im back again. I basically have only two interests nowadays: languages and furries. What? Oh, sorry, I thought you knew I was a furry. Haha, oops. Anyway, yeah, Im a furry, but since Im a young furry, I cant really do as much as I would like to do in the fandom. When Im older, I would like to have a fursuit, go to furry conventions, all that stuff. But for now I can only dream of that. Sorry you had to deal with me talking about furries, but Im honestly very desperate for this to be the longest text ever. Last night I was watching nothing but fursuit unboxings. I think I need help. This one time, me and my mom were going to go to a furry Christmas party, but we didnt end up going because of the fact that there was alcohol on the premises, and that she didnt wanna have to be a mom dragging her son through a crowd of furries. Both of those reasons were understandable. Okay, hopefully I wont have to talk about furries anymore. I dont care if youre a furry reading this right now, I just dont wanna have to torture everyone else.'); "list" slist => { $(str) }; diff --git a/tests/acceptance/01_vars/02_functions/getindices.cf b/tests/acceptance/01_vars/02_functions/getindices.cf index 6c24c3b8be..f682f5d1f8 100644 --- a/tests/acceptance/01_vars/02_functions/getindices.cf +++ b/tests/acceptance/01_vars/02_functions/getindices.cf @@ -38,9 +38,6 @@ bundle common b bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; vars: "user[name]" string => "zamboni"; "user[fullname][first]" string => "Diego"; diff --git a/tests/acceptance/01_vars/02_functions/getindices_returns_expected_list_from_array.cf b/tests/acceptance/01_vars/02_functions/getindices_returns_expected_list_from_array.cf index 3e216bc491..27342861ab 100644 --- a/tests/acceptance/01_vars/02_functions/getindices_returns_expected_list_from_array.cf +++ b/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 => "windows", - meta => { "ENT-10254" }; - vars: "values_data_1" slist => getindices("init.data[bar]"); "values_data_2" slist => getindices("init.data[zebra][lion]"); diff --git a/tests/acceptance/01_vars/02_functions/getindices_returns_expected_list_from_datacontainer.cf b/tests/acceptance/01_vars/02_functions/getindices_returns_expected_list_from_datacontainer.cf index 729f360b31..6fc8f93606 100644 --- a/tests/acceptance/01_vars/02_functions/getindices_returns_expected_list_from_datacontainer.cf +++ b/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 => "windows", - meta => { "ENT-10254" }; - vars: # expected: one, two "values_data" slist => getindices("init.data[bar]"); diff --git a/tests/acceptance/01_vars/02_functions/gettags.cf b/tests/acceptance/01_vars/02_functions/gettags.cf index c7c2df54b6..c7eeb3546e 100644 --- a/tests/acceptance/01_vars/02_functions/gettags.cf +++ b/tests/acceptance/01_vars/02_functions/gettags.cf @@ -25,10 +25,6 @@ bundle common init bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "tags1" slist => getclassmetatags("myclass"); "tags2" slist => getclassmetatags("myplainclass"); diff --git a/tests/acceptance/01_vars/02_functions/getvalues.cf b/tests/acceptance/01_vars/02_functions/getvalues.cf index 88909082c0..9087b7fbea 100644 --- a/tests/acceptance/01_vars/02_functions/getvalues.cf +++ b/tests/acceptance/01_vars/02_functions/getvalues.cf @@ -15,10 +15,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "user[name]" string => "zamboni"; "user[fullname][first]" string => "Diego"; diff --git a/tests/acceptance/01_vars/02_functions/getvalues_containers.cf b/tests/acceptance/01_vars/02_functions/getvalues_containers.cf index ac67a69aa5..c47506e79d 100644 --- a/tests/acceptance/01_vars/02_functions/getvalues_containers.cf +++ b/tests/acceptance/01_vars/02_functions/getvalues_containers.cf @@ -15,10 +15,6 @@ bundle agent init bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "arr_v" slist => getvalues("init.arr"); diff --git a/tests/acceptance/01_vars/02_functions/getvalues_returns_all_values_for_given_datacontainer_index_merging_strings.cf b/tests/acceptance/01_vars/02_functions/getvalues_returns_all_values_for_given_datacontainer_index_merging_strings.cf index 44c7030ba9..25822c688d 100644 --- a/tests/acceptance/01_vars/02_functions/getvalues_returns_all_values_for_given_datacontainer_index_merging_strings.cf +++ b/tests/acceptance/01_vars/02_functions/getvalues_returns_all_values_for_given_datacontainer_index_merging_strings.cf @@ -37,10 +37,6 @@ bundle agent init bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "values_data" slist => getvalues("init.data"); "values_data2" slist => getvalues("init.data2"); diff --git a/tests/acceptance/01_vars/02_functions/ifelse.cf b/tests/acceptance/01_vars/02_functions/ifelse.cf index 6675c84872..e33851efc3 100644 --- a/tests/acceptance/01_vars/02_functions/ifelse.cf +++ b/tests/acceptance/01_vars/02_functions/ifelse.cf @@ -23,10 +23,6 @@ bundle common init bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - classes: "myclass2" expression => "any"; vars: diff --git a/tests/acceptance/01_vars/02_functions/ifelse_isvariable.cf b/tests/acceptance/01_vars/02_functions/ifelse_isvariable.cf index 4ac101dec6..f1eddae20f 100644 --- a/tests/acceptance/01_vars/02_functions/ifelse_isvariable.cf +++ b/tests/acceptance/01_vars/02_functions/ifelse_isvariable.cf @@ -17,8 +17,6 @@ bundle agent test meta: "description" string => "Test that ifelse can use the result of isvariable as a class identifer"; - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; vars: # Since init.passwd_file is defined, I expect the value to be diff --git a/tests/acceptance/01_vars/02_functions/inline_json.cf b/tests/acceptance/01_vars/02_functions/inline_json.cf index ce1a8d9cd4..0d27f9e642 100644 --- a/tests/acceptance/01_vars/02_functions/inline_json.cf +++ b/tests/acceptance/01_vars/02_functions/inline_json.cf @@ -15,10 +15,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "z" string => "100"; "foo" string => "bar"; diff --git a/tests/acceptance/01_vars/02_functions/join.cf b/tests/acceptance/01_vars/02_functions/join.cf index a3ad4c833a..964fcee246 100644 --- a/tests/acceptance/01_vars/02_functions/join.cf +++ b/tests/acceptance/01_vars/02_functions/join.cf @@ -15,10 +15,6 @@ body common control bundle agent init { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "a" slist => { "b", "c", "a" }; "b" slist => { "100", "9", "10" }; diff --git a/tests/acceptance/01_vars/02_functions/length.cf b/tests/acceptance/01_vars/02_functions/length.cf index d7d093ad33..7c50f21627 100644 --- a/tests/acceptance/01_vars/02_functions/length.cf +++ b/tests/acceptance/01_vars/02_functions/length.cf @@ -21,10 +21,6 @@ bundle agent init bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "normal_list" slist => { "b", "c", "a" }; # 3 "empty_list" slist => { }; # 0 diff --git a/tests/acceptance/01_vars/02_functions/maparray.cf b/tests/acceptance/01_vars/02_functions/maparray.cf index e7e1d7ffe4..0a8e99a5b6 100644 --- a/tests/acceptance/01_vars/02_functions/maparray.cf +++ b/tests/acceptance/01_vars/02_functions/maparray.cf @@ -21,10 +21,6 @@ bundle agent init bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "load1" data => parsejson('[ 1, 2, 3]'); "load2" slist => { "eleme\"nt1", "element2", "element3" }; diff --git a/tests/acceptance/01_vars/02_functions/maparray_multi_index.cf b/tests/acceptance/01_vars/02_functions/maparray_multi_index.cf index fa4232aff2..a0feb0165d 100644 --- a/tests/acceptance/01_vars/02_functions/maparray_multi_index.cf +++ b/tests/acceptance/01_vars/02_functions/maparray_multi_index.cf @@ -22,10 +22,6 @@ bundle agent init bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "bundles[x][y][z1]" string => "xyz1"; "bundles[x][y][z23]" slist => { "xyz2", "xyz3" }; diff --git a/tests/acceptance/01_vars/02_functions/maplist.cf b/tests/acceptance/01_vars/02_functions/maplist.cf index 6c9066ce4a..202f94f2d8 100644 --- a/tests/acceptance/01_vars/02_functions/maplist.cf +++ b/tests/acceptance/01_vars/02_functions/maplist.cf @@ -15,10 +15,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "testlist" slist => { "zero", "two", "three's", "four-fore:quatre", "last" }; "empty" slist => { }; diff --git a/tests/acceptance/01_vars/02_functions/mergedata-json-strings.cf b/tests/acceptance/01_vars/02_functions/mergedata-json-strings.cf index ef2557ad1c..1cedd35a62 100644 --- a/tests/acceptance/01_vars/02_functions/mergedata-json-strings.cf +++ b/tests/acceptance/01_vars/02_functions/mergedata-json-strings.cf @@ -12,8 +12,6 @@ bundle agent test meta: "description" string => "Test that plain json strings can be merged"; - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; vars: "merged" data => mergedata( '[]', '{ "one": "1" }', '{ "two":"2"}' ); diff --git a/tests/acceptance/01_vars/02_functions/network/url_get.cf b/tests/acceptance/01_vars/02_functions/network/url_get.cf index d00d8d410c..35f6535f98 100644 --- a/tests/acceptance/01_vars/02_functions/network/url_get.cf +++ b/tests/acceptance/01_vars/02_functions/network/url_get.cf @@ -35,8 +35,6 @@ bundle agent test { meta: "test_skip_unsupported" string => "!feature_curl"; - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; vars: "kept" data => mergedata( diff --git a/tests/acceptance/01_vars/02_functions/nth_datacontainer.cf b/tests/acceptance/01_vars/02_functions/nth_datacontainer.cf index 0c2d3f7ac2..cdcc1fe67a 100644 --- a/tests/acceptance/01_vars/02_functions/nth_datacontainer.cf +++ b/tests/acceptance/01_vars/02_functions/nth_datacontainer.cf @@ -24,10 +24,6 @@ bundle agent init bundle common test_common { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "data" data => readjson("$(this.promise_filename).json", "100k"); "datastr" string => format("%S", data); diff --git a/tests/acceptance/01_vars/02_functions/readdata_yaml.cf b/tests/acceptance/01_vars/02_functions/readdata_yaml.cf index 712cd8ae41..25c1e5df00 100644 --- a/tests/acceptance/01_vars/02_functions/readdata_yaml.cf +++ b/tests/acceptance/01_vars/02_functions/readdata_yaml.cf @@ -15,10 +15,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: feature_yaml:: "explicit_yaml" data => readdata("$(this.promise_filename).yaml", "YAML"); diff --git a/tests/acceptance/01_vars/02_functions/regex_replace.cf b/tests/acceptance/01_vars/02_functions/regex_replace.cf index b08d5cfbc9..aacfc4bd7d 100644 --- a/tests/acceptance/01_vars/02_functions/regex_replace.cf +++ b/tests/acceptance/01_vars/02_functions/regex_replace.cf @@ -15,10 +15,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "test" string => "abcdefghij"; diff --git a/tests/acceptance/01_vars/02_functions/reverse.cf b/tests/acceptance/01_vars/02_functions/reverse.cf index dde4e97a6a..88fb5fe040 100644 --- a/tests/acceptance/01_vars/02_functions/reverse.cf +++ b/tests/acceptance/01_vars/02_functions/reverse.cf @@ -24,10 +24,6 @@ bundle agent init bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "sa" slist => reverse("init.a"); "sb" slist => reverse("init.b"); diff --git a/tests/acceptance/01_vars/02_functions/setop_unique_difference_intersection.cf b/tests/acceptance/01_vars/02_functions/setop_unique_difference_intersection.cf index ed265b78c4..815ac9e40d 100644 --- a/tests/acceptance/01_vars/02_functions/setop_unique_difference_intersection.cf +++ b/tests/acceptance/01_vars/02_functions/setop_unique_difference_intersection.cf @@ -34,9 +34,6 @@ bundle agent init bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; vars: "list1" slist => { "a", "b", "c", "d", "e", "f" }; "list2" slist => { "a", "b", "c", "d", "e", "f" }; diff --git a/tests/acceptance/01_vars/02_functions/storejson.cf b/tests/acceptance/01_vars/02_functions/storejson.cf index 6574b38220..70375aee4d 100644 --- a/tests/acceptance/01_vars/02_functions/storejson.cf +++ b/tests/acceptance/01_vars/02_functions/storejson.cf @@ -9,9 +9,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; vars: "mylist" slist => { "x", "y" }; "data" data => parsejson('{ diff --git a/tests/acceptance/01_vars/02_functions/storejson_edge_case.cf b/tests/acceptance/01_vars/02_functions/storejson_edge_case.cf index d209fc3d29..ef12c462b0 100644 --- a/tests/acceptance/01_vars/02_functions/storejson_edge_case.cf +++ b/tests/acceptance/01_vars/02_functions/storejson_edge_case.cf @@ -10,9 +10,6 @@ body common control ########################################################## bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; vars: "data" string => storejson('{ "A very long text": "Hello, everyone! This is the LONGEST TEXT EVER! I was inspired by the various other longest texts ever on the internet, and I wanted to make my own. So here it is! This is going to be a WORLD RECORD! This is actually my third attempt at doing this. The first time, I didnt save it. The second time, the Neocities editor crashed. Now Im writing this in Notepad, then copying it into the Neocities editor instead of typing it directly in the Neocities editor to avoid crashing. It sucks that my past two attempts are gone now. Those actually got pretty long. Not the longest, but still pretty long. I hope this one wont get lost somehow. Anyways, lets talk about WAFFLES! I like waffles. Waffles are cool. Waffles is a funny word. Theres a Teen Titans Go episode called Waffles where the word Waffles is said a hundred-something times. Its pretty annoying. Theres also a Teen Titans Go episode about Pig Latin. Dont know what Pig Latin is? Its a language where you take all the consonants before the first vowel, move them to the end, and add -ay to the end. If the word begins with a vowel, you just add -way to the end. For example, Waffles becomes Afflesway. Ive been speaking Pig Latin fluently since the fourth grade, so it surprised me when I saw the episode for the first time. I speak Pig Latin with my sister sometimes. Its pretty fun. I like speaking it in public so that everyone around us gets confused. Thats never actually happened before, but if it ever does, twill be pretty funny. By the way, twill is a word I invented recently, and its a contraction of it will. I really hope it gains popularity in the near future, because twill is WAY more fun than saying itll. Itll is too boring. Nobody likes boring. This is nowhere near being the longest text ever, but eventually it will be! I might still be writing this a decade later, who knows? But right now, its not very long. But Ill just keep writing until it is the longest! Have you ever heard the song Dau Dau by Awesome Scampis? Its an amazing song. Look it up on YouTube! I play that song all the time around my sister! It drives her crazy, and I love it. Another way I like driving my sister crazy is by speaking my own made up language to her. She hates the languages I make! The only language that we both speak besides English is Pig Latin. I think you already knew that. Whatever. I think Im gonna go for now. Bye! Hi, Im back now. Im gonna contribute more to this soon-to-be giant wall of text. I just realised I have a giant stuffed frog on my bed. I forgot his name. Im pretty sure it was something stupid though. I think it was FROG in Morse Code or something. Morse Code is cool. I know a bit of it, but Im not very good at it. Im also not very good at French. I barely know anything in French, and my pronunciation probably sucks. But Im learning it, at least. Im also learning Esperanto. Its this language that was made up by some guy a long time ago to be the universal language. A lot of people speak it. I am such a language nerd. Half of this text is probably gonna be about languages. But hey, as long as its long! Ha, get it? As LONG as its LONG? Im so funny, right? No, Im not. I should probably get some sleep. Goodnight! Hello, Im back again. I basically have only two interests nowadays: languages and furries. What? Oh, sorry, I thought you knew I was a furry. Haha, oops. Anyway, yeah, Im a furry, but since Im a young furry, I cant really do as much as I would like to do in the fandom. When Im older, I would like to have a fursuit, go to furry conventions, all that stuff. But for now I can only dream of that. Sorry you had to deal with me talking about furries, but Im honestly very desperate for this to be the longest text ever. Last night I was watching nothing but fursuit unboxings. I think I need help. This one time, me and my mom were going to go to a furry Christmas party, but we didnt end up going because of the fact that there was alcohol on the premises, and that she didnt wanna have to be a mom dragging her son through a crowd of furries. Both of those reasons were understandable. Okay, hopefully I wont have to talk about furries anymore. I dont care if youre a furry reading this right now, I just dont wanna have to torture everyone else."}'); } diff --git a/tests/acceptance/01_vars/02_functions/string_mustache.cf b/tests/acceptance/01_vars/02_functions/string_mustache.cf index e966c5b1fb..0ac07f76a5 100644 --- a/tests/acceptance/01_vars/02_functions/string_mustache.cf +++ b/tests/acceptance/01_vars/02_functions/string_mustache.cf @@ -14,10 +14,6 @@ bundle agent init bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "out11" string => string_mustache("desert = {{vars.init.desert}}"); diff --git a/tests/acceptance/01_vars/02_functions/string_replace.cf b/tests/acceptance/01_vars/02_functions/string_replace.cf index 220de85782..c3caf164ca 100644 --- a/tests/acceptance/01_vars/02_functions/string_replace.cf +++ b/tests/acceptance/01_vars/02_functions/string_replace.cf @@ -16,10 +16,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "test" string => "abcdefghij\t\n"; "test2" string => "(){}[].*?"; diff --git a/tests/acceptance/01_vars/02_functions/string_trim.cf b/tests/acceptance/01_vars/02_functions/string_trim.cf index c361445814..13b46a3a2d 100644 --- a/tests/acceptance/01_vars/02_functions/string_trim.cf +++ b/tests/acceptance/01_vars/02_functions/string_trim.cf @@ -9,10 +9,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "abcd1" string => string_trim("abcd"); "abcd2" string => string_trim(" abcd"); diff --git a/tests/acceptance/01_vars/02_functions/sublist.cf b/tests/acceptance/01_vars/02_functions/sublist.cf index 2fe5a4bc63..af137477c7 100644 --- a/tests/acceptance/01_vars/02_functions/sublist.cf +++ b/tests/acceptance/01_vars/02_functions/sublist.cf @@ -15,10 +15,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "test" slist => { 1,2,3, diff --git a/tests/acceptance/01_vars/02_functions/sum_and_product.cf b/tests/acceptance/01_vars/02_functions/sum_and_product.cf index 3807b376ac..86ccbc32b4 100644 --- a/tests/acceptance/01_vars/02_functions/sum_and_product.cf +++ b/tests/acceptance/01_vars/02_functions/sum_and_product.cf @@ -21,10 +21,6 @@ bundle agent init bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "normal_list" slist => { "1", "2", "3" }; "empty_list" slist => { }; diff --git a/tests/acceptance/01_vars/02_functions/text_xform.cf b/tests/acceptance/01_vars/02_functions/text_xform.cf index 9d31b3c30c..191dfb166b 100644 --- a/tests/acceptance/01_vars/02_functions/text_xform.cf +++ b/tests/acceptance/01_vars/02_functions/text_xform.cf @@ -7,10 +7,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "tests" slist => { "q1", "q2", "q3", "q4" }; "offsets" ilist => { "-1", "-2", "-5", "-10", "-20", "-26", "-27", "-28", "-10240", diff --git a/tests/acceptance/01_vars/02_functions/type.cf b/tests/acceptance/01_vars/02_functions/type.cf index 1aea1a7746..4326d3cfa1 100644 --- a/tests/acceptance/01_vars/02_functions/type.cf +++ b/tests/acceptance/01_vars/02_functions/type.cf @@ -32,8 +32,6 @@ bundle agent test meta: "description" -> { "CFE-2240" } string => "Test for expected results from policy function type"; - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; vars: "test_00" string => type("init._data"); diff --git a/tests/acceptance/01_vars/02_functions/validdata.cf b/tests/acceptance/01_vars/02_functions/validdata.cf index f2d134ca99..c25d3d0b8f 100644 --- a/tests/acceptance/01_vars/02_functions/validdata.cf +++ b/tests/acceptance/01_vars/02_functions/validdata.cf @@ -15,10 +15,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "valid_json" string => "should appear", if => validdata(readfile("$(this.promise_filename).json", inf), "JSON"); diff --git a/tests/acceptance/01_vars/02_functions/variablesmatching.cf b/tests/acceptance/01_vars/02_functions/variablesmatching.cf index 0aa93783d7..074513b4ab 100644 --- a/tests/acceptance/01_vars/02_functions/variablesmatching.cf +++ b/tests/acceptance/01_vars/02_functions/variablesmatching.cf @@ -22,10 +22,6 @@ bundle common init bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "vars" slist => variablesmatching("default:init.test_fbeae67f3e347b5e0032302200141131.*"); "x_vars" slist => variablesmatching("default:init.test_fbeae67f3e347b5e0032302200141131.*", "x"); diff --git a/tests/acceptance/01_vars/02_functions/wrap_container_fncalls.cf b/tests/acceptance/01_vars/02_functions/wrap_container_fncalls.cf index feebc3b298..5d1c24392e 100644 --- a/tests/acceptance/01_vars/02_functions/wrap_container_fncalls.cf +++ b/tests/acceptance/01_vars/02_functions/wrap_container_fncalls.cf @@ -19,10 +19,6 @@ bundle common init bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "base_list" slist => { "a", "b", "c", "aaa", "bbb", "ccc" }; "base_data" data => '{ "x": 100, "y": "z" }'; diff --git a/tests/acceptance/01_vars/04_containers/inline_json.cf b/tests/acceptance/01_vars/04_containers/inline_json.cf index be6e57d68e..40287b0188 100644 --- a/tests/acceptance/01_vars/04_containers/inline_json.cf +++ b/tests/acceptance/01_vars/04_containers/inline_json.cf @@ -15,10 +15,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "included" string => "( included text )"; "options1" data => ' diff --git a/tests/acceptance/01_vars/04_containers/inline_yaml.cf b/tests/acceptance/01_vars/04_containers/inline_yaml.cf index f087ef9cda..7d518a5db3 100644 --- a/tests/acceptance/01_vars/04_containers/inline_yaml.cf +++ b/tests/acceptance/01_vars/04_containers/inline_yaml.cf @@ -15,10 +15,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: feature_yaml:: "included" string => "( included text )"; diff --git a/tests/acceptance/01_vars/04_containers/iterate_over_data_array.cf b/tests/acceptance/01_vars/04_containers/iterate_over_data_array.cf index 5f80261932..dde9ecac55 100644 --- a/tests/acceptance/01_vars/04_containers/iterate_over_data_array.cf +++ b/tests/acceptance/01_vars/04_containers/iterate_over_data_array.cf @@ -20,8 +20,6 @@ bundle agent test string => "Test that we can iterate over an array inside of a data container without first extracting it. And that the order of iteration is preserved."; - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; vars: "data3" data => '{ "iteration_order":[ "b", "c", "a" ], "b":{ "key": "bkeyval" }, "c":{"key":"ckeyval"}, "a":{"key":"akeyval"}}'; diff --git a/tests/acceptance/02_classes/01_basic/from_json_booleans.cf b/tests/acceptance/02_classes/01_basic/from_json_booleans.cf index 9d16d94888..c9db5ed37f 100644 --- a/tests/acceptance/02_classes/01_basic/from_json_booleans.cf +++ b/tests/acceptance/02_classes/01_basic/from_json_booleans.cf @@ -15,10 +15,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - classes: "canary" expression => "any", meta => { "collect" }; # just a baseline test "from_$(json)" expression => "$(json)", meta => { "collect" }; # iterates through non-nulls diff --git a/tests/acceptance/02_classes/02_functions/iprange.cf b/tests/acceptance/02_classes/02_functions/iprange.cf index f95c30188f..fdc991f68c 100644 --- a/tests/acceptance/02_classes/02_functions/iprange.cf +++ b/tests/acceptance/02_classes/02_functions/iprange.cf @@ -15,10 +15,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - classes: "expected_missing" expression => iprange("8.8.8.8/31"), meta => { "collect" }; diff --git a/tests/acceptance/02_classes/02_functions/isipinsubnet.cf b/tests/acceptance/02_classes/02_functions/isipinsubnet.cf index 2d89d0619b..6cff4f4db0 100644 --- a/tests/acceptance/02_classes/02_functions/isipinsubnet.cf +++ b/tests/acceptance/02_classes/02_functions/isipinsubnet.cf @@ -15,10 +15,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - classes: "zeroes_range_match" expression => isipinsubnet("0.0.0.0/0", "1.2.3.4"), meta => { "collect" }; diff --git a/tests/acceptance/10_files/09_insert_lines/insert-large-lines.cf b/tests/acceptance/10_files/09_insert_lines/insert-large-lines.cf index 5ff334e0de..4f0a600e8d 100644 --- a/tests/acceptance/10_files/09_insert_lines/insert-large-lines.cf +++ b/tests/acceptance/10_files/09_insert_lines/insert-large-lines.cf @@ -8,9 +8,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; vars: "data" string => readfile("$(this.promise_filename).txt", "16431"); files: diff --git a/tests/acceptance/10_files/mustache_missing_variable_is_empty_string_by_default.cf b/tests/acceptance/10_files/mustache_missing_variable_is_empty_string_by_default.cf index 028bc10f08..37e7e2e183 100644 --- a/tests/acceptance/10_files/mustache_missing_variable_is_empty_string_by_default.cf +++ b/tests/acceptance/10_files/mustache_missing_variable_is_empty_string_by_default.cf @@ -32,10 +32,6 @@ bundle agent init bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - files: "$(init.template_target)" edit_template => "$(this.promise_filename).mustache", diff --git a/tests/acceptance/10_files/mustache_render_multiline_template_data.cf b/tests/acceptance/10_files/mustache_render_multiline_template_data.cf index 12b98f1870..eff73e17c2 100644 --- a/tests/acceptance/10_files/mustache_render_multiline_template_data.cf +++ b/tests/acceptance/10_files/mustache_render_multiline_template_data.cf @@ -13,10 +13,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "template_target" string => "$(G.testfile)"; diff --git a/tests/acceptance/10_files/templating/mustache_top_level_iteration.cf b/tests/acceptance/10_files/templating/mustache_top_level_iteration.cf index 5830168242..414ccdec1e 100644 --- a/tests/acceptance/10_files/templating/mustache_top_level_iteration.cf +++ b/tests/acceptance/10_files/templating/mustache_top_level_iteration.cf @@ -16,10 +16,6 @@ body common control bundle agent test { - meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10254" }; - vars: "mydata1" data => '{ "a": 100 }'; "mydata2" data => '[ "p", "q" ]'; From 9a9d10d874c345a3fa8b15c8802f3e7700a86d63 Mon Sep 17 00:00:00 2001 From: Aleksei Shpakovskii Date: Wed, 19 Jul 2023 14:22:15 +0200 Subject: [PATCH 3/3] 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 --- .github/workflows/windows_acceptance_tests.yml | 4 +--- .../01_basic/namespaces/bundle_qualified_refs/1/main.cf | 7 +++++++ .../01_basic/namespaces/bundle_qualified_refs/2/main.cf | 7 +++++++ .../iterate_over_data_container_with_nulls.cf | 3 +++ .../04_containers/multiple_cmerge_variable_dynamic.cf | 4 ++++ .../04_containers/multiple_cmerge_variable_static.cf | 4 ++++ .../01_vars/04_containers/pass_variable_container.cf | 4 ++++ .../01_vars/04_containers/pass_variable_container_index.cf | 4 ++++ .../14_reports/00_output/report_printfile_from_bot.cf | 2 ++ .../14_reports/00_output/report_printfile_from_top.cf | 2 ++ .../21_methods/call_methods_using_array_expansion.cf | 4 ++++ tests/acceptance/dcs.cf.sub | 1 + 12 files changed, 43 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows_acceptance_tests.yml b/.github/workflows/windows_acceptance_tests.yml index 664196bcf3..1709a19a85 100644 --- 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 index aa880882f8..f7e36e8ead 100644 --- 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 index 1099dedeff..4dd235b4c9 100644 --- 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 index 5b6bdec183..795bd02e1e 100644 --- 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 index ed2a131f78..f910fa561f 100644 --- 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 index 8f4bd66d61..b60b96afbb 100644 --- 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 index fd55182721..40727d8a3f 100644 --- 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 index cd9f642688..35bfe052ca 100644 --- 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 index 4956118b88..7f140f924a 100644 --- 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 index 66a9ec34f3..f0c0c3adf0 100644 --- 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 index dbddadbaea..dfa945a782 100644 --- 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 index 5182123191..15bba3cd3d 100644 --- 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",