From 6d3b9ea4d7159f8d11bf386b407b9aa5efa63a29 Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Thu, 30 Apr 2026 13:04:37 +0200 Subject: [PATCH 01/22] Removed trailing commas from some of the JSON files to make them valid JSON These tests are not about trailing commas, so might as well make them valid JSON. Signed-off-by: Ole Herman Schumacher Elgesem (cherry picked from commit 884d40f4b6eab885f9ac465943556901a240c1a5) --- .../acceptance/00_basics/def.json/policy_server_classes.cf.json | 2 +- tests/acceptance/01_vars/02_functions/data_expand.cf.json | 2 +- tests/acceptance/01_vars/02_functions/nth_datacontainer.cf.json | 2 +- tests/unit/data/mustache_extra.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/acceptance/00_basics/def.json/policy_server_classes.cf.json b/tests/acceptance/00_basics/def.json/policy_server_classes.cf.json index bd84880689..1cc6c60664 100644 --- a/tests/acceptance/00_basics/def.json/policy_server_classes.cf.json +++ b/tests/acceptance/00_basics/def.json/policy_server_classes.cf.json @@ -1,6 +1,6 @@ { "classes": { - "test_class_policy_server": [ "am_policy_hub" ], + "test_class_policy_server": [ "am_policy_hub" ] } } diff --git a/tests/acceptance/01_vars/02_functions/data_expand.cf.json b/tests/acceptance/01_vars/02_functions/data_expand.cf.json index 50747744be..ab7016be70 100644 --- a/tests/acceptance/01_vars/02_functions/data_expand.cf.json +++ b/tests/acceptance/01_vars/02_functions/data_expand.cf.json @@ -1,5 +1,5 @@ { "plain data": "nothing", "$(x)": "nothing again", - "$(y)": "$(nosuchvar)", + "$(y)": "$(nosuchvar)" } diff --git a/tests/acceptance/01_vars/02_functions/nth_datacontainer.cf.json b/tests/acceptance/01_vars/02_functions/nth_datacontainer.cf.json index 99251e38e4..483c0ad72a 100644 --- a/tests/acceptance/01_vars/02_functions/nth_datacontainer.cf.json +++ b/tests/acceptance/01_vars/02_functions/nth_datacontainer.cf.json @@ -7,5 +7,5 @@ "integer_2": 987654321, "string_2": "Othello? Where art thou now?", "boolean_2": false, - "null": null, + "null": null } diff --git a/tests/unit/data/mustache_extra.json b/tests/unit/data/mustache_extra.json index e76a54a688..a69973b933 100644 --- a/tests/unit/data/mustache_extra.json +++ b/tests/unit/data/mustache_extra.json @@ -61,6 +61,6 @@ }, "template": "{{#list}}{{k}}={{v}}, {{/list}}", "expected": "789=0, =true, -1=-2, " - }, + } ] } From 0a81fdacf7a7dca6c2823b3fb115aa2d503ce88c Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Thu, 30 Apr 2026 13:09:10 +0200 Subject: [PATCH 02/22] Renamed invalid JSON file to .x.json We use .x.cf as a convention for invalid files, so might as well standardize. Signed-off-by: Ole Herman Schumacher Elgesem (cherry picked from commit 9ff7df8a6d248c0448b76b120ffed1389bda81c0) --- tests/acceptance/01_vars/02_functions/validdata.cf | 4 ++-- .../{validdata.cf.inv.json => validdata.cf.x.json} | 0 tests/acceptance/01_vars/02_functions/validjson_strict.cf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename tests/acceptance/01_vars/02_functions/{validdata.cf.inv.json => validdata.cf.x.json} (100%) diff --git a/tests/acceptance/01_vars/02_functions/validdata.cf b/tests/acceptance/01_vars/02_functions/validdata.cf index c25d3d0b8f..931ebe816b 100644 --- a/tests/acceptance/01_vars/02_functions/validdata.cf +++ b/tests/acceptance/01_vars/02_functions/validdata.cf @@ -19,12 +19,12 @@ bundle agent test "valid_json" string => "should appear", if => validdata(readfile("$(this.promise_filename).json", inf), "JSON"); "invalid_json" string => "should not appear", - if => validdata(readfile("$(this.promise_filename).inv.json", inf), "JSON"); + if => validdata(readfile("$(this.promise_filename).x.json", inf), "JSON"); "valid_validjson" string => "should appear", if => validjson(readfile("$(this.promise_filename).json", inf)); "invalid_validjson" string => "should not appear", - if => validjson(readfile("$(this.promise_filename).inv.json", inf)); + if => validjson(readfile("$(this.promise_filename).x.json", inf)); } ########################################################### diff --git a/tests/acceptance/01_vars/02_functions/validdata.cf.inv.json b/tests/acceptance/01_vars/02_functions/validdata.cf.x.json similarity index 100% rename from tests/acceptance/01_vars/02_functions/validdata.cf.inv.json rename to tests/acceptance/01_vars/02_functions/validdata.cf.x.json diff --git a/tests/acceptance/01_vars/02_functions/validjson_strict.cf b/tests/acceptance/01_vars/02_functions/validjson_strict.cf index 7fde5586fb..e63b7745ef 100644 --- a/tests/acceptance/01_vars/02_functions/validjson_strict.cf +++ b/tests/acceptance/01_vars/02_functions/validjson_strict.cf @@ -16,7 +16,7 @@ bundle agent check { vars: "json" string => readfile("$(this.promise_dirname)/validdata.cf.json", inf); - "invjson" string => readfile("$(this.promise_dirname)/validdata.cf.inv.json", inf); + "invjson" string => readfile("$(this.promise_dirname)/validdata.cf.x.json", inf); "mystring" string => "\"foo\""; "mynumber" string => "3.14"; "mybool" string => "true"; From b172f514895a94ac257c9d071da362916d759561 Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Thu, 30 Apr 2026 13:11:33 +0200 Subject: [PATCH 03/22] rules.json: Added missing comma Signed-off-by: Ole Herman Schumacher Elgesem (cherry picked from commit 210c807cb868ef6225b22f8545d1725262173ebb) --- .../10_files/file_select_attrs_consistent_behavior/rules.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/10_files/file_select_attrs_consistent_behavior/rules.json b/tests/acceptance/10_files/file_select_attrs_consistent_behavior/rules.json index 352beedf05..be311e4319 100644 --- a/tests/acceptance/10_files/file_select_attrs_consistent_behavior/rules.json +++ b/tests/acceptance/10_files/file_select_attrs_consistent_behavior/rules.json @@ -1,6 +1,6 @@ [ { -"location": "/tmp/logs/tidy" +"location": "/tmp/logs/tidy", "context": "any", "action": "TIDY", "frequency": "10", From d1b50d8c7eab1b2da4fcb8a9923d3d39136720c6 Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Thu, 30 Apr 2026 14:33:02 +0200 Subject: [PATCH 04/22] Renamed unit test invalid policy files to use .x.cf suffix Signed-off-by: Ole Herman Schumacher Elgesem (cherry picked from commit 4ce06f54f18c9ee886e9a5a4467c20a1ac5d3e3a) --- ..._body.cf => body_body_forget_cb_body.x.cf} | 0 ...dle.cf => body_body_forget_cb_bundle.x.cf} | 0 ...cb_eof.cf => body_body_forget_cb_eof.x.cf} | 0 ...f => body_selection_forgot_semicolon.x.cf} | 0 ... body_selection_unknown_selection_id.x.cf} | 0 ...ken.cf => body_selection_wrong_token.x.cf} | 0 ...orgot_cp.cf => bundle_args_forgot_cp.x.cf} | 0 ..._type.cf => bundle_args_invalid_type.x.cf} | 0 ...ody.cf => bundle_body_forget_cb_body.x.cf} | 0 ...e.cf => bundle_body_forget_cb_bundle.x.cf} | 0 ..._eof.cf => bundle_body_forget_cb_eof.x.cf} | 0 ...orgot_ob.cf => bundle_body_forgot_ob.x.cf} | 0 ...n.cf => bundle_body_forgot_semicolon.x.cf} | 0 ...=> bundle_body_promise_missing_arrow.x.cf} | 0 ...undle_body_promisee_no_colon_allowed.x.cf} | 0 ...=> bundle_body_promiser_forgot_colon.x.cf} | 0 ...dy_promiser_statement_contains_colon.x.cf} | 0 ...dy_promiser_statement_missing_assign.x.cf} | 0 ..._body_promiser_unknown_constraint_id.x.cf} | 0 ...body_promiser_wrong_constraint_token.x.cf} | 0 ...bundle_body_wrong_promise_type_token.x.cf} | 0 ...nt.cf => bundle_body_wrong_statement.x.cf} | 0 ...valid_type.cf => bundle_invalid_type.x.cf} | 0 ....cf => constraint_ifvarclass_invalid.x.cf} | 0 ...word.cf => no_bundle_or_body_keyword.x.cf} | 0 ...lar.cf => promise_promiser_nonscalar.x.cf} | 0 ...lon.cf => rval_function_forgot_colon.x.cf} | 0 ....cf => rval_function_forgot_cp_colon.x.cf} | 0 ...=> rval_function_forgot_cp_semicolon.x.cf} | 0 ...cf => rval_function_wrong_input_type.x.cf} | 0 ...olon.cf => rval_list_forgot_cb_colon.x.cf} | 0 ....cf => rval_list_forgot_cb_semicolon.x.cf} | 0 ...t_colon.cf => rval_list_forgot_colon.x.cf} | 0 ...ype.cf => rval_list_wrong_input_type.x.cf} | 0 ...put_type.cf => rval_wrong_input_type.x.cf} | 0 tests/unit/parser_test.c | 70 +++++++++---------- 36 files changed, 35 insertions(+), 35 deletions(-) rename tests/unit/data/{body_body_forget_cb_body.cf => body_body_forget_cb_body.x.cf} (100%) rename tests/unit/data/{body_body_forget_cb_bundle.cf => body_body_forget_cb_bundle.x.cf} (100%) rename tests/unit/data/{body_body_forget_cb_eof.cf => body_body_forget_cb_eof.x.cf} (100%) rename tests/unit/data/{body_selection_forgot_semicolon.cf => body_selection_forgot_semicolon.x.cf} (100%) rename tests/unit/data/{body_selection_unknown_selection_id.cf => body_selection_unknown_selection_id.x.cf} (100%) rename tests/unit/data/{body_selection_wrong_token.cf => body_selection_wrong_token.x.cf} (100%) rename tests/unit/data/{bundle_args_forgot_cp.cf => bundle_args_forgot_cp.x.cf} (100%) rename tests/unit/data/{bundle_args_invalid_type.cf => bundle_args_invalid_type.x.cf} (100%) rename tests/unit/data/{bundle_body_forget_cb_body.cf => bundle_body_forget_cb_body.x.cf} (100%) rename tests/unit/data/{bundle_body_forget_cb_bundle.cf => bundle_body_forget_cb_bundle.x.cf} (100%) rename tests/unit/data/{bundle_body_forget_cb_eof.cf => bundle_body_forget_cb_eof.x.cf} (100%) rename tests/unit/data/{bundle_body_forgot_ob.cf => bundle_body_forgot_ob.x.cf} (100%) rename tests/unit/data/{bundle_body_forgot_semicolon.cf => bundle_body_forgot_semicolon.x.cf} (100%) rename tests/unit/data/{bundle_body_promise_missing_arrow.cf => bundle_body_promise_missing_arrow.x.cf} (100%) rename tests/unit/data/{bundle_body_promisee_no_colon_allowed.cf => bundle_body_promisee_no_colon_allowed.x.cf} (100%) rename tests/unit/data/{bundle_body_promiser_forgot_colon.cf => bundle_body_promiser_forgot_colon.x.cf} (100%) rename tests/unit/data/{bundle_body_promiser_statement_contains_colon.cf => bundle_body_promiser_statement_contains_colon.x.cf} (100%) rename tests/unit/data/{bundle_body_promiser_statement_missing_assign.cf => bundle_body_promiser_statement_missing_assign.x.cf} (100%) rename tests/unit/data/{bundle_body_promiser_unknown_constraint_id.cf => bundle_body_promiser_unknown_constraint_id.x.cf} (100%) rename tests/unit/data/{bundle_body_promiser_wrong_constraint_token.cf => bundle_body_promiser_wrong_constraint_token.x.cf} (100%) rename tests/unit/data/{bundle_body_wrong_promise_type_token.cf => bundle_body_wrong_promise_type_token.x.cf} (100%) rename tests/unit/data/{bundle_body_wrong_statement.cf => bundle_body_wrong_statement.x.cf} (100%) rename tests/unit/data/{bundle_invalid_type.cf => bundle_invalid_type.x.cf} (100%) rename tests/unit/data/{constraint_ifvarclass_invalid.cf => constraint_ifvarclass_invalid.x.cf} (100%) rename tests/unit/data/{no_bundle_or_body_keyword.cf => no_bundle_or_body_keyword.x.cf} (100%) rename tests/unit/data/{promise_promiser_nonscalar.cf => promise_promiser_nonscalar.x.cf} (100%) rename tests/unit/data/{rval_function_forgot_colon.cf => rval_function_forgot_colon.x.cf} (100%) rename tests/unit/data/{rval_function_forgot_cp_colon.cf => rval_function_forgot_cp_colon.x.cf} (100%) rename tests/unit/data/{rval_function_forgot_cp_semicolon.cf => rval_function_forgot_cp_semicolon.x.cf} (100%) rename tests/unit/data/{rval_function_wrong_input_type.cf => rval_function_wrong_input_type.x.cf} (100%) rename tests/unit/data/{rval_list_forgot_cb_colon.cf => rval_list_forgot_cb_colon.x.cf} (100%) rename tests/unit/data/{rval_list_forgot_cb_semicolon.cf => rval_list_forgot_cb_semicolon.x.cf} (100%) rename tests/unit/data/{rval_list_forgot_colon.cf => rval_list_forgot_colon.x.cf} (100%) rename tests/unit/data/{rval_list_wrong_input_type.cf => rval_list_wrong_input_type.x.cf} (100%) rename tests/unit/data/{rval_wrong_input_type.cf => rval_wrong_input_type.x.cf} (100%) diff --git a/tests/unit/data/body_body_forget_cb_body.cf b/tests/unit/data/body_body_forget_cb_body.x.cf similarity index 100% rename from tests/unit/data/body_body_forget_cb_body.cf rename to tests/unit/data/body_body_forget_cb_body.x.cf diff --git a/tests/unit/data/body_body_forget_cb_bundle.cf b/tests/unit/data/body_body_forget_cb_bundle.x.cf similarity index 100% rename from tests/unit/data/body_body_forget_cb_bundle.cf rename to tests/unit/data/body_body_forget_cb_bundle.x.cf diff --git a/tests/unit/data/body_body_forget_cb_eof.cf b/tests/unit/data/body_body_forget_cb_eof.x.cf similarity index 100% rename from tests/unit/data/body_body_forget_cb_eof.cf rename to tests/unit/data/body_body_forget_cb_eof.x.cf diff --git a/tests/unit/data/body_selection_forgot_semicolon.cf b/tests/unit/data/body_selection_forgot_semicolon.x.cf similarity index 100% rename from tests/unit/data/body_selection_forgot_semicolon.cf rename to tests/unit/data/body_selection_forgot_semicolon.x.cf diff --git a/tests/unit/data/body_selection_unknown_selection_id.cf b/tests/unit/data/body_selection_unknown_selection_id.x.cf similarity index 100% rename from tests/unit/data/body_selection_unknown_selection_id.cf rename to tests/unit/data/body_selection_unknown_selection_id.x.cf diff --git a/tests/unit/data/body_selection_wrong_token.cf b/tests/unit/data/body_selection_wrong_token.x.cf similarity index 100% rename from tests/unit/data/body_selection_wrong_token.cf rename to tests/unit/data/body_selection_wrong_token.x.cf diff --git a/tests/unit/data/bundle_args_forgot_cp.cf b/tests/unit/data/bundle_args_forgot_cp.x.cf similarity index 100% rename from tests/unit/data/bundle_args_forgot_cp.cf rename to tests/unit/data/bundle_args_forgot_cp.x.cf diff --git a/tests/unit/data/bundle_args_invalid_type.cf b/tests/unit/data/bundle_args_invalid_type.x.cf similarity index 100% rename from tests/unit/data/bundle_args_invalid_type.cf rename to tests/unit/data/bundle_args_invalid_type.x.cf diff --git a/tests/unit/data/bundle_body_forget_cb_body.cf b/tests/unit/data/bundle_body_forget_cb_body.x.cf similarity index 100% rename from tests/unit/data/bundle_body_forget_cb_body.cf rename to tests/unit/data/bundle_body_forget_cb_body.x.cf diff --git a/tests/unit/data/bundle_body_forget_cb_bundle.cf b/tests/unit/data/bundle_body_forget_cb_bundle.x.cf similarity index 100% rename from tests/unit/data/bundle_body_forget_cb_bundle.cf rename to tests/unit/data/bundle_body_forget_cb_bundle.x.cf diff --git a/tests/unit/data/bundle_body_forget_cb_eof.cf b/tests/unit/data/bundle_body_forget_cb_eof.x.cf similarity index 100% rename from tests/unit/data/bundle_body_forget_cb_eof.cf rename to tests/unit/data/bundle_body_forget_cb_eof.x.cf diff --git a/tests/unit/data/bundle_body_forgot_ob.cf b/tests/unit/data/bundle_body_forgot_ob.x.cf similarity index 100% rename from tests/unit/data/bundle_body_forgot_ob.cf rename to tests/unit/data/bundle_body_forgot_ob.x.cf diff --git a/tests/unit/data/bundle_body_forgot_semicolon.cf b/tests/unit/data/bundle_body_forgot_semicolon.x.cf similarity index 100% rename from tests/unit/data/bundle_body_forgot_semicolon.cf rename to tests/unit/data/bundle_body_forgot_semicolon.x.cf diff --git a/tests/unit/data/bundle_body_promise_missing_arrow.cf b/tests/unit/data/bundle_body_promise_missing_arrow.x.cf similarity index 100% rename from tests/unit/data/bundle_body_promise_missing_arrow.cf rename to tests/unit/data/bundle_body_promise_missing_arrow.x.cf diff --git a/tests/unit/data/bundle_body_promisee_no_colon_allowed.cf b/tests/unit/data/bundle_body_promisee_no_colon_allowed.x.cf similarity index 100% rename from tests/unit/data/bundle_body_promisee_no_colon_allowed.cf rename to tests/unit/data/bundle_body_promisee_no_colon_allowed.x.cf diff --git a/tests/unit/data/bundle_body_promiser_forgot_colon.cf b/tests/unit/data/bundle_body_promiser_forgot_colon.x.cf similarity index 100% rename from tests/unit/data/bundle_body_promiser_forgot_colon.cf rename to tests/unit/data/bundle_body_promiser_forgot_colon.x.cf diff --git a/tests/unit/data/bundle_body_promiser_statement_contains_colon.cf b/tests/unit/data/bundle_body_promiser_statement_contains_colon.x.cf similarity index 100% rename from tests/unit/data/bundle_body_promiser_statement_contains_colon.cf rename to tests/unit/data/bundle_body_promiser_statement_contains_colon.x.cf diff --git a/tests/unit/data/bundle_body_promiser_statement_missing_assign.cf b/tests/unit/data/bundle_body_promiser_statement_missing_assign.x.cf similarity index 100% rename from tests/unit/data/bundle_body_promiser_statement_missing_assign.cf rename to tests/unit/data/bundle_body_promiser_statement_missing_assign.x.cf diff --git a/tests/unit/data/bundle_body_promiser_unknown_constraint_id.cf b/tests/unit/data/bundle_body_promiser_unknown_constraint_id.x.cf similarity index 100% rename from tests/unit/data/bundle_body_promiser_unknown_constraint_id.cf rename to tests/unit/data/bundle_body_promiser_unknown_constraint_id.x.cf diff --git a/tests/unit/data/bundle_body_promiser_wrong_constraint_token.cf b/tests/unit/data/bundle_body_promiser_wrong_constraint_token.x.cf similarity index 100% rename from tests/unit/data/bundle_body_promiser_wrong_constraint_token.cf rename to tests/unit/data/bundle_body_promiser_wrong_constraint_token.x.cf diff --git a/tests/unit/data/bundle_body_wrong_promise_type_token.cf b/tests/unit/data/bundle_body_wrong_promise_type_token.x.cf similarity index 100% rename from tests/unit/data/bundle_body_wrong_promise_type_token.cf rename to tests/unit/data/bundle_body_wrong_promise_type_token.x.cf diff --git a/tests/unit/data/bundle_body_wrong_statement.cf b/tests/unit/data/bundle_body_wrong_statement.x.cf similarity index 100% rename from tests/unit/data/bundle_body_wrong_statement.cf rename to tests/unit/data/bundle_body_wrong_statement.x.cf diff --git a/tests/unit/data/bundle_invalid_type.cf b/tests/unit/data/bundle_invalid_type.x.cf similarity index 100% rename from tests/unit/data/bundle_invalid_type.cf rename to tests/unit/data/bundle_invalid_type.x.cf diff --git a/tests/unit/data/constraint_ifvarclass_invalid.cf b/tests/unit/data/constraint_ifvarclass_invalid.x.cf similarity index 100% rename from tests/unit/data/constraint_ifvarclass_invalid.cf rename to tests/unit/data/constraint_ifvarclass_invalid.x.cf diff --git a/tests/unit/data/no_bundle_or_body_keyword.cf b/tests/unit/data/no_bundle_or_body_keyword.x.cf similarity index 100% rename from tests/unit/data/no_bundle_or_body_keyword.cf rename to tests/unit/data/no_bundle_or_body_keyword.x.cf diff --git a/tests/unit/data/promise_promiser_nonscalar.cf b/tests/unit/data/promise_promiser_nonscalar.x.cf similarity index 100% rename from tests/unit/data/promise_promiser_nonscalar.cf rename to tests/unit/data/promise_promiser_nonscalar.x.cf diff --git a/tests/unit/data/rval_function_forgot_colon.cf b/tests/unit/data/rval_function_forgot_colon.x.cf similarity index 100% rename from tests/unit/data/rval_function_forgot_colon.cf rename to tests/unit/data/rval_function_forgot_colon.x.cf diff --git a/tests/unit/data/rval_function_forgot_cp_colon.cf b/tests/unit/data/rval_function_forgot_cp_colon.x.cf similarity index 100% rename from tests/unit/data/rval_function_forgot_cp_colon.cf rename to tests/unit/data/rval_function_forgot_cp_colon.x.cf diff --git a/tests/unit/data/rval_function_forgot_cp_semicolon.cf b/tests/unit/data/rval_function_forgot_cp_semicolon.x.cf similarity index 100% rename from tests/unit/data/rval_function_forgot_cp_semicolon.cf rename to tests/unit/data/rval_function_forgot_cp_semicolon.x.cf diff --git a/tests/unit/data/rval_function_wrong_input_type.cf b/tests/unit/data/rval_function_wrong_input_type.x.cf similarity index 100% rename from tests/unit/data/rval_function_wrong_input_type.cf rename to tests/unit/data/rval_function_wrong_input_type.x.cf diff --git a/tests/unit/data/rval_list_forgot_cb_colon.cf b/tests/unit/data/rval_list_forgot_cb_colon.x.cf similarity index 100% rename from tests/unit/data/rval_list_forgot_cb_colon.cf rename to tests/unit/data/rval_list_forgot_cb_colon.x.cf diff --git a/tests/unit/data/rval_list_forgot_cb_semicolon.cf b/tests/unit/data/rval_list_forgot_cb_semicolon.x.cf similarity index 100% rename from tests/unit/data/rval_list_forgot_cb_semicolon.cf rename to tests/unit/data/rval_list_forgot_cb_semicolon.x.cf diff --git a/tests/unit/data/rval_list_forgot_colon.cf b/tests/unit/data/rval_list_forgot_colon.x.cf similarity index 100% rename from tests/unit/data/rval_list_forgot_colon.cf rename to tests/unit/data/rval_list_forgot_colon.x.cf diff --git a/tests/unit/data/rval_list_wrong_input_type.cf b/tests/unit/data/rval_list_wrong_input_type.x.cf similarity index 100% rename from tests/unit/data/rval_list_wrong_input_type.cf rename to tests/unit/data/rval_list_wrong_input_type.x.cf diff --git a/tests/unit/data/rval_wrong_input_type.cf b/tests/unit/data/rval_wrong_input_type.x.cf similarity index 100% rename from tests/unit/data/rval_wrong_input_type.cf rename to tests/unit/data/rval_wrong_input_type.x.cf diff --git a/tests/unit/parser_test.c b/tests/unit/parser_test.c index f0e6739bba..a646182297 100644 --- a/tests/unit/parser_test.c +++ b/tests/unit/parser_test.c @@ -22,32 +22,32 @@ void test_benchmark(void) void test_no_bundle_or_body_keyword(void) { - assert_false(TestParsePolicy("no_bundle_or_body_keyword.cf")); + assert_false(TestParsePolicy("no_bundle_or_body_keyword.x.cf")); } void test_bundle_invalid_type(void) { - assert_false(TestParsePolicy("bundle_invalid_type.cf")); + assert_false(TestParsePolicy("bundle_invalid_type.x.cf")); } void test_constraint_ifvarclass_invalid(void) { - assert_false(TestParsePolicy("constraint_ifvarclass_invalid.cf")); + assert_false(TestParsePolicy("constraint_ifvarclass_invalid.x.cf")); } void test_bundle_args_invalid_type(void) { - assert_false(TestParsePolicy("bundle_args_invalid_type.cf")); + assert_false(TestParsePolicy("bundle_args_invalid_type.x.cf")); } void test_bundle_args_forgot_cp(void) { - assert_false(TestParsePolicy("bundle_args_forgot_cp.cf")); + assert_false(TestParsePolicy("bundle_args_forgot_cp.x.cf")); } void test_bundle_body_forgot_ob(void) { - assert_false(TestParsePolicy("bundle_body_forgot_ob.cf")); + assert_false(TestParsePolicy("bundle_body_forgot_ob.x.cf")); } void test_bundle_custom_promise_type(void) @@ -57,42 +57,42 @@ void test_bundle_custom_promise_type(void) void test_bundle_body_wrong_promise_type_token(void) { - assert_false(TestParsePolicy("bundle_body_wrong_promise_type_token.cf")); + assert_false(TestParsePolicy("bundle_body_wrong_promise_type_token.x.cf")); } void test_bundle_body_wrong_statement(void) { - assert_false(TestParsePolicy("bundle_body_wrong_statement.cf")); + assert_false(TestParsePolicy("bundle_body_wrong_statement.x.cf")); } void test_bundle_body_forgot_semicolon(void) { - assert_false(TestParsePolicy("bundle_body_forgot_semicolon.cf")); + assert_false(TestParsePolicy("bundle_body_forgot_semicolon.x.cf")); } void test_bundle_body_promiser_statement_contains_colon(void) { - assert_false(TestParsePolicy("bundle_body_promiser_statement_contains_colon.cf")); + assert_false(TestParsePolicy("bundle_body_promiser_statement_contains_colon.x.cf")); } void test_bundle_body_promiser_statement_missing_assign(void) { - assert_false(TestParsePolicy("bundle_body_promiser_statement_missing_assign.cf")); + assert_false(TestParsePolicy("bundle_body_promiser_statement_missing_assign.x.cf")); } void test_bundle_body_promisee_missing_arrow(void) { - assert_false(TestParsePolicy("bundle_body_promise_missing_arrow.cf")); + assert_false(TestParsePolicy("bundle_body_promise_missing_arrow.x.cf")); } void test_bundle_body_promiser_wrong_constraint_token(void) { - assert_false(TestParsePolicy("bundle_body_promiser_wrong_constraint_token.cf")); + assert_false(TestParsePolicy("bundle_body_promiser_wrong_constraint_token.x.cf")); } void test_bundle_body_promiser_unknown_constraint_id(void) { - assert_false(TestParsePolicy("bundle_body_promiser_unknown_constraint_id.cf")); + assert_false(TestParsePolicy("bundle_body_promiser_unknown_constraint_id.x.cf")); } void test_body_edit_line_common_constraints(void) @@ -107,107 +107,107 @@ void test_body_edit_xml_common_constraints(void) void test_promise_promiser_nonscalar(void) { - assert_false(TestParsePolicy("promise_promiser_nonscalar.cf")); + assert_false(TestParsePolicy("promise_promiser_nonscalar.x.cf")); } void test_bundle_body_promiser_forgot_colon(void) { - assert_false(TestParsePolicy("bundle_body_promiser_forgot_colon.cf")); + assert_false(TestParsePolicy("bundle_body_promiser_forgot_colon.x.cf")); } void test_bundle_body_promisee_no_colon_allowed(void) { - assert_false(TestParsePolicy("bundle_body_promisee_no_colon_allowed.cf")); + assert_false(TestParsePolicy("bundle_body_promisee_no_colon_allowed.x.cf")); } void test_bundle_body_forget_cb_eof(void) { - assert_false(TestParsePolicy("bundle_body_forget_cb_eof.cf")); + assert_false(TestParsePolicy("bundle_body_forget_cb_eof.x.cf")); } void test_bundle_body_forget_cb_body(void) { - assert_false(TestParsePolicy("bundle_body_forget_cb_body.cf")); + assert_false(TestParsePolicy("bundle_body_forget_cb_body.x.cf")); } void test_bundle_body_forget_cb_bundle(void) { - assert_false(TestParsePolicy("bundle_body_forget_cb_bundle.cf")); + assert_false(TestParsePolicy("bundle_body_forget_cb_bundle.x.cf")); } void test_body_selection_wrong_token(void) { - assert_false(TestParsePolicy("body_selection_wrong_token.cf")); + assert_false(TestParsePolicy("body_selection_wrong_token.x.cf")); } void test_body_selection_forgot_semicolon(void) { - assert_false(TestParsePolicy("body_selection_forgot_semicolon.cf")); + assert_false(TestParsePolicy("body_selection_forgot_semicolon.x.cf")); } void test_body_selection_unknown_selection_id(void) { - assert_false(TestParsePolicy("body_selection_unknown_selection_id.cf")); + assert_false(TestParsePolicy("body_selection_unknown_selection_id.x.cf")); } void test_body_body_forget_cb_eof(void) { - assert_false(TestParsePolicy("body_body_forget_cb_eof.cf")); + assert_false(TestParsePolicy("body_body_forget_cb_eof.x.cf")); } void test_body_body_forget_cb_body(void) { - assert_false(TestParsePolicy("body_body_forget_cb_body.cf")); + assert_false(TestParsePolicy("body_body_forget_cb_body.x.cf")); } void test_body_body_forget_cb_bundle(void) { - assert_false(TestParsePolicy("body_body_forget_cb_bundle.cf")); + assert_false(TestParsePolicy("body_body_forget_cb_bundle.x.cf")); } void test_rval_list_forgot_colon(void) { - assert_false(TestParsePolicy("rval_list_forgot_colon.cf")); + assert_false(TestParsePolicy("rval_list_forgot_colon.x.cf")); } void test_rval_list_wrong_input_type(void) { - assert_false(TestParsePolicy("rval_list_wrong_input_type.cf")); + assert_false(TestParsePolicy("rval_list_wrong_input_type.x.cf")); } void test_rval_function_forgot_colon(void) { - assert_false(TestParsePolicy("rval_function_forgot_colon.cf")); + assert_false(TestParsePolicy("rval_function_forgot_colon.x.cf")); } void test_rval_function_wrong_input_type(void) { - assert_false(TestParsePolicy("rval_function_wrong_input_type.cf")); + assert_false(TestParsePolicy("rval_function_wrong_input_type.x.cf")); } void test_rval_wrong_input_type(void) { - assert_false(TestParsePolicy("rval_wrong_input_type.cf")); + assert_false(TestParsePolicy("rval_wrong_input_type.x.cf")); } void test_rval_list_forgot_cb_semicolon(void) { - assert_false(TestParsePolicy("rval_list_forgot_cb_semicolon.cf")); + assert_false(TestParsePolicy("rval_list_forgot_cb_semicolon.x.cf")); } void test_rval_list_forgot_cb_colon(void) { - assert_false(TestParsePolicy("rval_list_forgot_cb_colon.cf")); + assert_false(TestParsePolicy("rval_list_forgot_cb_colon.x.cf")); } void test_rval_function_forgot_cp_semicolon(void) { - assert_false(TestParsePolicy("rval_function_forgot_cp_semicolon.cf")); + assert_false(TestParsePolicy("rval_function_forgot_cp_semicolon.x.cf")); } void test_rval_function_forgot_cp_colon(void) { - assert_false(TestParsePolicy("rval_function_forgot_cp_colon.cf")); + assert_false(TestParsePolicy("rval_function_forgot_cp_colon.x.cf")); } int main() From 0409519337555a3b9adce8ba8392662fdf212380 Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Thu, 30 Apr 2026 16:13:05 +0200 Subject: [PATCH 05/22] Added missing commas Signed-off-by: Ole Herman Schumacher Elgesem (cherry picked from commit 9e294cd37ccf5553ba67d8ae588fbbfc6e183b28) --- .../08_commands/staging/default_failed_returncodes.cf | 2 +- .../02_maintain/staging/line_truncation_at_4096_chars.cf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/acceptance/08_commands/staging/default_failed_returncodes.cf b/tests/acceptance/08_commands/staging/default_failed_returncodes.cf index 4b43f9035d..8817f01daf 100644 --- a/tests/acceptance/08_commands/staging/default_failed_returncodes.cf +++ b/tests/acceptance/08_commands/staging/default_failed_returncodes.cf @@ -21,7 +21,7 @@ bundle agent check { methods: "report" - usebundle => dcs_passif_expected("default_not_kept,specify_kept_not_kept", "", "$(this.promise_filename)") + usebundle => dcs_passif_expected("default_not_kept,specify_kept_not_kept", "", "$(this.promise_filename)"), inherit => "true"; } diff --git a/tests/acceptance/10_files/02_maintain/staging/line_truncation_at_4096_chars.cf b/tests/acceptance/10_files/02_maintain/staging/line_truncation_at_4096_chars.cf index c946ab5ed5..18f2a28978 100644 --- a/tests/acceptance/10_files/02_maintain/staging/line_truncation_at_4096_chars.cf +++ b/tests/acceptance/10_files/02_maintain/staging/line_truncation_at_4096_chars.cf @@ -34,7 +34,7 @@ bundle agent init # It would create a false negative. commands: "${G.perl}" - args => "-e 'print \"#\" x ${char_number}; print \"ENDMARK\n\"' > ${G.testfile}" + args => "-e 'print \"#\" x ${char_number}; print \"ENDMARK\n\"' > ${G.testfile}", contain => in_shell; } From cf8a62e412d1e5d6392f2c9232e060a74babfcc9 Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Thu, 30 Apr 2026 21:41:12 +0200 Subject: [PATCH 06/22] Renamed plucked.cf.sub to plucked.sub.cf This is a CFEngine policy file and should have a .cf file extension. These definitions are necessary for cfengine lint to find when it's looking for all the bodies and bundles defined in all .cf policy files. Signed-off-by: Ole Herman Schumacher Elgesem (cherry picked from commit ce3639bb2661c5540b210ddfd33ec18445d6c3cd) --- tests/acceptance/08_commands/01_modules/001.cf | 2 +- tests/acceptance/08_commands/01_modules/002.cf | 2 +- tests/acceptance/08_commands/01_modules/003.cf | 2 +- tests/acceptance/08_commands/01_modules/004.cf | 2 +- tests/acceptance/08_commands/01_modules/set-context.cf | 2 +- .../08_commands/01_modules/set-persistent-class.cf | 2 +- tests/acceptance/08_commands/01_modules/set-tags.cf | 2 +- .../vars-from-module-have-source-and-derived_from-tags.cf | 2 +- .../vars-without-explicit-tags-do-not-segfault.cf | 2 +- .../acceptance/10_files/02_maintain/changes_depth_search.cf | 2 +- .../10_files/02_maintain/changes_depth_search.cf.sub | 2 +- .../10_files/02_maintain/changes_depth_search_last_file.cf | 2 +- .../02_maintain/changes_depth_search_last_file.cf.sub | 2 +- .../10_files/02_maintain/check_file_changes_log.cf.sub | 2 +- .../acceptance/10_files/templating/missing_template_file.cf | 2 +- .../acceptance/10_files/templating/mustache_section.cf.sub | 2 +- .../10_files/templating/timed/expired_edit_line_locks.cf | 4 ++-- .../templating/timed/expired_edit_line_locks.cf.sub | 2 +- .../17_users/unsafe/disable_sudo_tty_requirement.cf.sub | 2 +- .../23_failsafe/preexisting_failsafe_preserved.cf | 2 +- .../29_simulate_mode/simulate_safe_functions.cf.sub | 2 +- tests/acceptance/Makefile.am | 6 +++--- tests/acceptance/default.cf.sub | 4 ++-- tests/acceptance/{plucked.cf.sub => plucked.sub.cf} | 0 24 files changed, 27 insertions(+), 27 deletions(-) rename tests/acceptance/{plucked.cf.sub => plucked.sub.cf} (100%) diff --git a/tests/acceptance/08_commands/01_modules/001.cf b/tests/acceptance/08_commands/01_modules/001.cf index 3680b4e43a..83f2886a75 100644 --- a/tests/acceptance/08_commands/01_modules/001.cf +++ b/tests/acceptance/08_commands/01_modules/001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub", "../../plucked.cf.sub" }; + inputs => { "../../default.cf.sub", "../../plucked.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/002.cf b/tests/acceptance/08_commands/01_modules/002.cf index 772f943580..0ddfa2f745 100644 --- a/tests/acceptance/08_commands/01_modules/002.cf +++ b/tests/acceptance/08_commands/01_modules/002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub", "../../plucked.cf.sub" }; + inputs => { "../../default.cf.sub", "../../plucked.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/003.cf b/tests/acceptance/08_commands/01_modules/003.cf index 1b1b782ab7..aaf727710c 100644 --- a/tests/acceptance/08_commands/01_modules/003.cf +++ b/tests/acceptance/08_commands/01_modules/003.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub", "../../plucked.cf.sub" }; + inputs => { "../../default.cf.sub", "../../plucked.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/004.cf b/tests/acceptance/08_commands/01_modules/004.cf index 26582d5652..02878ebf20 100644 --- a/tests/acceptance/08_commands/01_modules/004.cf +++ b/tests/acceptance/08_commands/01_modules/004.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub", "../../plucked.cf.sub" }; + inputs => { "../../default.cf.sub", "../../plucked.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/set-context.cf b/tests/acceptance/08_commands/01_modules/set-context.cf index ac60385c3a..a8ce40a305 100644 --- a/tests/acceptance/08_commands/01_modules/set-context.cf +++ b/tests/acceptance/08_commands/01_modules/set-context.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub", "../../plucked.cf.sub" }; + inputs => { "../../default.cf.sub", "../../plucked.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/set-persistent-class.cf b/tests/acceptance/08_commands/01_modules/set-persistent-class.cf index 07de575b34..c28f389894 100644 --- a/tests/acceptance/08_commands/01_modules/set-persistent-class.cf +++ b/tests/acceptance/08_commands/01_modules/set-persistent-class.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub", "../../plucked.cf.sub" }; + inputs => { "../../default.cf.sub", "../../plucked.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/set-tags.cf b/tests/acceptance/08_commands/01_modules/set-tags.cf index 530c1c84d4..7bd1a78301 100644 --- a/tests/acceptance/08_commands/01_modules/set-tags.cf +++ b/tests/acceptance/08_commands/01_modules/set-tags.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub", "../../plucked.cf.sub" }; + inputs => { "../../default.cf.sub", "../../plucked.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/vars-from-module-have-source-and-derived_from-tags.cf b/tests/acceptance/08_commands/01_modules/vars-from-module-have-source-and-derived_from-tags.cf index 79746b5d24..8613165425 100644 --- a/tests/acceptance/08_commands/01_modules/vars-from-module-have-source-and-derived_from-tags.cf +++ b/tests/acceptance/08_commands/01_modules/vars-from-module-have-source-and-derived_from-tags.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub", "../../plucked.cf.sub" }; + inputs => { "../../default.cf.sub", "../../plucked.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/vars-without-explicit-tags-do-not-segfault.cf b/tests/acceptance/08_commands/01_modules/vars-without-explicit-tags-do-not-segfault.cf index ec07555744..45443f2785 100644 --- a/tests/acceptance/08_commands/01_modules/vars-without-explicit-tags-do-not-segfault.cf +++ b/tests/acceptance/08_commands/01_modules/vars-without-explicit-tags-do-not-segfault.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub", "../../plucked.cf.sub" }; + inputs => { "../../default.cf.sub", "../../plucked.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/changes_depth_search.cf b/tests/acceptance/10_files/02_maintain/changes_depth_search.cf index 61de4fcd03..8844d9ef45 100644 --- a/tests/acceptance/10_files/02_maintain/changes_depth_search.cf +++ b/tests/acceptance/10_files/02_maintain/changes_depth_search.cf @@ -4,7 +4,7 @@ body common control { inputs => { "../../dcs.cf.sub", - "../../plucked.cf.sub", + "../../plucked.sub.cf", "check_file_changes_log.cf.sub", }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/10_files/02_maintain/changes_depth_search.cf.sub b/tests/acceptance/10_files/02_maintain/changes_depth_search.cf.sub index ee5faef623..819958b798 100644 --- a/tests/acceptance/10_files/02_maintain/changes_depth_search.cf.sub +++ b/tests/acceptance/10_files/02_maintain/changes_depth_search.cf.sub @@ -1,7 +1,7 @@ body common control { inputs => { "../../dcs.cf.sub", - "../../plucked.cf.sub", + "../../plucked.sub.cf", }; bundlesequence => { "init", "test" }; } diff --git a/tests/acceptance/10_files/02_maintain/changes_depth_search_last_file.cf b/tests/acceptance/10_files/02_maintain/changes_depth_search_last_file.cf index 02b7b474ba..cd63676d96 100644 --- a/tests/acceptance/10_files/02_maintain/changes_depth_search_last_file.cf +++ b/tests/acceptance/10_files/02_maintain/changes_depth_search_last_file.cf @@ -4,7 +4,7 @@ body common control { inputs => { "../../dcs.cf.sub", - "../../plucked.cf.sub", + "../../plucked.sub.cf", "check_file_changes_log.cf.sub", }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/10_files/02_maintain/changes_depth_search_last_file.cf.sub b/tests/acceptance/10_files/02_maintain/changes_depth_search_last_file.cf.sub index 7f1d749039..c5dfdaf34c 100644 --- a/tests/acceptance/10_files/02_maintain/changes_depth_search_last_file.cf.sub +++ b/tests/acceptance/10_files/02_maintain/changes_depth_search_last_file.cf.sub @@ -1,7 +1,7 @@ body common control { inputs => { "../../dcs.cf.sub", - "../../plucked.cf.sub", + "../../plucked.sub.cf", }; bundlesequence => { "init", "test" }; } diff --git a/tests/acceptance/10_files/02_maintain/check_file_changes_log.cf.sub b/tests/acceptance/10_files/02_maintain/check_file_changes_log.cf.sub index 6a5ef14fda..666de78e64 100644 --- a/tests/acceptance/10_files/02_maintain/check_file_changes_log.cf.sub +++ b/tests/acceptance/10_files/02_maintain/check_file_changes_log.cf.sub @@ -17,7 +17,7 @@ body file control { - inputs => { "../../plucked.cf.sub" }; + inputs => { "../../plucked.sub.cf" }; } bundle agent check_file_changes_log(file, pass_class, fail_class, checks) diff --git a/tests/acceptance/10_files/templating/missing_template_file.cf b/tests/acceptance/10_files/templating/missing_template_file.cf index 8e4821ae0c..7a3c596a17 100644 --- a/tests/acceptance/10_files/templating/missing_template_file.cf +++ b/tests/acceptance/10_files/templating/missing_template_file.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub", "../../plucked.cf.sub" }; + inputs => { "../../default.cf.sub", "../../plucked.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/templating/mustache_section.cf.sub b/tests/acceptance/10_files/templating/mustache_section.cf.sub index 579b1fd869..2dfb113a1c 100644 --- a/tests/acceptance/10_files/templating/mustache_section.cf.sub +++ b/tests/acceptance/10_files/templating/mustache_section.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../plucked.cf.sub" }; + inputs => { "../../plucked.sub.cf" }; bundlesequence => { test }; version => "1.0"; } diff --git a/tests/acceptance/10_files/templating/timed/expired_edit_line_locks.cf b/tests/acceptance/10_files/templating/timed/expired_edit_line_locks.cf index dc603adba7..66aa44ebd0 100644 --- a/tests/acceptance/10_files/templating/timed/expired_edit_line_locks.cf +++ b/tests/acceptance/10_files/templating/timed/expired_edit_line_locks.cf @@ -4,13 +4,13 @@ body common control { - inputs => { "../../../dcs.cf.sub", "../../../plucked.cf.sub" }; + inputs => { "../../../dcs.cf.sub", "../../../plucked.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; } bundle agent test { - + commands: # Note, no -K, we are testing locks. "$(sys.cf_agent) -v -D AUTO,DEBUG -f $(this.promise_filename).sub" diff --git a/tests/acceptance/10_files/templating/timed/expired_edit_line_locks.cf.sub b/tests/acceptance/10_files/templating/timed/expired_edit_line_locks.cf.sub index 030f8dc7af..05e8f2c353 100644 --- a/tests/acceptance/10_files/templating/timed/expired_edit_line_locks.cf.sub +++ b/tests/acceptance/10_files/templating/timed/expired_edit_line_locks.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../../dcs.cf.sub", "../../../plucked.cf.sub" }; + inputs => { "../../../dcs.cf.sub", "../../../plucked.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; } diff --git a/tests/acceptance/17_users/unsafe/disable_sudo_tty_requirement.cf.sub b/tests/acceptance/17_users/unsafe/disable_sudo_tty_requirement.cf.sub index 03898c1e62..a0aedcd479 100644 --- a/tests/acceptance/17_users/unsafe/disable_sudo_tty_requirement.cf.sub +++ b/tests/acceptance/17_users/unsafe/disable_sudo_tty_requirement.cf.sub @@ -2,7 +2,7 @@ body file control { - inputs => { "../../plucked.cf.sub" }; + inputs => { "../../plucked.sub.cf" }; } bundle agent disable_sudo_tty_requirement diff --git a/tests/acceptance/23_failsafe/preexisting_failsafe_preserved.cf b/tests/acceptance/23_failsafe/preexisting_failsafe_preserved.cf index 3c17546b02..da1041a598 100644 --- a/tests/acceptance/23_failsafe/preexisting_failsafe_preserved.cf +++ b/tests/acceptance/23_failsafe/preexisting_failsafe_preserved.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../default.cf.sub", "../plucked.cf.sub" }; + inputs => { "../default.cf.sub", "../plucked.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/29_simulate_mode/simulate_safe_functions.cf.sub b/tests/acceptance/29_simulate_mode/simulate_safe_functions.cf.sub index ee877de7c5..51f51d06e4 100644 --- a/tests/acceptance/29_simulate_mode/simulate_safe_functions.cf.sub +++ b/tests/acceptance/29_simulate_mode/simulate_safe_functions.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../plucked.cf.sub" }; + inputs => { "../plucked.sub.cf" }; } bundle agent test diff --git a/tests/acceptance/Makefile.am b/tests/acceptance/Makefile.am index 4e76f8df8e..10af0835e9 100644 --- a/tests/acceptance/Makefile.am +++ b/tests/acceptance/Makefile.am @@ -94,7 +94,7 @@ check-local: + $(TESTS_ENVIRONMENT) MAKE=$(MAKE) $(srcdir)/testall -EXTRA_DIST = default.cf.sub dcs.cf.sub plucked.cf.sub run_with_server.cf.sub \ +EXTRA_DIST = default.cf.sub dcs.cf.sub plucked.sub.cf run_with_server.cf.sub \ testall dummy_etc write_args.sh \ root-MD5=617eb383deffef843ea856b129d0a423.pub \ root-MD5=617eb383deffef843ea856b129d0a423.priv @@ -109,5 +109,5 @@ dist-hook: CLEANFILES = *.gcno *.gcda Makefile.testall pluck: - echo '### This is an auto-generated file, see Makefile.am and `make pluck` ###' > plucked.cf.sub - ../../contrib/cf-locate/cf-locate -f -p '( if_|run_|warn_only|INI_section|kept_successful_command|edit_line|set_user_field|set_variable_values\(|edit_field|set_line_based|location|replace_with|_cp|_dcp|empty|shell|immediate|perms| m\b|recurse|tidy| all|classes_generic|results| start|always|^value|edit_field line|insert_lines|(link|copy)from| file_mustache| (file|dir)_(copy|tidy|sync|make|empty|link|hardlink))' ../../../masterfiles/lib/*.cf >> plucked.cf.sub + echo '### This is an auto-generated file, see Makefile.am and `make pluck` ###' > plucked.sub.cf + ../../contrib/cf-locate/cf-locate -f -p '( if_|run_|warn_only|INI_section|kept_successful_command|edit_line|set_user_field|set_variable_values\(|edit_field|set_line_based|location|replace_with|_cp|_dcp|empty|shell|immediate|perms| m\b|recurse|tidy| all|classes_generic|results| start|always|^value|edit_field line|insert_lines|(link|copy)from| file_mustache| (file|dir)_(copy|tidy|sync|make|empty|link|hardlink))' ../../../masterfiles/lib/*.cf >> plucked.sub.cf diff --git a/tests/acceptance/default.cf.sub b/tests/acceptance/default.cf.sub index 1c81340350..c463046f9c 100644 --- a/tests/acceptance/default.cf.sub +++ b/tests/acceptance/default.cf.sub @@ -18,7 +18,7 @@ bundle common D "inputs" slist => { "$(D.owndir)$(const.dirsep)dcs.cf.sub", - "$(D.owndir)$(const.dirsep)plucked.cf.sub", + "$(D.owndir)$(const.dirsep)plucked.sub.cf", }; # If testing the masterfiles policy framework then load the stdlib by @@ -35,6 +35,6 @@ bundle common D body file control { - # plucked.cf.sub comes from the stdlib with `make pluck` + # plucked.sub.cf comes from the stdlib with `make pluck` inputs => { @(D.inputs) }; } diff --git a/tests/acceptance/plucked.cf.sub b/tests/acceptance/plucked.sub.cf similarity index 100% rename from tests/acceptance/plucked.cf.sub rename to tests/acceptance/plucked.sub.cf From 545a134e962573bda5598e30a87454022fc4ff4d Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Thu, 30 Apr 2026 22:22:33 +0200 Subject: [PATCH 07/22] Renamed default.cf.sub and dcs.cf.sub to .sub.cf Signed-off-by: Ole Herman Schumacher Elgesem (cherry picked from commit a5643afe73d2a4db805e5b5225014adb5b40af55) --- tests/acceptance/00_basics/01_compiler/001.cf | 3 +-- tests/acceptance/00_basics/01_compiler/002.x.cf | 2 +- tests/acceptance/00_basics/01_compiler/003.x.cf | 2 +- tests/acceptance/00_basics/01_compiler/004.x.cf | 3 +-- tests/acceptance/00_basics/01_compiler/007.cf | 2 +- tests/acceptance/00_basics/01_compiler/008.x.cf | 3 +-- tests/acceptance/00_basics/01_compiler/013.cf | 2 +- tests/acceptance/00_basics/01_compiler/014.x.cf | 3 +-- tests/acceptance/00_basics/01_compiler/019.cf | 2 +- tests/acceptance/00_basics/01_compiler/020.x.cf | 3 +-- tests/acceptance/00_basics/01_compiler/025.cf | 2 +- tests/acceptance/00_basics/01_compiler/026.x.cf | 3 +-- tests/acceptance/00_basics/01_compiler/031.cf | 2 +- tests/acceptance/00_basics/01_compiler/032.x.cf | 3 +-- tests/acceptance/00_basics/01_compiler/033.x.cf | 3 +-- tests/acceptance/00_basics/01_compiler/034.x.cf | 3 +-- tests/acceptance/00_basics/01_compiler/037.cf | 2 +- tests/acceptance/00_basics/01_compiler/038.x.cf | 3 +-- tests/acceptance/00_basics/01_compiler/040.x.cf | 2 +- tests/acceptance/00_basics/01_compiler/041.x.cf | 2 +- tests/acceptance/00_basics/01_compiler/042.x.cf | 2 +- tests/acceptance/00_basics/01_compiler/044.x.cf | 2 +- tests/acceptance/00_basics/01_compiler/045.x.cf | 2 +- tests/acceptance/00_basics/01_compiler/100.cf | 3 +-- tests/acceptance/00_basics/01_compiler/101.cf | 2 +- tests/acceptance/00_basics/01_compiler/102.x.cf | 2 +- tests/acceptance/00_basics/01_compiler/105.cf | 2 +- tests/acceptance/00_basics/01_compiler/200.x.cf | 4 +--- tests/acceptance/00_basics/01_compiler/704.x.cf | 2 +- tests/acceptance/00_basics/01_compiler/710.x.cf | 2 +- tests/acceptance/00_basics/01_compiler/800.cf | 2 +- .../00_basics/01_compiler/cf-promises-99999999999.cf | 2 +- .../01_compiler/cf-promises-common-bundles-only.cf | 2 +- .../01_compiler/cf-promises-json-long-strings.cf | 2 +- .../01_compiler/cf-promises-without-ppkeys.cf | 2 +- .../01_compiler/classes_without_constraints.cf | 2 +- tests/acceptance/00_basics/01_compiler/depends_on.cf | 2 +- .../00_basics/01_compiler/depends_on_canonify.cf | 2 +- .../01_compiler/no_error_when_key_contains_space.cf | 3 +-- .../00_basics/01_compiler/staging/005.x.cf | 2 +- .../00_basics/01_compiler/staging/006.x.cf | 2 +- .../00_basics/01_compiler/staging/009.x.cf | 2 +- .../00_basics/01_compiler/staging/010.x.cf | 2 +- .../00_basics/01_compiler/staging/011.x.cf | 2 +- .../00_basics/01_compiler/staging/012.x.cf | 2 +- .../00_basics/01_compiler/staging/015.x.cf | 2 +- .../00_basics/01_compiler/staging/016.x.cf | 2 +- .../00_basics/01_compiler/staging/017.x.cf | 2 +- .../00_basics/01_compiler/staging/018.x.cf | 2 +- .../00_basics/01_compiler/staging/021.x.cf | 2 +- .../00_basics/01_compiler/staging/022.x.cf | 2 +- .../00_basics/01_compiler/staging/023.x.cf | 2 +- .../00_basics/01_compiler/staging/024.x.cf | 2 +- .../00_basics/01_compiler/staging/027.x.cf | 2 +- .../00_basics/01_compiler/staging/028.x.cf | 2 +- .../00_basics/01_compiler/staging/029.x.cf | 2 +- .../00_basics/01_compiler/staging/030.x.cf | 2 +- .../00_basics/01_compiler/staging/035.x.cf | 2 +- .../00_basics/01_compiler/staging/036.x.cf | 2 +- .../00_basics/01_compiler/staging/039.x.cf | 2 +- .../acceptance/00_basics/01_compiler/staging/043.cf | 2 +- .../00_basics/01_compiler/staging/046.x.cf | 2 +- .../00_basics/01_compiler/staging/047.x.cf | 2 +- .../00_basics/01_compiler/staging/048.x.cf | 2 +- .../00_basics/01_compiler/staging/701.x.cf | 2 +- .../00_basics/01_compiler/staging/702.x.cf | 2 +- .../00_basics/01_compiler/staging/703.x.cf | 2 +- .../00_basics/01_compiler/string_contexts.cf | 2 +- .../00_basics/01_compiler/string_contexts.x.cf | 2 +- .../00_basics/01_compiler/string_contexts_rval.cf | 2 +- .../00_basics/01_compiler/with_iteration.cf | 2 +- tests/acceptance/00_basics/02_switches/001.cf | 3 +-- tests/acceptance/00_basics/02_switches/001.cf.sub | 3 +-- tests/acceptance/00_basics/02_switches/002.cf | 3 +-- tests/acceptance/00_basics/02_switches/002.cf.sub | 3 +-- tests/acceptance/00_basics/02_switches/003.cf | 3 +-- tests/acceptance/00_basics/02_switches/003.cf.sub | 3 +-- tests/acceptance/00_basics/02_switches/004.cf | 3 +-- tests/acceptance/00_basics/02_switches/004.cf.sub | 3 +-- tests/acceptance/00_basics/02_switches/005.cf | 3 +-- tests/acceptance/00_basics/02_switches/005.cf.sub | 3 +-- tests/acceptance/00_basics/02_switches/006.cf | 3 +-- tests/acceptance/00_basics/02_switches/006.cf.sub | 2 +- tests/acceptance/00_basics/02_switches/008.cf | 3 +-- tests/acceptance/00_basics/02_switches/008.cf.sub | 2 +- tests/acceptance/00_basics/02_switches/010.cf | 3 +-- tests/acceptance/00_basics/02_switches/010.cf.sub1 | 3 +-- tests/acceptance/00_basics/02_switches/010.cf.sub2 | 3 +-- .../02_switches/dry_run_perms_doesnt_lie.cf | 2 +- .../02_switches/dry_run_perms_doesnt_lie.cf.sub | 2 +- .../00_basics/02_switches/show-evaluated-vars.cf | 3 +-- .../acceptance/00_basics/02_switches/staging/007.cf | 3 +-- .../00_basics/02_switches/staging/007.cf.sub | 2 +- .../acceptance/00_basics/02_switches/staging/009.cf | 3 +-- .../00_basics/02_switches/staging/009.cf.sub | 2 +- .../02_switches/staging/negate_hard_class.cf | 2 +- tests/acceptance/00_basics/03_bodies/001.cf | 2 +- tests/acceptance/00_basics/03_bodies/002.cf | 2 +- tests/acceptance/00_basics/03_bodies/003.cf | 2 +- tests/acceptance/00_basics/03_bodies/101.cf | 3 +-- tests/acceptance/00_basics/03_bodies/102.cf | 3 +-- tests/acceptance/00_basics/03_bodies/103.cf | 3 +-- tests/acceptance/00_basics/03_bodies/104.cf | 3 +-- tests/acceptance/00_basics/03_bodies/109.cf | 3 +-- tests/acceptance/00_basics/03_bodies/112.cf | 3 +-- tests/acceptance/00_basics/03_bodies/113.cf | 3 +-- tests/acceptance/00_basics/03_bodies/114.cf | 3 +-- tests/acceptance/00_basics/03_bodies/115.cf | 3 +-- tests/acceptance/00_basics/03_bodies/116.cf | 3 +-- tests/acceptance/00_basics/03_bodies/117.cf | 3 +-- tests/acceptance/00_basics/03_bodies/118.cf | 3 +-- tests/acceptance/00_basics/03_bodies/119.cf | 3 +-- tests/acceptance/00_basics/03_bodies/120.cf | 3 +-- tests/acceptance/00_basics/03_bodies/121.cf | 3 +-- tests/acceptance/00_basics/03_bodies/122.x.cf | 3 +-- tests/acceptance/00_basics/03_bodies/123.cf | 2 +- tests/acceptance/00_basics/03_bodies/124.cf | 2 +- tests/acceptance/00_basics/03_bodies/125.cf | 2 +- tests/acceptance/00_basics/03_bodies/401.x.cf | 2 +- .../CFE-1780/body-common-control-inputs/test.cf | 2 +- .../CFE-1780/body-file-control-inputs/test.cf | 2 +- .../00_basics/03_bodies/control-body-fncall.cf | 2 +- .../00_basics/03_bodies/default_files_action.cf | 2 +- .../00_basics/03_bodies/dynamic_inputs_findfiles.cf | 2 +- .../00_basics/03_bodies/dynamic_inputs_maplist.cf | 2 +- .../evaluation-should-respect-ifvarclass.cf | 2 +- tests/acceptance/00_basics/03_bodies/if-unless.cf | 2 +- .../00_basics/03_bodies/ifvarclass-with-function.cf | 3 +-- tests/acceptance/00_basics/03_bodies/inherit_from.cf | 2 +- .../03_bodies/inherit_from_mismatched_args.x.cf | 2 +- .../00_basics/03_bodies/inherit_from_noargs.x.cf | 2 +- .../00_basics/03_bodies/inherit_from_parameters.cf | 2 +- .../00_basics/03_bodies/inherit_from_self.x.cf | 2 +- .../03_bodies/inherit_from_with_global_var.cf | 2 +- .../00_basics/03_bodies/log_file_permissions.cf | 2 +- .../03_bodies/multilevel_inherit_from_parameters.cf | 2 +- .../03_bodies/report_error_when_body_missing.cf | 2 +- tests/acceptance/00_basics/03_bodies/staging/201.cf | 3 +-- tests/acceptance/00_basics/03_bodies/staging/203.cf | 3 +-- tests/acceptance/00_basics/03_bodies/staging/204.cf | 3 +-- tests/acceptance/00_basics/03_bodies/staging/209.cf | 3 +-- tests/acceptance/00_basics/03_bodies/staging/212.cf | 3 +-- tests/acceptance/00_basics/03_bodies/staging/213.cf | 3 +-- tests/acceptance/00_basics/03_bodies/staging/214.cf | 3 +-- tests/acceptance/00_basics/03_bodies/staging/215.cf | 3 +-- tests/acceptance/00_basics/03_bodies/staging/216.cf | 3 +-- tests/acceptance/00_basics/03_bodies/staging/217.cf | 3 +-- tests/acceptance/00_basics/03_bodies/staging/218.cf | 2 +- tests/acceptance/00_basics/03_bodies/staging/219.cf | 2 +- tests/acceptance/00_basics/03_bodies/staging/221.cf | 2 +- .../acceptance/00_basics/03_bodies/staging/223.x.cf | 3 +-- .../acceptance/00_basics/03_bodies/staging/224.x.cf | 3 +-- tests/acceptance/00_basics/03_bodies/staging/225.cf | 3 +-- ...-bundle-class-bundle-scope-default-perspective.cf | 2 +- ...undle-class-bundle-scope-namespace-perspective.cf | 2 +- ...nt-bundle-namespaced-class-default-perspective.cf | 2 +- ...-bundle-namespaced-class-namespace-perspective.cf | 2 +- .../00_basics/04_bundles/bundle-iteration.cf | 2 +- ...le_from_namespace_without_specifying_namespace.cf | 2 +- .../04_bundles/duplicate_promise_handles.cf | 2 +- .../dynamic_bundlesequence/app_based_inputs.cf | 2 +- .../classification_bundles_not_in_sequence.cf | 2 +- .../classification_bundles_not_in_sequence2.cf | 2 +- .../classification_bundles_not_in_sequence3.cf | 2 +- ...set_using_variable_file_control_extends_inputs.cf | 2 +- .../04_bundles/dynamic_bundlesequence/simple.cf | 2 +- .../bundlesequence_iterate_over_data_container.cf | 2 +- .../04_bundles/getindices-vars-need-secondpass.cf | 2 +- tests/acceptance/00_basics/04_bundles/namespaced.cf | 2 +- .../acceptance/00_basics/04_bundles/namespaced.x.cf | 2 +- .../00_basics/04_bundles/non_default_def.cf | 2 +- .../acceptance/00_basics/04_bundles/passing-vars.cf | 2 +- tests/acceptance/00_basics/04_bundles/unless.cf | 2 +- .../00_basics/04_bundles/unless_vars_order.cf | 2 +- .../unsupported_promise_types_in_common.x.cf | 3 +-- .../00_basics/04_bundles/wrong-bundle-type.cf | 3 +-- tests/acceptance/00_basics/05_licenses/001.cf | 3 +-- tests/acceptance/00_basics/05_licenses/001.cf.sub | 3 +-- .../00_basics/06_host_specific_data/01-vars.cf | 2 +- .../00_basics/06_host_specific_data/02-variables.cf | 2 +- .../06_host_specific_data/03-variables-value.cf | 2 +- .../00_basics/06_host_specific_data/04-classes.cf | 2 +- .../05-variables-tag-comment.cf | 2 +- .../06_host_specific_data/06-classes-tag-comment.cf | 2 +- .../06_host_specific_data/07-invalid-data.cf | 2 +- .../06_host_specific_data/08-class-expression.cf | 2 +- .../06_host_specific_data/09-class-reg-expression.cf | 2 +- .../06_host_specific_data/10-variable-references.cf | 2 +- .../06_host_specific_data/11-augments-no-override.cf | 2 +- tests/acceptance/00_basics/CFE-1886.cf | 2 +- tests/acceptance/00_basics/def.json/augments.cf | 2 +- .../def.json/augments_classes/augments_classes.cf | 2 +- .../acceptance/00_basics/def.json/augments_order.cf | 2 +- tests/acceptance/00_basics/def.json/bad-json.cf | 2 +- .../00_basics/def.json/class_from_classexpression.cf | 2 +- tests/acceptance/00_basics/def.json/classes.cf | 2 +- .../acceptance/00_basics/def.json/classes_with_ns.cf | 2 +- .../00_basics/def.json/classes_with_ns_tags.cf | 2 +- .../both-can-define-vars.cf | 2 +- .../variables-wins.cf | 2 +- .../variables-wins.cf | 2 +- .../def.json/def_preferred.json/def_preferred.cf | 4 ++-- tests/acceptance/00_basics/def.json/inputs.cf | 2 +- .../00_basics/def.json/json-inputs-not-array.cf | 2 +- .../def.json/json-inputs-not-auto-applied.cf | 2 +- .../00_basics/def.json/policy_server_classes.cf | 2 +- .../acceptance/00_basics/def.json/show_vars_JSON.cf | 2 +- tests/acceptance/00_basics/def.json/state.cf | 2 +- tests/acceptance/00_basics/def.json/variables.cf | 2 +- .../00_basics/def.json/variables_bare_array.cf | 2 +- .../00_basics/def.json/variables_bare_string.cf | 2 +- .../00_basics/def.json/variables_with_bundle.cf | 2 +- .../00_basics/def.json/variables_with_ns.cf | 2 +- tests/acceptance/00_basics/def.json/vars.cf | 2 +- .../00_basics/def.json/vars_with_bundle.cf | 2 +- tests/acceptance/00_basics/def.json/vars_with_ns.cf | 2 +- tests/acceptance/00_basics/environment/hpux.cf | 2 +- .../00_basics/environment/proc-net-functions.cf | 2 +- .../00_basics/environment/proc-net-functions.cf.sub | 2 +- tests/acceptance/00_basics/environment/proc-net.cf | 2 +- .../acceptance/00_basics/environment/proc-net.cf.sub | 2 +- .../workdir_correct_after_files_promise.cf | 2 +- .../workdir_correct_after_files_promise.cf.sub | 2 +- .../ifelapsed_and_expireafter/expireafter.cf | 2 +- .../ifelapsed_and_expireafter/expireafter.cf.sub | 2 +- .../00_basics/ifelapsed_and_expireafter/locks.cf | 2 +- .../ifelapsed_and_expireafter/redmine_6334.cf | 2 +- .../ifelapsed_and_expireafter/timed/defaults.cf | 2 +- .../ifelapsed_and_expireafter/timed/defaults.cf.sub | 2 +- .../ifelapsed_and_expireafter/timed/package_lock.cf | 2 +- .../timed/package_lock.cf.sub | 2 +- tests/acceptance/00_basics/macros/if.cf | 2 +- .../00_basics/macros/if_eof_without_endif.x.cf | 2 +- .../00_basics/macros/if_eof_without_endif2.x.cf | 2 +- tests/acceptance/00_basics/macros/if_feature.cf | 2 +- .../00_basics/macros/if_feature_nested.x.cf | 2 +- tests/acceptance/00_basics/macros/if_feature_pam.cf | 2 +- tests/acceptance/00_basics/macros/if_ignore.cf | 2 +- .../00_basics/macros/if_ignore_with_addsign.cf | 2 +- tests/acceptance/00_basics/macros/if_mismatched.x.cf | 2 +- .../00_basics/macros/if_multiple_endif.x.cf | 2 +- tests/acceptance/00_basics/macros/if_nested.x.cf | 2 +- .../acceptance/00_basics/macros/if_on_first_line.cf | 2 +- tests/acceptance/00_basics/macros/if_triple.cf | 2 +- .../namespaces_can_not_contain_funny_characters.cf | 2 +- ...amespaces_can_not_contain_funny_characters.cf.sub | 4 +--- .../validation/validation_tagging_directory.cf | 2 +- tests/acceptance/01_vars/01_basic/001.cf | 3 +-- tests/acceptance/01_vars/01_basic/002.x.cf | 3 +-- tests/acceptance/01_vars/01_basic/004.x.cf | 3 +-- tests/acceptance/01_vars/01_basic/005.x.cf | 3 +-- tests/acceptance/01_vars/01_basic/006.x.cf | 3 +-- tests/acceptance/01_vars/01_basic/007.x.cf | 3 +-- tests/acceptance/01_vars/01_basic/008.x.cf | 3 +-- tests/acceptance/01_vars/01_basic/009.cf | 3 +-- tests/acceptance/01_vars/01_basic/010.cf | 3 +-- tests/acceptance/01_vars/01_basic/012.cf | 3 +-- tests/acceptance/01_vars/01_basic/013.cf | 3 +-- tests/acceptance/01_vars/01_basic/105.cf | 3 +-- tests/acceptance/01_vars/01_basic/106.cf | 3 +-- tests/acceptance/01_vars/01_basic/107.cf | 2 +- tests/acceptance/01_vars/01_basic/108.cf | 2 +- tests/acceptance/01_vars/01_basic/109.cf | 2 +- tests/acceptance/01_vars/01_basic/110.cf | 2 +- tests/acceptance/01_vars/01_basic/111.cf | 2 +- tests/acceptance/01_vars/01_basic/CFE-2191.cf | 2 +- tests/acceptance/01_vars/01_basic/CFE-628.cf | 2 +- .../access_classic_array_key_value_using_with.cf | 2 +- tests/acceptance/01_vars/01_basic/calling_bundle.cf | 2 +- .../can_not_define_variables_in_remote_bundles.cf | 2 +- tests/acceptance/01_vars/01_basic/cpusockets.cf | 2 +- .../acceptance/01_vars/01_basic/duplicate_bundles.cf | 2 +- .../01_basic/empty-splice-does-not-segfault.cf | 2 +- .../01_vars/01_basic/long_string_from_embedded.cf | 2 +- .../01_basic/multi_index_arrays_variable_lookup.cf | 3 +-- .../namespaces/bundle_qualified_refs/1/main.cf | 2 +- .../namespaces/bundle_qualified_refs/2/main.cf | 2 +- .../namespaces/bundle_qualified_refs/3/main.cf | 2 +- .../01_basic/namespaces/namespaced-bundles.cf | 2 +- .../nested-expansion-including-namespace.cf | 2 +- .../nested_expansion_namespaced_variables.cf | 2 +- .../01_vars/01_basic/nested_parens_var_ref.cf | 2 +- .../acceptance/01_vars/01_basic/parse_long_slists.cf | 2 +- tests/acceptance/01_vars/01_basic/parse_number.cf | 5 +++-- .../acceptance/01_vars/01_basic/parse_number_3572.cf | 2 +- .../acceptance/01_vars/01_basic/policy_release_id.cf | 2 +- tests/acceptance/01_vars/01_basic/promise_dirname.cf | 2 +- .../01_basic/qualified_array_with_spaced_index.cf | 2 +- tests/acceptance/01_vars/01_basic/staging/002.x.cf | 3 +-- tests/acceptance/01_vars/01_basic/staging/003.x.cf | 3 +-- tests/acceptance/01_vars/01_basic/staging/011.cf | 2 +- tests/acceptance/01_vars/01_basic/staging/025.cf | 2 +- tests/acceptance/01_vars/01_basic/staging/026.cf | 2 +- tests/acceptance/01_vars/01_basic/staging/107.cf | 3 +-- .../staging/this_promises_in_command_args.cf | 2 +- .../01_vars/01_basic/sys_flavor_on_aix_no_dots.cf | 2 +- tests/acceptance/01_vars/01_basic/sysvars.cf | 2 +- .../01_vars/01_basic/this_promiser_ifvarclass.cf | 2 +- .../01_vars/01_basic/this_promiser_with_readjson.cf | 2 +- tests/acceptance/01_vars/01_basic/this_variables.cf | 2 +- tests/acceptance/01_vars/01_basic/time_based_vars.cf | 2 +- .../01_vars/01_basic/unresolved_variables.cf | 2 +- .../01_vars/01_basic/uptime_systime_and_sysday.cf | 2 +- .../01_vars/01_basic/var_expansion_in_meta.cf | 2 +- .../01_basic/var_meta_tags_overridden_correctly.cf | 2 +- .../01_basic/vars_comments_emitted_in_show_vars.cf | 2 +- .../01_basic/vars_comments_emitted_in_verbose.cf | 2 +- tests/acceptance/01_vars/01_basic/vars_in_arrays.cf | 3 +-- tests/acceptance/01_vars/02_functions/001.cf | 3 +-- tests/acceptance/01_vars/02_functions/002.cf | 3 +-- tests/acceptance/01_vars/02_functions/003.cf | 3 +-- tests/acceptance/01_vars/02_functions/004.cf | 3 +-- tests/acceptance/01_vars/02_functions/005.cf | 3 +-- tests/acceptance/01_vars/02_functions/006.cf | 3 +-- tests/acceptance/01_vars/02_functions/007.cf | 3 +-- tests/acceptance/01_vars/02_functions/008.cf | 2 +- tests/acceptance/01_vars/02_functions/010.cf | 3 +-- tests/acceptance/01_vars/02_functions/011.cf | 3 +-- tests/acceptance/01_vars/02_functions/012.cf | 3 +-- tests/acceptance/01_vars/02_functions/013.cf | 3 +-- tests/acceptance/01_vars/02_functions/014.cf | 3 +-- tests/acceptance/01_vars/02_functions/015.cf | 3 +-- tests/acceptance/01_vars/02_functions/016.cf | 3 +-- tests/acceptance/01_vars/02_functions/017.cf | 3 +-- tests/acceptance/01_vars/02_functions/018.cf | 3 +-- tests/acceptance/01_vars/02_functions/019.cf | 3 +-- tests/acceptance/01_vars/02_functions/020.cf | 3 +-- tests/acceptance/01_vars/02_functions/021.cf | 3 +-- tests/acceptance/01_vars/02_functions/024.cf | 2 +- tests/acceptance/01_vars/02_functions/025.cf | 2 +- tests/acceptance/01_vars/02_functions/026.cf | 2 +- tests/acceptance/01_vars/02_functions/027.cf | 2 +- tests/acceptance/01_vars/02_functions/028.cf | 2 +- tests/acceptance/01_vars/02_functions/029.cf | 2 +- tests/acceptance/01_vars/02_functions/030.cf | 2 +- tests/acceptance/01_vars/02_functions/031.cf | 2 +- tests/acceptance/01_vars/02_functions/032.cf | 2 +- tests/acceptance/01_vars/02_functions/033.cf | 2 +- tests/acceptance/01_vars/02_functions/034.cf | 2 +- tests/acceptance/01_vars/02_functions/037.cf | 2 +- tests/acceptance/01_vars/02_functions/038.cf | 2 +- tests/acceptance/01_vars/02_functions/039.cf | 2 +- tests/acceptance/01_vars/02_functions/040.cf | 2 +- tests/acceptance/01_vars/02_functions/041.cf | 2 +- tests/acceptance/01_vars/02_functions/042.cf | 2 +- tests/acceptance/01_vars/02_functions/043.cf | 2 +- tests/acceptance/01_vars/02_functions/044.cf | 2 +- tests/acceptance/01_vars/02_functions/045.cf | 2 +- tests/acceptance/01_vars/02_functions/046.cf | 2 +- tests/acceptance/01_vars/02_functions/047.cf | 2 +- tests/acceptance/01_vars/02_functions/050.cf | 2 +- tests/acceptance/01_vars/02_functions/051.cf | 3 +-- tests/acceptance/01_vars/02_functions/052.cf | 3 +-- tests/acceptance/01_vars/02_functions/053.cf | 3 +-- tests/acceptance/01_vars/02_functions/054.cf | 3 +-- tests/acceptance/01_vars/02_functions/055.cf | 3 +-- tests/acceptance/01_vars/02_functions/056.x.cf | 3 +-- tests/acceptance/01_vars/02_functions/059.x.cf | 3 +-- tests/acceptance/01_vars/02_functions/060.x.cf | 3 +-- tests/acceptance/01_vars/02_functions/061.x.cf | 3 +-- tests/acceptance/01_vars/02_functions/062.x.cf | 3 +-- tests/acceptance/01_vars/02_functions/063.x.cf | 3 +-- tests/acceptance/01_vars/02_functions/064.x.cf | 3 +-- tests/acceptance/01_vars/02_functions/065.cf | 3 +-- tests/acceptance/01_vars/02_functions/066.cf | 2 +- tests/acceptance/01_vars/02_functions/067.cf | 2 +- tests/acceptance/01_vars/02_functions/068.cf | 2 +- tests/acceptance/01_vars/02_functions/069.cf | 2 +- tests/acceptance/01_vars/02_functions/071.cf | 2 +- tests/acceptance/01_vars/02_functions/080.cf | 2 +- tests/acceptance/01_vars/02_functions/201.cf | 3 +-- tests/acceptance/01_vars/02_functions/202.cf | 3 +-- tests/acceptance/01_vars/02_functions/203.cf | 3 +-- tests/acceptance/01_vars/02_functions/204.cf | 3 +-- tests/acceptance/01_vars/02_functions/205.cf | 2 +- tests/acceptance/01_vars/02_functions/211.cf | 3 +-- tests/acceptance/01_vars/02_functions/212.cf | 3 +-- tests/acceptance/01_vars/02_functions/221.cf | 2 +- tests/acceptance/01_vars/02_functions/222.cf | 2 +- tests/acceptance/01_vars/02_functions/223.cf | 2 +- tests/acceptance/01_vars/02_functions/224.cf | 2 +- tests/acceptance/01_vars/02_functions/225.cf | 2 +- tests/acceptance/01_vars/02_functions/226.cf | 2 +- tests/acceptance/01_vars/02_functions/227.cf | 2 +- tests/acceptance/01_vars/02_functions/300.cf | 3 +-- tests/acceptance/01_vars/02_functions/310.cf | 2 +- tests/acceptance/01_vars/02_functions/311.cf | 2 +- tests/acceptance/01_vars/02_functions/312.cf | 2 +- tests/acceptance/01_vars/02_functions/313.cf | 2 +- tests/acceptance/01_vars/02_functions/400.cf | 2 +- tests/acceptance/01_vars/02_functions/401.cf | 2 +- tests/acceptance/01_vars/02_functions/410.cf | 2 +- tests/acceptance/01_vars/02_functions/420.cf | 2 +- tests/acceptance/01_vars/02_functions/421.cf | 2 +- tests/acceptance/01_vars/02_functions/440.cf | 2 +- tests/acceptance/01_vars/02_functions/441.cf | 2 +- tests/acceptance/01_vars/02_functions/442.cf | 2 +- tests/acceptance/01_vars/02_functions/443.cf | 2 +- tests/acceptance/01_vars/02_functions/444.cf | 2 +- tests/acceptance/01_vars/02_functions/445.cf | 2 +- tests/acceptance/01_vars/02_functions/447.cf | 2 +- tests/acceptance/01_vars/02_functions/450.cf | 2 +- tests/acceptance/01_vars/02_functions/500.cf | 2 +- tests/acceptance/01_vars/02_functions/501.cf | 2 +- tests/acceptance/01_vars/02_functions/520.cf | 2 +- tests/acceptance/01_vars/02_functions/521.cf | 2 +- tests/acceptance/01_vars/02_functions/600.cf | 2 +- tests/acceptance/01_vars/02_functions/601.cf | 2 +- tests/acceptance/01_vars/02_functions/620.cf | 2 +- tests/acceptance/01_vars/02_functions/621.cf | 2 +- tests/acceptance/01_vars/02_functions/700.cf | 2 +- tests/acceptance/01_vars/02_functions/701.cf | 2 +- tests/acceptance/01_vars/02_functions/702.cf | 2 +- tests/acceptance/01_vars/02_functions/CFE-2704-0.cf | 2 +- tests/acceptance/01_vars/02_functions/CFE-2704-1.cf | 2 +- tests/acceptance/01_vars/02_functions/CFE-954.cf | 2 +- tests/acceptance/01_vars/02_functions/and.cf | 2 +- .../01_vars/02_functions/array_subkey_collision.cf | 2 +- tests/acceptance/01_vars/02_functions/basename_1.cf | 2 +- tests/acceptance/01_vars/02_functions/basename_2.cf | 2 +- .../01_vars/02_functions/bundlesmatching.cf | 2 +- .../02_functions/bundlesmatching_dynamicsequence.cf | 2 +- tests/acceptance/01_vars/02_functions/bundlestate.cf | 2 +- tests/acceptance/01_vars/02_functions/cache_name.cf | 2 +- .../01_vars/02_functions/canonifyuniquely.cf | 3 +-- tests/acceptance/01_vars/02_functions/cf_version.cf | 2 +- .../01_vars/02_functions/classesmatching.cf | 2 +- .../01_vars/02_functions/classfiltercsv_1.cf | 2 +- .../01_vars/02_functions/classfiltercsv_2.cf | 2 +- .../01_vars/02_functions/classfiltercsv_3.cf | 2 +- .../01_vars/02_functions/classfiltercsv_4.cf | 2 +- .../01_vars/02_functions/classfiltercsv_5.cf | 2 +- .../02_functions/classfilterdata_collecting.cf | 2 +- tests/acceptance/01_vars/02_functions/classmatch.cf | 2 +- .../01_vars/02_functions/countlinesmatching.cf | 2 +- .../countlinesmatching_errors_on_absent_file.cf | 2 +- ...ntlinesmatching_returns_0_on_inaccessable_file.cf | 3 +-- tests/acceptance/01_vars/02_functions/data_expand.cf | 2 +- .../01_vars/02_functions/data_readstringarray.cf | 2 +- .../01_vars/02_functions/data_readstringarrayidx.cf | 2 +- .../01_vars/02_functions/data_regextract-2.cf | 2 +- .../01_vars/02_functions/data_regextract.cf | 2 +- tests/acceptance/01_vars/02_functions/datastate.cf | 2 +- tests/acceptance/01_vars/02_functions/dirname.cf | 4 +--- tests/acceptance/01_vars/02_functions/eval.cf | 2 +- tests/acceptance/01_vars/02_functions/eval_class.cf | 2 +- .../01_vars/02_functions/every_some_none.cf | 2 +- tests/acceptance/01_vars/02_functions/execresult.cf | 2 +- .../acceptance/01_vars/02_functions/execresult_4k.cf | 2 +- .../02_functions/execresult_action_immediate.cf | 2 +- .../01_vars/02_functions/execresult_multiples.cf | 2 +- .../01_vars/02_functions/execresult_select.cf | 2 +- .../01_vars/02_functions/execresult_stderr.cf | 2 +- ...ist-can-detect-files-containing-hash-character.cf | 2 +- .../01_vars/02_functions/filesexist-is-collecting.cf | 2 +- tests/acceptance/01_vars/02_functions/filestat.cf | 2 +- .../01_vars/02_functions/filestat_linktarget.cf | 2 +- .../filestat_linktarget_relative_symlink.cf | 2 +- .../01_vars/02_functions/filestat_xattr.cf | 2 +- tests/acceptance/01_vars/02_functions/filter.cf | 2 +- .../01_vars/02_functions/findfiles-GLOB_BRACE.cf | 2 +- tests/acceptance/01_vars/02_functions/findfiles.cf | 2 +- .../01_vars/02_functions/findfiles_glob_bracket.cf | 2 +- .../01_vars/02_functions/findlocalgroups.cf | 2 +- .../01_vars/02_functions/findlocalusers.cf | 2 +- tests/acceptance/01_vars/02_functions/fold.cf | 2 +- tests/acceptance/01_vars/02_functions/format.cf | 2 +- .../01_vars/02_functions/format_edge_case.cf | 2 +- .../02_functions/function_with_skipped_promise.cf | 2 +- tests/acceptance/01_vars/02_functions/getfields.cf | 2 +- .../acceptance/01_vars/02_functions/getgroupinfo.cf | 2 +- tests/acceptance/01_vars/02_functions/getgroups.cf | 2 +- tests/acceptance/01_vars/02_functions/getindices.cf | 2 +- ...ns_empty_list_if_array_index_has_no_key_values.cf | 2 +- ..._list_if_datacontainer_index_has_no_key_values.cf | 2 +- .../getindices_returns_expected_list_from_array.cf | 2 +- ...dices_returns_expected_list_from_datacontainer.cf | 2 +- .../02_functions/getindices_size2_with_expansion.cf | 2 +- .../getindices_with_multi_index_arrays.cf | 2 +- tests/acceptance/01_vars/02_functions/gettags.cf | 3 +-- tests/acceptance/01_vars/02_functions/getuserinfo.cf | 2 +- tests/acceptance/01_vars/02_functions/getvalues.cf | 2 +- .../getvalues_array_returns_first_index_values.cf | 2 +- .../01_vars/02_functions/getvalues_array_slist.cf | 2 +- .../01_vars/02_functions/getvalues_array_string.cf | 2 +- .../01_vars/02_functions/getvalues_containers.cf | 2 +- .../02_functions/getvalues_flattens-list-elements.cf | 2 +- .../01_vars/02_functions/getvalues_plain_slist.cf | 2 +- .../01_vars/02_functions/getvalues_plain_string.cf | 2 +- ...l_values_for_given_array_index_merging_strings.cf | 2 +- ..._for_given_datacontainer_index_merging_strings.cf | 2 +- .../getvalues_returns_slist_for_array_scalar.cf | 2 +- ...tvalues_returns_slist_for_datacontainer_scalar.cf | 2 +- tests/acceptance/01_vars/02_functions/hash.cf | 2 +- tests/acceptance/01_vars/02_functions/hash_to_int.cf | 2 +- tests/acceptance/01_vars/02_functions/ifelse.cf | 2 +- .../02_functions/ifelse_isvariable-ENT-4653.cf | 2 +- .../01_vars/02_functions/ifelse_isvariable.cf | 2 +- .../01_vars/02_functions/ifelse_undefined.cf | 2 +- tests/acceptance/01_vars/02_functions/inline_json.cf | 2 +- tests/acceptance/01_vars/02_functions/int.cf | 2 +- .../acceptance/01_vars/02_functions/isconnectable.cf | 2 +- tests/acceptance/01_vars/02_functions/isreadable.cf | 2 +- .../iterating_variablesmatching_results.cf | 2 +- tests/acceptance/01_vars/02_functions/join.cf | 2 +- .../01_vars/02_functions/join_mapped_list.cf | 2 +- tests/acceptance/01_vars/02_functions/length.cf | 2 +- .../01_vars/02_functions/long_string_from_module.cf | 2 +- .../02_functions/long_string_from_text_file.cf | 2 +- tests/acceptance/01_vars/02_functions/lsdir.cf | 2 +- tests/acceptance/01_vars/02_functions/maparray.cf | 2 +- .../01_vars/02_functions/maparray_mixed.cf | 2 +- .../01_vars/02_functions/maparray_multi_index.cf | 2 +- tests/acceptance/01_vars/02_functions/mapdata.cf | 2 +- .../01_vars/02_functions/mapdata_json_pipe.cf | 2 +- tests/acceptance/01_vars/02_functions/maplist.cf | 2 +- .../01_vars/02_functions/mergedata-CFE-2551-0.cf | 2 +- .../01_vars/02_functions/mergedata-CFE-2551-1.cf | 2 +- .../01_vars/02_functions/mergedata-CFE-2551-2.cf | 2 +- .../01_vars/02_functions/mergedata-json-strings.cf | 3 +-- tests/acceptance/01_vars/02_functions/mergedata.cf | 2 +- .../01_vars/02_functions/mergedata_CFE-2551-0.cf | 2 +- .../01_vars/02_functions/mergedata_CFE-2551-1.cf | 2 +- .../01_vars/02_functions/mergedata_CFE-2551-2.cf | 2 +- .../02_functions/mergedata_multilevel_array.cf | 2 +- .../02_functions/mergedata_with_list_iteration.cf | 2 +- .../01_vars/02_functions/missing_functions.cf | 2 +- .../02_functions/mustach_doesnt_render_null.cf | 2 +- ...ect_should_use_context_for_single_block_render.cf | 2 +- .../mustache_iterating_object_workaround.cf | 2 +- .../mustache_iteration_with_nonfalse_values.cf | 2 +- .../mustache_section_nonfalse_inverted.cf | 2 +- .../01_vars/02_functions/namespaces/001.cf | 2 +- .../01_vars/02_functions/namespaces/002.cf | 2 +- .../01_vars/02_functions/namespaces/003.cf | 2 +- .../01_vars/02_functions/namespaces/004.cf | 2 +- .../01_vars/02_functions/namespaces/005.cf | 2 +- .../01_vars/02_functions/namespaces/006.cf | 2 +- .../01_vars/02_functions/namespaces/101.cf | 2 +- .../01_vars/02_functions/namespaces/103.cf | 2 +- .../01_vars/02_functions/namespaces/201.cf | 2 +- .../01_vars/02_functions/namespaces/203.cf | 2 +- tests/acceptance/01_vars/02_functions/network/008.cf | 3 +-- .../01_vars/02_functions/network/selectservers.cf | 3 +-- .../01_vars/02_functions/network/url_get.cf | 2 +- tests/acceptance/01_vars/02_functions/not.cf | 2 +- tests/acceptance/01_vars/02_functions/nth.cf | 2 +- .../01_vars/02_functions/nth_datacontainer.cf | 2 +- tests/acceptance/01_vars/02_functions/on.cf | 3 +-- tests/acceptance/01_vars/02_functions/or.cf | 2 +- .../01_vars/02_functions/packagesmatching.cf | 2 +- .../01_vars/02_functions/parsearray_maxlen.cf | 2 +- ...ringarray_dontread_comment_duplicate_lastline2.cf | 2 +- ...ray_weird_indices_real_comments_noemptyfields2.cf | 2 +- ...yaml_with_unquoted_values_starting_with_digits.cf | 2 +- tests/acceptance/01_vars/02_functions/peers.cf | 2 +- tests/acceptance/01_vars/02_functions/randomint.cf | 2 +- .../01_vars/02_functions/read-file-endless-loop.cf | 2 +- .../01_vars/02_functions/read_empty_file.cf | 2 +- .../01_vars/02_functions/read_long_file.cf | 2 +- .../acceptance/01_vars/02_functions/read_sys_file.cf | 2 +- tests/acceptance/01_vars/02_functions/readcsv.cf | 4 ++-- tests/acceptance/01_vars/02_functions/readcsv.cf.csv | 8 ++++---- tests/acceptance/01_vars/02_functions/readdata.cf | 2 +- .../acceptance/01_vars/02_functions/readdata_yaml.cf | 2 +- tests/acceptance/01_vars/02_functions/readfile.cf | 2 +- .../readfile_absent_does_not_error_in_pre_eval.cf | 5 ++--- ...ngarray_dontread_comment_duplicatekey_lastline.cf | 2 +- .../01_vars/02_functions/readstringarrayidx.cf | 2 +- .../01_vars/02_functions/readstringarrayidx_order.cf | 2 +- .../02_functions/readstringlist-many-comments.cf | 2 +- .../01_vars/02_functions/readtcp_connection_fail.cf | 3 +-- tests/acceptance/01_vars/02_functions/regarray.cf | 2 +- .../acceptance/01_vars/02_functions/regex_replace.cf | 2 +- tests/acceptance/01_vars/02_functions/regextract.cf | 2 +- tests/acceptance/01_vars/02_functions/regextract2.cf | 2 +- tests/acceptance/01_vars/02_functions/regline.cf | 2 +- tests/acceptance/01_vars/02_functions/reverse.cf | 2 +- .../setop_unique_difference_intersection.cf | 2 +- .../acceptance/01_vars/02_functions/shuffle-exact.cf | 2 +- tests/acceptance/01_vars/02_functions/shuffle.cf | 2 +- tests/acceptance/01_vars/02_functions/sort.cf | 2 +- tests/acceptance/01_vars/02_functions/split.cf | 2 +- .../01_vars/02_functions/staging/accumulated.cf | 3 +-- .../01_vars/02_functions/staging/accumulated2.cf | 3 +-- .../staging/bundlesmatching_dynamicbundlesequence.cf | 2 +- .../01_vars/02_functions/staging/datatype.cf | 3 +-- .../01_vars/02_functions/staging/execresult_large.cf | 2 +- .../02_functions/staging/format_empty_lists.cf | 2 +- .../02_functions/staging/functions_and_nulls.cf | 2 +- .../staging/getindices_size5_namespaces.cf | 2 +- .../01_vars/02_functions/staging/getvalues_size2.cf | 2 +- .../staging/getvalues_size2_with_expansion.cf | 2 +- .../01_vars/02_functions/staging/getvalues_size5.cf | 2 +- .../getvalues_size5_with_duplicate_triplicate.cf | 2 +- .../01_vars/02_functions/staging/host2ip.cf | 2 +- .../staging/parserealarray_duplicate_key.cf | 2 +- .../parsestringarray_change_separator_to_s.cf | 2 +- ...tringarray_dontread_comment_duplicate_lastline.cf | 2 +- ...ringarray_dontread_comment_duplicate_lastline3.cf | 2 +- .../parsestringarray_introduce_duplicate_key.cf | 2 +- .../parsestringarray_introduce_nonparsed_comment.cf | 2 +- ...ringarray_weird_indices_change_comment_parsing.cf | 2 +- ...ingarray_weird_indices_change_comment_parsing2.cf | 2 +- ...ray_weird_indices_duplicates_trailing_newlines.cf | 2 +- ...ay_weird_indices_duplicates_trailing_newlines2.cf | 2 +- .../parsestringarray_weird_indices_real_comments.cf | 2 +- .../parsestringarray_weird_indices_real_comments2.cf | 2 +- .../parsestringarray_weird_indices_real_comments3.cf | 2 +- ...rray_weird_indices_real_comments_noemptyfields.cf | 2 +- ...ray_weird_indices_real_comments_noemptyfields3.cf | 2 +- ...ray_weird_indices_real_comments_noemptyfields4.cf | 2 +- .../parsestringarray_weird_indices_with_duplicate.cf | 2 +- .../parsestringarrayidx_change_separator_to_s.cf | 2 +- .../staging/parsestringarrayidx_duplicate_key.cf | 2 +- .../staging/parsestringarrayidx_nonparsed_comment.cf | 2 +- .../parsestringarrayidx_weird_indices_duplicate.cf | 2 +- ...yidx_weird_indices_real_comments_noemptyfields.cf | 2 +- .../staging/parsestringarrayinx_simple.cf | 2 +- .../parsestringarrayinx_singleton_nootherfields.cf | 2 +- .../staging/readintarray_duplicate_key.cf | 2 +- .../staging/readintarray_non_integers.cf | 2 +- .../staging/readintarray_non_integers2.cf | 2 +- .../staging/readintarray_non_integers3.cf | 2 +- .../01_vars/02_functions/staging/readintlist.cf | 2 +- .../01_vars/02_functions/staging/readintlist2.cf | 2 +- .../staging/readrealarray_duplicate_key.cf | 2 +- .../staging/readrealarray_non_integers.cf | 2 +- .../staging/readrealarray_non_integers2.cf | 2 +- .../01_vars/02_functions/staging/readreallist.cf | 2 +- .../01_vars/02_functions/staging/readreallist2.cf | 2 +- .../staging/readstringarray_change_separator_to_s.cf | 2 +- .../staging/readstringarray_introduce_duplicate.cf | 2 +- .../readstringarray_introduce_nonparsed_comment.cf | 2 +- .../staging/readstringarray_weird_indices.cf | 2 +- ...ringarray_weird_indices_change_comment_parsing.cf | 2 +- .../readstringarray_weird_indices_real_comments.cf | 2 +- ...rray_weird_indices_real_comments_noemptyfields.cf | 2 +- ...eadstringarray_weird_indices_trailing_newlines.cf | 2 +- .../readstringarrayidx_change_separator_to_s.cf | 2 +- .../01_vars/02_functions/staging/readstringlist.cf | 2 +- .../01_vars/02_functions/staging/readstringlist2.cf | 2 +- tests/acceptance/01_vars/02_functions/storejson.cf | 2 +- .../01_vars/02_functions/storejson_edge_case.cf | 2 +- tests/acceptance/01_vars/02_functions/strftime.cf | 2 +- .../acceptance/01_vars/02_functions/strftime_GMT.cf | 2 +- tests/acceptance/01_vars/02_functions/string.cf | 2 +- .../01_vars/02_functions/string_mustache.cf | 2 +- .../01_vars/02_functions/string_replace.cf | 2 +- tests/acceptance/01_vars/02_functions/string_trim.cf | 2 +- tests/acceptance/01_vars/02_functions/sublist.cf | 2 +- .../01_vars/02_functions/sum_and_product.cf | 2 +- tests/acceptance/01_vars/02_functions/sysctl.cf | 2 +- tests/acceptance/01_vars/02_functions/sysctl.cf.sub | 2 +- tests/acceptance/01_vars/02_functions/text_xform.cf | 2 +- tests/acceptance/01_vars/02_functions/type.cf | 2 +- .../02_functions/unsafe/findlocalusers_unsafe.cf | 2 +- .../acceptance/01_vars/02_functions/url_get_local.cf | 2 +- tests/acceptance/01_vars/02_functions/validdata.cf | 2 +- .../01_vars/02_functions/validjson_strict.cf | 2 +- ...e_references_from_function_that_never_succeeds.cf | 2 +- .../01_vars/02_functions/variablesmatching.cf | 2 +- .../01_vars/02_functions/version_compare.cf | 2 +- .../01_vars/02_functions/wrap_container_fncalls.cf | 2 +- .../02_functions/wrap_invalid_container_fncalls.x.cf | 2 +- tests/acceptance/01_vars/03_lists/001.cf | 3 +-- tests/acceptance/01_vars/03_lists/002.cf | 3 +-- tests/acceptance/01_vars/03_lists/003.cf | 3 +-- tests/acceptance/01_vars/03_lists/004.cf | 3 +-- tests/acceptance/01_vars/03_lists/005.cf | 3 +-- tests/acceptance/01_vars/03_lists/006.cf | 3 +-- tests/acceptance/01_vars/03_lists/007.cf | 2 +- tests/acceptance/01_vars/03_lists/008.cf | 3 +-- tests/acceptance/01_vars/03_lists/009.cf | 3 +-- tests/acceptance/01_vars/03_lists/010.cf | 3 +-- tests/acceptance/01_vars/03_lists/011.cf | 3 +-- tests/acceptance/01_vars/03_lists/012.cf | 3 +-- tests/acceptance/01_vars/03_lists/013.cf | 2 +- tests/acceptance/01_vars/03_lists/014.cf | 3 +-- tests/acceptance/01_vars/03_lists/015.cf | 3 +-- tests/acceptance/01_vars/03_lists/016.cf | 2 +- .../01_vars/03_lists/double_expand_remote_list.cf | 2 +- .../01_vars/03_lists/interpolation_order.cf | 2 +- .../namespaced_list_including_list_expanded.cf | 2 +- .../01_vars/03_lists/namespaces/passing_slists.cf | 2 +- .../01_vars/03_lists/namespaces/passing_slists2.cf | 2 +- .../01_vars/03_lists/namespaces/passing_slists3.cf | 2 +- tests/acceptance/01_vars/03_lists/nested_lists.cf | 3 +-- tests/acceptance/01_vars/03_lists/usebundle_naked.cf | 2 +- .../01_vars/04_containers/canonical_json.cf | 2 +- .../01_vars/04_containers/execresult_and_as_data.cf | 2 +- tests/acceptance/01_vars/04_containers/extraction.cf | 2 +- .../acceptance/01_vars/04_containers/inline_json.cf | 2 +- .../01_vars/04_containers/inline_json_parse.cf | 2 +- .../acceptance/01_vars/04_containers/inline_yaml.cf | 2 +- .../01_vars/04_containers/iterate_over_data_array.cf | 3 +-- .../iterate_over_data_container_with_nulls.cf | 2 +- .../01_vars/04_containers/mergecontainer.cf | 2 +- .../01_vars/04_containers/mergecontainer_arrays.cf | 2 +- .../01_vars/04_containers/mergecontainer_conflict.cf | 2 +- ...solved_variables_does_not_define_datacontainer.cf | 2 +- .../multiple_cmerge_variable_dynamic.cf | 2 +- .../04_containers/multiple_cmerge_variable_static.cf | 2 +- tests/acceptance/01_vars/04_containers/parsejson.cf | 2 +- .../01_vars/04_containers/parsejson_indexed.cf | 2 +- ...issing_container_does_not_create_new_container.cf | 2 +- .../01_vars/04_containers/parsejson_unicode.cf | 2 +- ...solved_varibales_does_not_define_datacontainer.cf | 2 +- tests/acceptance/01_vars/04_containers/parseyaml.cf | 2 +- .../01_vars/04_containers/parseyaml_abuse.cf | 2 +- .../01_vars/04_containers/pass_variable_container.cf | 2 +- .../04_containers/pass_variable_container_index.cf | 2 +- .../01_vars/04_containers/passing_containers.cf | 2 +- tests/acceptance/01_vars/04_containers/readjson.cf | 2 +- .../01_vars/04_containers/readjson_arrays.cf | 2 +- .../acceptance/01_vars/04_containers/readjson_new.cf | 2 +- .../01_vars/04_containers/readjson_null.cf | 2 +- .../01_vars/04_containers/readjson_objects.cf | 2 +- .../01_vars/04_containers/readjson_scalar.cf | 2 +- .../01_vars/04_containers/readjson_subindex.cf | 2 +- .../04_containers/readjson_subindex_quoted.cf | 2 +- tests/acceptance/01_vars/04_containers/readyaml.cf | 2 +- .../acceptance/01_vars/04_containers/readyaml_new.cf | 2 +- .../test_json_with_and_without_nulls.cf | 2 +- .../01_vars/deep_delayed_expansion/main.cf | 2 +- tests/acceptance/02_classes/01_basic/001.cf | 3 +-- tests/acceptance/02_classes/01_basic/002.cf | 3 +-- tests/acceptance/02_classes/01_basic/003.cf | 3 +-- tests/acceptance/02_classes/01_basic/004.cf | 3 +-- tests/acceptance/02_classes/01_basic/005.cf | 3 +-- tests/acceptance/02_classes/01_basic/006.cf | 3 +-- tests/acceptance/02_classes/01_basic/007.cf | 3 +-- tests/acceptance/02_classes/01_basic/008.cf | 3 +-- tests/acceptance/02_classes/01_basic/009.cf | 3 +-- tests/acceptance/02_classes/01_basic/010.cf | 3 +-- tests/acceptance/02_classes/01_basic/011.cf | 3 +-- tests/acceptance/02_classes/01_basic/012.cf | 3 +-- tests/acceptance/02_classes/01_basic/013.cf | 3 +-- tests/acceptance/02_classes/01_basic/014.cf | 3 +-- tests/acceptance/02_classes/01_basic/015.cf | 3 +-- tests/acceptance/02_classes/01_basic/016.cf | 3 +-- tests/acceptance/02_classes/01_basic/017.cf | 3 +-- tests/acceptance/02_classes/01_basic/018.cf | 3 +-- tests/acceptance/02_classes/01_basic/019.cf | 3 +-- tests/acceptance/02_classes/01_basic/020.x.cf | 2 +- tests/acceptance/02_classes/01_basic/021.x.cf | 2 +- tests/acceptance/02_classes/01_basic/022.x.cf | 3 +-- tests/acceptance/02_classes/01_basic/023.cf | 3 +-- tests/acceptance/02_classes/01_basic/024.cf | 3 +-- tests/acceptance/02_classes/01_basic/025.cf | 3 +-- tests/acceptance/02_classes/01_basic/026.cf | 3 +-- tests/acceptance/02_classes/01_basic/027.cf | 3 +-- tests/acceptance/02_classes/01_basic/028.cf | 3 +-- tests/acceptance/02_classes/01_basic/030.cf | 2 +- tests/acceptance/02_classes/01_basic/031.cf | 2 +- tests/acceptance/02_classes/01_basic/032.cf | 2 +- tests/acceptance/02_classes/01_basic/040.cf | 3 +-- tests/acceptance/02_classes/01_basic/041.cf | 3 +-- tests/acceptance/02_classes/01_basic/042.cf | 3 +-- tests/acceptance/02_classes/01_basic/109.cf | 2 +- tests/acceptance/02_classes/01_basic/117.x.cf | 3 +-- tests/acceptance/02_classes/01_basic/118.x.cf | 3 +-- tests/acceptance/02_classes/01_basic/119.x.cf | 3 +-- .../01_basic/action_policy_warn_sets_classes.cf | 3 +-- .../02_classes/01_basic/agent_class_scope.cf | 2 +- .../01_basic/array_key_with_space_isvariable.cf | 2 +- .../02_classes/01_basic/avoid_reevaluation.cf | 2 +- .../02_classes/01_basic/avoid_reevaluation.cf.sub | 2 +- .../classes_comments_emitted_in_show_classes.cf | 2 +- .../01_basic/classes_comments_emitted_in_verbose.cf | 2 +- ..._available_to_subsequent_bundles_in_first_pass.cf | 2 +- ...ilable_to_subsequent_bundles_in_first_pass.cf.sub | 2 +- .../01_basic/classes_promises_with_classes_bodies.cf | 2 +- .../01_basic/classes_without_expression.cf | 2 +- .../common_bundle_select_class_empty_list.cf | 2 +- ...lect_class_multiple_classes_as_scalar_variable.cf | 2 +- .../common_bundle_select_class_single_class.cf | 2 +- ...n_bundle_select_class_single_class_as_variable.cf | 2 +- ...undle_select_class_variable_expands_empty_list.cf | 2 +- .../02_classes/01_basic/common_class_scope.cf | 2 +- .../01_basic/depends_on_proper_ordering.cf | 4 +--- .../02_classes/01_basic/depends_on_respected.cf | 2 +- .../02_classes/01_basic/from_json_booleans.cf | 2 +- ...f_resolving_classexpression_from_datacontainer.cf | 3 +-- .../02_classes/01_basic/ifvarclass_common_bundles.cf | 2 +- .../02_classes/01_basic/invalid_function_in_list.cf | 3 +-- .../acceptance/02_classes/01_basic/ipaddr_classes.cf | 2 +- .../acceptance/02_classes/01_basic/log_mode_debug.cf | 2 +- .../acceptance/02_classes/01_basic/log_mode_error.cf | 2 +- .../02_classes/01_basic/log_mode_inform.cf | 2 +- .../02_classes/01_basic/log_mode_notice.cf | 2 +- .../02_classes/01_basic/log_mode_verbose.cf | 2 +- .../02_classes/01_basic/log_mode_warning.cf | 2 +- tests/acceptance/02_classes/01_basic/n_cpusockets.cf | 2 +- .../02_classes/01_basic/persistent_negate.cf | 2 +- .../02_classes/01_basic/persistent_tags.cf | 2 +- .../01_basic/rbtree_collisions-redmine7912.cf | 2 +- tests/acceptance/02_classes/01_basic/staging/028.cf | 2 +- .../01_basic/variable_class_expressions_with_if.cf | 2 +- tests/acceptance/02_classes/02_functions/001.cf | 3 +-- tests/acceptance/02_classes/02_functions/002.cf | 3 +-- tests/acceptance/02_classes/02_functions/003.cf | 3 +-- tests/acceptance/02_classes/02_functions/004.cf | 3 +-- tests/acceptance/02_classes/02_functions/005.cf | 3 +-- tests/acceptance/02_classes/02_functions/006.cf | 2 +- tests/acceptance/02_classes/02_functions/008.cf | 3 +-- tests/acceptance/02_classes/02_functions/009.cf | 3 +-- tests/acceptance/02_classes/02_functions/010.cf | 3 +-- tests/acceptance/02_classes/02_functions/011.cf | 3 +-- tests/acceptance/02_classes/02_functions/012.cf | 3 +-- tests/acceptance/02_classes/02_functions/013.cf | 3 +-- tests/acceptance/02_classes/02_functions/014.cf | 3 +-- tests/acceptance/02_classes/02_functions/015.cf | 2 +- tests/acceptance/02_classes/02_functions/016.cf | 2 +- tests/acceptance/02_classes/02_functions/017.cf | 3 +-- tests/acceptance/02_classes/02_functions/020.cf | 2 +- tests/acceptance/02_classes/02_functions/021.cf | 2 +- tests/acceptance/02_classes/02_functions/029.cf | 3 +-- tests/acceptance/02_classes/02_functions/030.cf | 3 +-- .../02_functions/classes_body_function_param.cf | 2 +- .../02_classes/02_functions/classesmatching.cf | 2 +- ...list_or_data_doesnt_return_true_for_filesexist.cf | 2 +- .../02_functions/function_args_flattening.cf | 2 +- .../02_classes/02_functions/getindices_containers.cf | 3 +-- .../getindices_returns_correct_indices_from_list.cf | 2 +- ...getindices_returns_positonal_indices_from_list.cf | 2 +- tests/acceptance/02_classes/02_functions/iprange.cf | 2 +- .../02_classes/02_functions/isipinsubnet-valid-ip.cf | 2 +- .../02_classes/02_functions/isipinsubnet.cf | 2 +- .../02_classes/02_functions/isnewerthantime.cf | 2 +- .../acceptance/02_classes/02_functions/laterthan.cf | 2 +- tests/acceptance/02_classes/02_functions/makerule.cf | 2 +- .../02_classes/02_functions/returnszero.cf | 2 +- .../02_classes/02_functions/silent_returnszero.cf | 2 +- .../02_functions/silent_returnszero.cf.sub | 2 +- .../02_classes/02_functions/splayclass_hourly.cf | 2 +- .../02_classes/02_functions/staging/017.cf | 2 +- .../02_classes/02_functions/staging/usemodule.cf | 3 +-- .../02_functions/usemodule-returns-nonzero.cf | 2 +- .../acceptance/02_classes/02_functions/usemodule.cf | 3 +-- tests/acceptance/02_classes/03_os/powershell.cf | 3 +-- tests/acceptance/02_classes/03_os/ubuntu.cf | 2 +- .../acceptance/04_examples/outputs/check_outputs.cf | 2 +- tests/acceptance/04_examples/syntax/check_syntax.cf | 2 +- .../05_processes/00_hpux_ps_setup_serial.cf | 2 +- .../01_matching/inverse_ttime_classes_body_params.cf | 2 +- .../01_matching/inverse_ttime_inverse_found.cf | 2 +- .../01_matching/negative_restart_class.cf | 2 +- tests/acceptance/05_processes/01_matching/owner.cf | 2 +- .../01_matching/partial_name_inverse_found.cf | 2 +- .../01_matching/partial_name_inverse_not_found.cf | 2 +- .../05_processes/01_matching/process_count_found.cf | 2 +- .../01_matching/process_count_inverse_found.cf | 2 +- .../01_matching/process_count_inverse_not_found.cf | 2 +- .../01_matching/process_count_not_found.cf | 2 +- .../01_matching/process_select_fncalls.cf | 2 +- .../01_matching/promiser_match_is_correct.cf | 2 +- .../01_matching/promiser_match_is_correct.cf.sub | 2 +- .../05_processes/01_matching/restart_class.cf | 2 +- .../01_matching/select_without_result.cf | 2 +- .../05_processes/01_matching/stime_range.cf | 2 +- .../05_processes/01_matching/timed/stime.cf | 2 +- .../01_matching/ttime_classes_body_params.cf | 2 +- .../05_processes/01_matching/ttime_inverse_found.cf | 2 +- tests/acceptance/05_processes/01_matching/tty.cf | 2 +- .../05_processes/02_functions/findprocesses.cf | 2 +- .../05_processes/02_functions/processexists.cf | 2 +- tests/acceptance/05_processes/process_stop.cf | 3 +-- tests/acceptance/06_storage/01_local/001.cf | 2 +- tests/acceptance/06_storage/01_local/staging/002.cf | 2 +- tests/acceptance/07_packages/001.cf | 2 +- tests/acceptance/07_packages/002.cf | 2 +- tests/acceptance/07_packages/003.cf | 2 +- tests/acceptance/07_packages/004.cf | 2 +- tests/acceptance/07_packages/005.cf | 2 +- tests/acceptance/07_packages/006.cf | 2 +- tests/acceptance/07_packages/800.cf | 2 +- tests/acceptance/07_packages/900.cf | 2 +- tests/acceptance/07_packages/901.cf | 2 +- tests/acceptance/07_packages/902.cf | 2 +- tests/acceptance/07_packages/903.cf | 2 +- tests/acceptance/07_packages/904.cf | 2 +- tests/acceptance/07_packages/905.cf | 2 +- tests/acceptance/07_packages/906.cf | 2 +- tests/acceptance/07_packages/907.cf | 2 +- tests/acceptance/07_packages/908.cf | 2 +- .../07_packages/contradicting-bodies-and-promises.cf | 2 +- .../acceptance/07_packages/custom-version-compare.cf | 2 +- .../default-list-architectures-different.cf | 2 +- .../07_packages/default-list-architectures-same.cf | 2 +- .../acceptance/07_packages/default_package_module.cf | 2 +- .../dependency-checks-package_delete_command.cf | 2 +- .../dependency-checks-package_list_command.cf | 2 +- .../dependency-checks-package_patch_command.cf | 2 +- .../dependency-checks-package_patch_list_command.cf | 2 +- .../dependency-checks-package_verify_command.cf | 2 +- tests/acceptance/07_packages/dry-run-install.cf | 2 +- tests/acceptance/07_packages/dry-run-install.cf.sub | 2 +- .../07_packages/has-default-no-list-architectures.cf | 2 +- tests/acceptance/07_packages/list-architecture.cf | 2 +- tests/acceptance/07_packages/no-architectures.cf | 2 +- .../07_packages/package_commands_useshell.cf | 2 +- .../07_packages/package_module_interpreter.cf | 2 +- tests/acceptance/07_packages/package_module_path.cf | 2 +- tests/acceptance/07_packages/packages_command.cf | 2 +- tests/acceptance/07_packages/repositories.cf | 2 +- tests/acceptance/07_packages/repositories.cf.sub | 2 +- .../07_packages/upgrade-package-version.cf | 2 +- tests/acceptance/07_packages/upgrade-package.cf | 2 +- .../07_packages/warn-package-delete-non-existing.cf | 2 +- tests/acceptance/07_packages/warn-package-delete.cf | 2 +- .../07_packages/warn-package-delete.cf.sub | 2 +- tests/acceptance/08_commands/01_modules/001.cf | 2 +- tests/acceptance/08_commands/01_modules/002.cf | 2 +- tests/acceptance/08_commands/01_modules/003.cf | 2 +- tests/acceptance/08_commands/01_modules/004.cf | 2 +- .../01_modules/classes-automatically-canonified.cf | 2 +- .../08_commands/01_modules/long-module-lines.cf | 2 +- .../08_commands/01_modules/module-array-allows-at.cf | 2 +- .../01_modules/module-array-allows-slash.cf | 2 +- .../08_commands/01_modules/module-array-indexing.cf | 2 +- .../01_modules/module_allows_empty_lists.cf | 2 +- .../01_modules/module_allows_trailing_comma.cf | 2 +- .../08_commands/01_modules/module_file_test.cf | 2 +- .../08_commands/01_modules/module_with_no_output.cf | 2 +- .../01_modules/module_with_no_output.cf.sub | 2 +- .../acceptance/08_commands/01_modules/set-context.cf | 2 +- .../08_commands/01_modules/set-persistent-class.cf | 2 +- .../01_modules/set-persistent-class.cf.sub | 2 +- tests/acceptance/08_commands/01_modules/set-tags.cf | 2 +- ...-from-module-have-source-and-derived_from-tags.cf | 2 +- .../vars-without-explicit-tags-do-not-segfault.cf | 2 +- tests/acceptance/08_commands/02_syntax/arglist.cf | 2 +- .../acceptance/08_commands/02_syntax/staging/001.cf | 2 +- tests/acceptance/08_commands/03_shells/shelltypes.cf | 2 +- .../acceptance/08_commands/03_shells/tryshell.cf.sub | 2 +- tests/acceptance/08_commands/arglist.cf | 2 +- .../staging/default_failed_returncodes.cf | 3 +-- tests/acceptance/09_services/custom.cf | 2 +- tests/acceptance/09_services/disable.cf | 2 +- tests/acceptance/09_services/enable.cf | 2 +- tests/acceptance/09_services/outcomes.cf | 2 +- tests/acceptance/09_services/reload.cf | 2 +- tests/acceptance/09_services/restart.cf | 2 +- .../09_services/service_cannot_be_resolved.cf | 2 +- .../09_services/service_cannot_be_resolved.cf.sub | 2 +- .../standard_services-from-non-default-namespace.cf | 2 +- tests/acceptance/09_services/start.cf | 2 +- tests/acceptance/09_services/stop.cf | 2 +- tests/acceptance/10_files/01_create/001.cf | 2 +- tests/acceptance/10_files/01_create/002.cf | 2 +- tests/acceptance/10_files/01_create/003.cf | 2 +- tests/acceptance/10_files/01_create/004.cf | 2 +- tests/acceptance/10_files/01_create/005.cf | 2 +- tests/acceptance/10_files/01_create/006.cf | 2 +- tests/acceptance/10_files/01_create/007.cf | 2 +- tests/acceptance/10_files/01_create/008.cf | 2 +- tests/acceptance/10_files/01_create/009.cf | 2 +- tests/acceptance/10_files/01_create/010.cf | 2 +- tests/acceptance/10_files/01_create/011.cf | 2 +- tests/acceptance/10_files/01_create/012.cf | 2 +- tests/acceptance/10_files/01_create/013.cf | 2 +- .../10_files/01_create/cfengine_create_by_default.cf | 2 +- .../10_files/01_create/content_create_by_default.cf | 2 +- .../acceptance/10_files/01_create/copy_and_purge.cf | 2 +- .../01_create/directory_with_trailing_slash.cf | 2 +- .../10_files/01_create/mustache_create_by_default.cf | 2 +- tests/acceptance/10_files/01_create/perms-mode.cf | 2 +- tests/acceptance/10_files/02_maintain/001.cf | 2 +- tests/acceptance/10_files/02_maintain/002.cf | 2 +- tests/acceptance/10_files/02_maintain/003.cf | 2 +- tests/acceptance/10_files/02_maintain/004.cf | 2 +- tests/acceptance/10_files/02_maintain/005.cf | 2 +- tests/acceptance/10_files/02_maintain/006.cf | 2 +- tests/acceptance/10_files/02_maintain/007.cf | 2 +- tests/acceptance/10_files/02_maintain/008.cf | 2 +- tests/acceptance/10_files/02_maintain/009.cf | 2 +- tests/acceptance/10_files/02_maintain/010.cf | 2 +- tests/acceptance/10_files/02_maintain/011.cf | 2 +- tests/acceptance/10_files/02_maintain/012.cf | 2 +- tests/acceptance/10_files/02_maintain/013.cf | 2 +- tests/acceptance/10_files/02_maintain/015.cf | 2 +- tests/acceptance/10_files/02_maintain/016.cf | 2 +- tests/acceptance/10_files/02_maintain/017.cf | 2 +- tests/acceptance/10_files/02_maintain/018.cf | 2 +- tests/acceptance/10_files/02_maintain/019.cf | 2 +- tests/acceptance/10_files/02_maintain/101.cf | 2 +- tests/acceptance/10_files/02_maintain/102.cf | 2 +- tests/acceptance/10_files/02_maintain/103.cf | 2 +- tests/acceptance/10_files/02_maintain/104.cf | 2 +- tests/acceptance/10_files/02_maintain/105.cf | 2 +- tests/acceptance/10_files/02_maintain/106.x.cf | 2 +- tests/acceptance/10_files/02_maintain/111.x.cf | 2 +- tests/acceptance/10_files/02_maintain/112.cf | 2 +- tests/acceptance/10_files/02_maintain/113.cf | 2 +- tests/acceptance/10_files/02_maintain/114.cf | 2 +- tests/acceptance/10_files/02_maintain/201.cf | 2 +- tests/acceptance/10_files/02_maintain/202.cf | 2 +- tests/acceptance/10_files/02_maintain/203.cf | 2 +- tests/acceptance/10_files/02_maintain/204.cf | 2 +- tests/acceptance/10_files/02_maintain/205.cf | 2 +- tests/acceptance/10_files/02_maintain/206.cf | 2 +- tests/acceptance/10_files/02_maintain/207.cf | 2 +- tests/acceptance/10_files/02_maintain/208.cf | 2 +- tests/acceptance/10_files/02_maintain/209.cf | 2 +- tests/acceptance/10_files/02_maintain/301.cf | 2 +- tests/acceptance/10_files/02_maintain/403.x.cf | 2 +- tests/acceptance/10_files/02_maintain/404.x.cf | 2 +- tests/acceptance/10_files/02_maintain/406.x.cf | 2 +- tests/acceptance/10_files/02_maintain/407.x.cf | 2 +- tests/acceptance/10_files/02_maintain/408.cf | 2 +- tests/acceptance/10_files/02_maintain/409.cf | 2 +- tests/acceptance/10_files/02_maintain/410.cf | 2 +- tests/acceptance/10_files/02_maintain/411.cf | 2 +- tests/acceptance/10_files/02_maintain/412.cf | 2 +- tests/acceptance/10_files/02_maintain/412.cf.sub | 3 +-- tests/acceptance/10_files/02_maintain/413.cf | 2 +- tests/acceptance/10_files/02_maintain/413.cf.sub | 3 +-- tests/acceptance/10_files/02_maintain/414.cf | 2 +- tests/acceptance/10_files/02_maintain/414.cf.sub | 3 +-- tests/acceptance/10_files/02_maintain/RM5411.cf | 2 +- .../absolute_link_and_move_obstructions.cf | 2 +- .../absolute_link_and_no_move_obstructions.cf | 2 +- .../10_files/02_maintain/backup_repository.cf | 2 +- .../10_files/02_maintain/changes_depth_search.cf | 2 +- .../10_files/02_maintain/changes_depth_search.cf.sub | 2 +- .../02_maintain/changes_depth_search_last_file.cf | 2 +- .../changes_depth_search_last_file.cf.sub | 2 +- .../10_files/02_maintain/changes_promise_status.cf | 2 +- .../10_files/02_maintain/changes_update_hashes.cf | 2 +- .../10_files/02_maintain/classes_on_delete.cf | 2 +- .../02_maintain/copy-relative-link-existing.cf | 2 +- .../10_files/02_maintain/copy-relative-link.cf | 2 +- .../10_files/02_maintain/copy_from_depth_search.cf | 2 +- .../10_files/02_maintain/copy_from_translatepath.cf | 2 +- .../copy_linkpattern_from_contains_dots.cf | 2 +- tests/acceptance/10_files/02_maintain/fifos.cf | 4 +--- .../02_maintain/line_truncation_at_4096_chars.cf | 2 +- .../acceptance/10_files/02_maintain/perms_recurse.cf | 4 +--- .../relative_link_and_move_obstructions.cf | 2 +- .../relative_link_and_no_move_obstructions.cf | 2 +- .../acceptance/10_files/02_maintain/staging/107.x.cf | 2 +- .../acceptance/10_files/02_maintain/staging/108.x.cf | 2 +- .../acceptance/10_files/02_maintain/staging/109.x.cf | 2 +- .../acceptance/10_files/02_maintain/staging/110.x.cf | 2 +- tests/acceptance/10_files/02_maintain/staging/302.cf | 2 +- tests/acceptance/10_files/02_maintain/staging/401.cf | 2 +- tests/acceptance/10_files/02_maintain/staging/402.cf | 2 +- tests/acceptance/10_files/02_maintain/staging/405.cf | 2 +- .../staging/copy-select-link-dereference.cf | 2 +- .../10_files/02_maintain/staging/edit_immutable.cf | 2 +- .../staging/line_truncation_at_4096_chars.cf | 2 +- .../symlink_link_and_no_move_obstructions.cf | 2 +- .../10_files/02_maintain/symlink_link_kept.cf | 2 +- tests/acceptance/10_files/02_maintain/touch.cf | 2 +- tests/acceptance/10_files/03_transform/001.cf | 2 +- tests/acceptance/10_files/03_transform/002.cf | 2 +- tests/acceptance/10_files/03_transform/003.cf | 2 +- tests/acceptance/10_files/04_match/001.cf | 2 +- tests/acceptance/10_files/04_match/004.cf | 2 +- tests/acceptance/10_files/04_match/008.cf | 2 +- .../10_files/04_match/directory_can_not_readlink.cf | 2 +- .../04_match/directory_can_not_readlink.cf.sub | 2 +- tests/acceptance/10_files/04_match/kept_promise.cf | 2 +- tests/acceptance/10_files/04_match/match_scope.cf | 2 +- .../04_match/not_selected_dirs_are_skipped.cf | 3 +-- tests/acceptance/10_files/04_match/staging/002.cf | 2 +- tests/acceptance/10_files/04_match/staging/003.cf | 2 +- tests/acceptance/10_files/04_match/staging/005.cf | 2 +- tests/acceptance/10_files/04_match/staging/006.cf | 2 +- tests/acceptance/10_files/04_match/staging/007.cf | 2 +- tests/acceptance/10_files/05_classes/001.cf | 2 +- tests/acceptance/10_files/05_classes/002.cf | 2 +- tests/acceptance/10_files/05_classes/004.cf | 2 +- tests/acceptance/10_files/05_classes/006.cf | 2 +- tests/acceptance/10_files/05_classes/102.cf | 2 +- tests/acceptance/10_files/05_classes/staging/003.cf | 2 +- tests/acceptance/10_files/05_classes/staging/005.cf | 2 +- tests/acceptance/10_files/05_classes/staging/007.cf | 2 +- tests/acceptance/10_files/05_classes/staging/101.cf | 2 +- tests/acceptance/10_files/05_classes/staging/103.cf | 2 +- tests/acceptance/10_files/05_classes/staging/104.cf | 2 +- tests/acceptance/10_files/05_classes/staging/105.cf | 2 +- tests/acceptance/10_files/05_classes/staging/106.cf | 2 +- tests/acceptance/10_files/05_classes/staging/107.cf | 2 +- tests/acceptance/10_files/05_classes/staging/108.cf | 2 +- tests/acceptance/10_files/05_classes/staging/109.cf | 2 +- tests/acceptance/10_files/05_classes/staging/110.cf | 2 +- tests/acceptance/10_files/05_classes/staging/111.cf | 2 +- tests/acceptance/10_files/05_classes/staging/112.cf | 2 +- tests/acceptance/10_files/05_classes/staging/113.cf | 2 +- tests/acceptance/10_files/05_classes/staging/114.cf | 2 +- tests/acceptance/10_files/07_delete_lines/001.cf | 2 +- tests/acceptance/10_files/07_delete_lines/002.cf | 2 +- tests/acceptance/10_files/07_delete_lines/003.cf | 2 +- tests/acceptance/10_files/07_delete_lines/004.cf | 2 +- tests/acceptance/10_files/07_delete_lines/005.cf | 2 +- tests/acceptance/10_files/07_delete_lines/006.cf | 2 +- tests/acceptance/10_files/07_delete_lines/007.cf | 2 +- tests/acceptance/10_files/07_delete_lines/008.cf | 2 +- tests/acceptance/10_files/07_delete_lines/009.cf | 2 +- tests/acceptance/10_files/07_delete_lines/010.cf | 2 +- tests/acceptance/10_files/07_delete_lines/011.cf | 2 +- tests/acceptance/10_files/07_delete_lines/012.cf | 2 +- tests/acceptance/10_files/07_delete_lines/013.cf | 2 +- tests/acceptance/10_files/07_delete_lines/014.cf | 2 +- tests/acceptance/10_files/07_delete_lines/015.cf | 2 +- tests/acceptance/10_files/07_delete_lines/016.cf | 2 +- tests/acceptance/10_files/07_delete_lines/017.cf | 2 +- tests/acceptance/10_files/07_delete_lines/018.cf | 2 +- tests/acceptance/10_files/07_delete_lines/019.cf | 2 +- tests/acceptance/10_files/07_delete_lines/020.cf | 2 +- tests/acceptance/10_files/07_delete_lines/022.cf | 2 +- tests/acceptance/10_files/07_delete_lines/023.cf | 2 +- tests/acceptance/10_files/07_delete_lines/024.cf | 2 +- tests/acceptance/10_files/07_delete_lines/025.cf | 2 +- tests/acceptance/10_files/07_delete_lines/026.cf | 2 +- tests/acceptance/10_files/07_delete_lines/027.cf | 2 +- tests/acceptance/10_files/07_delete_lines/028.cf | 2 +- tests/acceptance/10_files/07_delete_lines/029.cf | 2 +- tests/acceptance/10_files/07_delete_lines/030.cf | 2 +- tests/acceptance/10_files/07_delete_lines/031.cf | 2 +- tests/acceptance/10_files/07_delete_lines/032.cf | 2 +- tests/acceptance/10_files/07_delete_lines/033.cf | 2 +- tests/acceptance/10_files/07_delete_lines/034.cf | 2 +- tests/acceptance/10_files/07_delete_lines/035.cf | 2 +- tests/acceptance/10_files/07_delete_lines/036.cf | 2 +- tests/acceptance/10_files/07_delete_lines/037.cf | 2 +- tests/acceptance/10_files/07_delete_lines/038.cf | 2 +- tests/acceptance/10_files/07_delete_lines/039.cf | 2 +- tests/acceptance/10_files/07_delete_lines/040.cf | 2 +- tests/acceptance/10_files/07_delete_lines/041.cf | 2 +- tests/acceptance/10_files/07_delete_lines/042.cf | 2 +- tests/acceptance/10_files/07_delete_lines/043.cf | 2 +- tests/acceptance/10_files/07_delete_lines/044.cf | 2 +- tests/acceptance/10_files/07_delete_lines/045.cf | 2 +- tests/acceptance/10_files/07_delete_lines/046.cf | 2 +- tests/acceptance/10_files/07_delete_lines/047.cf | 2 +- tests/acceptance/10_files/07_delete_lines/101.cf | 2 +- tests/acceptance/10_files/07_delete_lines/102.cf | 2 +- tests/acceptance/10_files/07_delete_lines/103.cf | 2 +- tests/acceptance/10_files/07_delete_lines/104.cf | 2 +- tests/acceptance/10_files/07_delete_lines/105.cf | 2 +- tests/acceptance/10_files/07_delete_lines/106.cf | 2 +- tests/acceptance/10_files/07_delete_lines/107.cf | 2 +- tests/acceptance/10_files/07_delete_lines/108.cf | 2 +- tests/acceptance/10_files/07_delete_lines/109.cf | 2 +- tests/acceptance/10_files/07_delete_lines/110.cf | 2 +- tests/acceptance/10_files/07_delete_lines/111.cf | 2 +- tests/acceptance/10_files/07_delete_lines/112.cf | 2 +- tests/acceptance/10_files/07_delete_lines/113.cf | 2 +- tests/acceptance/10_files/07_delete_lines/114.cf | 2 +- tests/acceptance/10_files/07_delete_lines/115.cf | 2 +- tests/acceptance/10_files/07_delete_lines/116.cf | 2 +- tests/acceptance/10_files/07_delete_lines/117.cf | 2 +- tests/acceptance/10_files/07_delete_lines/118.cf | 2 +- tests/acceptance/10_files/07_delete_lines/119.cf | 2 +- tests/acceptance/10_files/07_delete_lines/120.cf | 2 +- tests/acceptance/10_files/07_delete_lines/122.cf | 2 +- tests/acceptance/10_files/07_delete_lines/123.cf | 2 +- tests/acceptance/10_files/07_delete_lines/124.cf | 2 +- tests/acceptance/10_files/07_delete_lines/125.cf | 2 +- tests/acceptance/10_files/07_delete_lines/126.cf | 2 +- tests/acceptance/10_files/07_delete_lines/127.cf | 2 +- tests/acceptance/10_files/07_delete_lines/128.cf | 2 +- tests/acceptance/10_files/07_delete_lines/129.cf | 2 +- tests/acceptance/10_files/07_delete_lines/130.cf | 2 +- tests/acceptance/10_files/07_delete_lines/131.cf | 2 +- tests/acceptance/10_files/07_delete_lines/132.cf | 2 +- tests/acceptance/10_files/07_delete_lines/133.cf | 2 +- tests/acceptance/10_files/07_delete_lines/134.cf | 2 +- tests/acceptance/10_files/07_delete_lines/135.cf | 2 +- tests/acceptance/10_files/07_delete_lines/136.cf | 2 +- tests/acceptance/10_files/07_delete_lines/137.cf | 2 +- tests/acceptance/10_files/07_delete_lines/138.cf | 2 +- tests/acceptance/10_files/07_delete_lines/139.cf | 2 +- tests/acceptance/10_files/07_delete_lines/140.cf | 2 +- tests/acceptance/10_files/07_delete_lines/141.cf | 2 +- tests/acceptance/10_files/07_delete_lines/142.cf | 2 +- tests/acceptance/10_files/07_delete_lines/143.cf | 2 +- tests/acceptance/10_files/07_delete_lines/144.cf | 2 +- tests/acceptance/10_files/07_delete_lines/145.cf | 2 +- tests/acceptance/10_files/07_delete_lines/146.cf | 2 +- tests/acceptance/10_files/07_delete_lines/147.cf | 2 +- tests/acceptance/10_files/07_delete_lines/201.cf | 2 +- tests/acceptance/10_files/07_delete_lines/202.cf | 2 +- tests/acceptance/10_files/07_delete_lines/203.cf | 2 +- tests/acceptance/10_files/07_delete_lines/204.cf | 2 +- tests/acceptance/10_files/07_delete_lines/205.cf | 2 +- tests/acceptance/10_files/07_delete_lines/206.cf | 2 +- tests/acceptance/10_files/07_delete_lines/207.cf | 2 +- tests/acceptance/10_files/07_delete_lines/208.cf | 2 +- tests/acceptance/10_files/07_delete_lines/209.cf | 2 +- tests/acceptance/10_files/07_delete_lines/210.cf | 2 +- tests/acceptance/10_files/07_delete_lines/211.cf | 2 +- tests/acceptance/10_files/07_delete_lines/212.cf | 2 +- tests/acceptance/10_files/07_delete_lines/213.cf | 2 +- tests/acceptance/10_files/07_delete_lines/214.cf | 2 +- tests/acceptance/10_files/07_delete_lines/215.cf | 2 +- tests/acceptance/10_files/07_delete_lines/216.cf | 2 +- tests/acceptance/10_files/07_delete_lines/217.cf | 2 +- tests/acceptance/10_files/07_delete_lines/218.cf | 2 +- tests/acceptance/10_files/07_delete_lines/219.cf | 2 +- tests/acceptance/10_files/07_delete_lines/220.cf | 2 +- tests/acceptance/10_files/07_delete_lines/222.cf | 2 +- tests/acceptance/10_files/07_delete_lines/223.cf | 2 +- tests/acceptance/10_files/07_delete_lines/224.cf | 2 +- tests/acceptance/10_files/07_delete_lines/225.cf | 2 +- tests/acceptance/10_files/07_delete_lines/226.cf | 2 +- tests/acceptance/10_files/07_delete_lines/227.cf | 2 +- tests/acceptance/10_files/07_delete_lines/228.cf | 2 +- tests/acceptance/10_files/07_delete_lines/229.cf | 2 +- tests/acceptance/10_files/07_delete_lines/230.cf | 2 +- tests/acceptance/10_files/07_delete_lines/231.cf | 2 +- tests/acceptance/10_files/07_delete_lines/232.cf | 2 +- tests/acceptance/10_files/07_delete_lines/233.cf | 2 +- tests/acceptance/10_files/07_delete_lines/234.cf | 2 +- tests/acceptance/10_files/07_delete_lines/235.cf | 2 +- tests/acceptance/10_files/07_delete_lines/236.cf | 2 +- tests/acceptance/10_files/07_delete_lines/237.cf | 2 +- tests/acceptance/10_files/07_delete_lines/238.cf | 2 +- tests/acceptance/10_files/07_delete_lines/239.cf | 2 +- tests/acceptance/10_files/07_delete_lines/240.cf | 2 +- tests/acceptance/10_files/07_delete_lines/241.cf | 2 +- tests/acceptance/10_files/07_delete_lines/242.cf | 2 +- tests/acceptance/10_files/07_delete_lines/243.cf | 2 +- tests/acceptance/10_files/07_delete_lines/244.cf | 2 +- tests/acceptance/10_files/07_delete_lines/245.cf | 2 +- tests/acceptance/10_files/07_delete_lines/246.cf | 2 +- tests/acceptance/10_files/07_delete_lines/247.cf | 2 +- tests/acceptance/10_files/07_delete_lines/301.cf | 2 +- tests/acceptance/10_files/07_delete_lines/302.cf | 2 +- tests/acceptance/10_files/07_delete_lines/303.cf | 2 +- tests/acceptance/10_files/07_delete_lines/304.cf | 2 +- tests/acceptance/10_files/07_delete_lines/305.cf | 2 +- tests/acceptance/10_files/07_delete_lines/306.cf | 2 +- tests/acceptance/10_files/07_delete_lines/307.cf | 2 +- tests/acceptance/10_files/07_delete_lines/308.cf | 2 +- tests/acceptance/10_files/07_delete_lines/309.cf | 2 +- tests/acceptance/10_files/07_delete_lines/310.cf | 2 +- tests/acceptance/10_files/07_delete_lines/311.cf | 2 +- tests/acceptance/10_files/07_delete_lines/312.cf | 2 +- tests/acceptance/10_files/07_delete_lines/313.cf | 2 +- tests/acceptance/10_files/07_delete_lines/314.cf | 2 +- tests/acceptance/10_files/07_delete_lines/315.cf | 2 +- tests/acceptance/10_files/07_delete_lines/316.cf | 2 +- tests/acceptance/10_files/07_delete_lines/317.cf | 2 +- tests/acceptance/10_files/07_delete_lines/318.cf | 2 +- tests/acceptance/10_files/07_delete_lines/319.cf | 2 +- tests/acceptance/10_files/07_delete_lines/320.cf | 2 +- tests/acceptance/10_files/07_delete_lines/322.cf | 2 +- tests/acceptance/10_files/07_delete_lines/323.cf | 2 +- tests/acceptance/10_files/07_delete_lines/324.cf | 2 +- tests/acceptance/10_files/07_delete_lines/325.cf | 2 +- tests/acceptance/10_files/07_delete_lines/326.cf | 2 +- tests/acceptance/10_files/07_delete_lines/327.cf | 2 +- tests/acceptance/10_files/07_delete_lines/328.cf | 2 +- tests/acceptance/10_files/07_delete_lines/329.cf | 2 +- tests/acceptance/10_files/07_delete_lines/330.cf | 2 +- tests/acceptance/10_files/07_delete_lines/331.cf | 2 +- tests/acceptance/10_files/07_delete_lines/332.cf | 2 +- tests/acceptance/10_files/07_delete_lines/333.cf | 2 +- tests/acceptance/10_files/07_delete_lines/334.cf | 2 +- tests/acceptance/10_files/07_delete_lines/335.cf | 2 +- tests/acceptance/10_files/07_delete_lines/336.cf | 2 +- tests/acceptance/10_files/07_delete_lines/337.cf | 2 +- tests/acceptance/10_files/07_delete_lines/338.cf | 2 +- tests/acceptance/10_files/07_delete_lines/339.cf | 2 +- tests/acceptance/10_files/07_delete_lines/340.cf | 2 +- tests/acceptance/10_files/07_delete_lines/341.cf | 2 +- tests/acceptance/10_files/07_delete_lines/342.cf | 2 +- tests/acceptance/10_files/07_delete_lines/343.cf | 2 +- tests/acceptance/10_files/07_delete_lines/344.cf | 2 +- tests/acceptance/10_files/07_delete_lines/345.cf | 2 +- tests/acceptance/10_files/07_delete_lines/346.cf | 2 +- tests/acceptance/10_files/07_delete_lines/347.cf | 2 +- tests/acceptance/10_files/07_delete_lines/401.cf | 2 +- tests/acceptance/10_files/07_delete_lines/402.cf | 2 +- tests/acceptance/10_files/07_delete_lines/403.cf | 2 +- tests/acceptance/10_files/07_delete_lines/404.cf | 2 +- tests/acceptance/10_files/07_delete_lines/405.cf | 2 +- tests/acceptance/10_files/07_delete_lines/406.cf | 2 +- tests/acceptance/10_files/07_delete_lines/407.cf | 2 +- tests/acceptance/10_files/07_delete_lines/408.cf | 2 +- tests/acceptance/10_files/07_delete_lines/409.cf | 2 +- tests/acceptance/10_files/07_delete_lines/410.cf | 2 +- tests/acceptance/10_files/07_delete_lines/411.cf | 2 +- tests/acceptance/10_files/07_delete_lines/412.cf | 2 +- tests/acceptance/10_files/07_delete_lines/413.cf | 2 +- tests/acceptance/10_files/07_delete_lines/414.cf | 2 +- tests/acceptance/10_files/07_delete_lines/415.cf | 2 +- tests/acceptance/10_files/07_delete_lines/416.cf | 2 +- tests/acceptance/10_files/07_delete_lines/417.cf | 2 +- tests/acceptance/10_files/07_delete_lines/418.cf | 2 +- tests/acceptance/10_files/07_delete_lines/419.cf | 2 +- tests/acceptance/10_files/07_delete_lines/420.cf | 2 +- tests/acceptance/10_files/07_delete_lines/422.cf | 2 +- tests/acceptance/10_files/07_delete_lines/423.cf | 2 +- tests/acceptance/10_files/07_delete_lines/424.cf | 2 +- tests/acceptance/10_files/07_delete_lines/425.cf | 2 +- tests/acceptance/10_files/07_delete_lines/426.cf | 2 +- tests/acceptance/10_files/07_delete_lines/427.cf | 2 +- tests/acceptance/10_files/07_delete_lines/428.cf | 2 +- tests/acceptance/10_files/07_delete_lines/429.cf | 2 +- tests/acceptance/10_files/07_delete_lines/430.cf | 2 +- tests/acceptance/10_files/07_delete_lines/431.cf | 2 +- tests/acceptance/10_files/07_delete_lines/432.cf | 2 +- tests/acceptance/10_files/07_delete_lines/433.cf | 2 +- tests/acceptance/10_files/07_delete_lines/434.cf | 2 +- tests/acceptance/10_files/07_delete_lines/435.cf | 2 +- tests/acceptance/10_files/07_delete_lines/436.cf | 2 +- tests/acceptance/10_files/07_delete_lines/437.cf | 2 +- tests/acceptance/10_files/07_delete_lines/438.cf | 2 +- tests/acceptance/10_files/07_delete_lines/439.cf | 2 +- tests/acceptance/10_files/07_delete_lines/440.cf | 2 +- tests/acceptance/10_files/07_delete_lines/441.cf | 2 +- tests/acceptance/10_files/07_delete_lines/442.cf | 2 +- tests/acceptance/10_files/07_delete_lines/443.cf | 2 +- tests/acceptance/10_files/07_delete_lines/444.cf | 2 +- tests/acceptance/10_files/07_delete_lines/445.cf | 2 +- tests/acceptance/10_files/07_delete_lines/446.cf | 2 +- tests/acceptance/10_files/07_delete_lines/447.cf | 2 +- tests/acceptance/10_files/07_delete_lines/501.cf | 2 +- tests/acceptance/10_files/07_delete_lines/502.cf | 2 +- tests/acceptance/10_files/07_delete_lines/503.cf | 2 +- tests/acceptance/10_files/07_delete_lines/504.cf | 2 +- tests/acceptance/10_files/07_delete_lines/505.cf | 2 +- tests/acceptance/10_files/07_delete_lines/506.cf | 2 +- tests/acceptance/10_files/07_delete_lines/507.cf | 2 +- tests/acceptance/10_files/07_delete_lines/508.cf | 2 +- tests/acceptance/10_files/07_delete_lines/509.cf | 2 +- tests/acceptance/10_files/07_delete_lines/510.cf | 2 +- tests/acceptance/10_files/07_delete_lines/511.cf | 2 +- tests/acceptance/10_files/07_delete_lines/512.cf | 2 +- tests/acceptance/10_files/07_delete_lines/513.cf | 2 +- tests/acceptance/10_files/07_delete_lines/514.cf | 2 +- tests/acceptance/10_files/07_delete_lines/515.cf | 2 +- tests/acceptance/10_files/07_delete_lines/516.cf | 2 +- tests/acceptance/10_files/07_delete_lines/517.cf | 2 +- tests/acceptance/10_files/07_delete_lines/518.cf | 2 +- tests/acceptance/10_files/07_delete_lines/519.cf | 2 +- tests/acceptance/10_files/07_delete_lines/520.cf | 2 +- tests/acceptance/10_files/07_delete_lines/522.cf | 2 +- tests/acceptance/10_files/07_delete_lines/523.cf | 2 +- tests/acceptance/10_files/07_delete_lines/524.cf | 2 +- tests/acceptance/10_files/07_delete_lines/525.cf | 2 +- tests/acceptance/10_files/07_delete_lines/526.cf | 2 +- tests/acceptance/10_files/07_delete_lines/527.cf | 2 +- tests/acceptance/10_files/07_delete_lines/528.cf | 2 +- tests/acceptance/10_files/07_delete_lines/529.cf | 2 +- tests/acceptance/10_files/07_delete_lines/530.cf | 2 +- tests/acceptance/10_files/07_delete_lines/531.cf | 2 +- tests/acceptance/10_files/07_delete_lines/532.cf | 2 +- tests/acceptance/10_files/07_delete_lines/533.cf | 2 +- tests/acceptance/10_files/07_delete_lines/534.cf | 2 +- tests/acceptance/10_files/07_delete_lines/535.cf | 2 +- tests/acceptance/10_files/07_delete_lines/536.cf | 2 +- tests/acceptance/10_files/07_delete_lines/537.cf | 2 +- tests/acceptance/10_files/07_delete_lines/538.cf | 2 +- tests/acceptance/10_files/07_delete_lines/539.cf | 2 +- tests/acceptance/10_files/07_delete_lines/540.cf | 2 +- tests/acceptance/10_files/07_delete_lines/541.cf | 2 +- tests/acceptance/10_files/07_delete_lines/542.cf | 2 +- tests/acceptance/10_files/07_delete_lines/543.cf | 2 +- tests/acceptance/10_files/07_delete_lines/544.cf | 2 +- tests/acceptance/10_files/07_delete_lines/545.cf | 2 +- tests/acceptance/10_files/07_delete_lines/546.cf | 2 +- tests/acceptance/10_files/07_delete_lines/547.cf | 2 +- tests/acceptance/10_files/07_delete_lines/601.cf | 2 +- tests/acceptance/10_files/07_delete_lines/602.cf | 2 +- tests/acceptance/10_files/07_delete_lines/603.cf | 2 +- tests/acceptance/10_files/07_delete_lines/604.cf | 2 +- tests/acceptance/10_files/07_delete_lines/605.cf | 2 +- tests/acceptance/10_files/07_delete_lines/606.cf | 2 +- tests/acceptance/10_files/07_delete_lines/607.cf | 2 +- tests/acceptance/10_files/07_delete_lines/608.cf | 2 +- tests/acceptance/10_files/07_delete_lines/609.cf | 2 +- tests/acceptance/10_files/07_delete_lines/610.cf | 2 +- tests/acceptance/10_files/07_delete_lines/611.cf | 2 +- tests/acceptance/10_files/07_delete_lines/612.cf | 2 +- tests/acceptance/10_files/07_delete_lines/613.cf | 2 +- tests/acceptance/10_files/07_delete_lines/614.cf | 2 +- tests/acceptance/10_files/07_delete_lines/615.cf | 2 +- tests/acceptance/10_files/07_delete_lines/616.cf | 2 +- tests/acceptance/10_files/07_delete_lines/617.cf | 2 +- tests/acceptance/10_files/07_delete_lines/618.cf | 2 +- tests/acceptance/10_files/07_delete_lines/619.cf | 2 +- tests/acceptance/10_files/07_delete_lines/620.cf | 2 +- tests/acceptance/10_files/07_delete_lines/622.cf | 2 +- tests/acceptance/10_files/07_delete_lines/623.cf | 2 +- tests/acceptance/10_files/07_delete_lines/624.cf | 2 +- tests/acceptance/10_files/07_delete_lines/625.cf | 2 +- tests/acceptance/10_files/07_delete_lines/626.cf | 2 +- tests/acceptance/10_files/07_delete_lines/627.cf | 2 +- tests/acceptance/10_files/07_delete_lines/628.cf | 2 +- tests/acceptance/10_files/07_delete_lines/629.cf | 2 +- tests/acceptance/10_files/07_delete_lines/630.cf | 2 +- tests/acceptance/10_files/07_delete_lines/631.cf | 2 +- tests/acceptance/10_files/07_delete_lines/632.cf | 2 +- tests/acceptance/10_files/07_delete_lines/633.cf | 2 +- tests/acceptance/10_files/07_delete_lines/634.cf | 2 +- tests/acceptance/10_files/07_delete_lines/635.cf | 2 +- tests/acceptance/10_files/07_delete_lines/636.cf | 2 +- tests/acceptance/10_files/07_delete_lines/637.cf | 2 +- tests/acceptance/10_files/07_delete_lines/638.cf | 2 +- tests/acceptance/10_files/07_delete_lines/639.cf | 2 +- tests/acceptance/10_files/07_delete_lines/640.cf | 2 +- tests/acceptance/10_files/07_delete_lines/641.cf | 2 +- tests/acceptance/10_files/07_delete_lines/642.cf | 2 +- tests/acceptance/10_files/07_delete_lines/643.cf | 2 +- tests/acceptance/10_files/07_delete_lines/644.cf | 2 +- tests/acceptance/10_files/07_delete_lines/645.cf | 2 +- tests/acceptance/10_files/07_delete_lines/646.cf | 2 +- tests/acceptance/10_files/07_delete_lines/647.cf | 2 +- tests/acceptance/10_files/07_delete_lines/700.cf | 2 +- .../10_files/07_delete_lines/no_matching_end.cf | 2 +- .../07_delete_lines/select_end_match_eof_true.cf | 2 +- tests/acceptance/10_files/08_field_edits/001.cf | 2 +- tests/acceptance/10_files/08_field_edits/002.cf | 2 +- tests/acceptance/10_files/08_field_edits/003.cf | 2 +- tests/acceptance/10_files/08_field_edits/004.x.cf | 2 +- tests/acceptance/10_files/08_field_edits/005.cf | 2 +- tests/acceptance/10_files/08_field_edits/006.x.cf | 2 +- tests/acceptance/10_files/08_field_edits/007.x.cf | 2 +- tests/acceptance/10_files/08_field_edits/008.x.cf | 2 +- tests/acceptance/10_files/08_field_edits/009.cf | 2 +- tests/acceptance/10_files/08_field_edits/010.cf | 2 +- tests/acceptance/10_files/08_field_edits/015.cf | 2 +- tests/acceptance/10_files/08_field_edits/016.cf | 2 +- tests/acceptance/10_files/08_field_edits/017.cf | 2 +- tests/acceptance/10_files/08_field_edits/018.cf | 2 +- tests/acceptance/10_files/08_field_edits/019.cf | 2 +- tests/acceptance/10_files/08_field_edits/020.cf | 2 +- tests/acceptance/10_files/08_field_edits/023.cf | 2 +- tests/acceptance/10_files/08_field_edits/024.cf | 2 +- tests/acceptance/10_files/08_field_edits/027.cf | 2 +- tests/acceptance/10_files/08_field_edits/028.cf | 2 +- tests/acceptance/10_files/08_field_edits/029.cf | 2 +- tests/acceptance/10_files/08_field_edits/030.cf | 2 +- tests/acceptance/10_files/08_field_edits/031.cf | 2 +- tests/acceptance/10_files/08_field_edits/032.cf | 2 +- tests/acceptance/10_files/08_field_edits/033.cf | 2 +- tests/acceptance/10_files/08_field_edits/036.cf | 2 +- tests/acceptance/10_files/08_field_edits/037.cf | 2 +- tests/acceptance/10_files/08_field_edits/038.x.cf | 2 +- .../10_files/08_field_edits/file_content.cf | 2 +- .../10_files/08_field_edits/file_content.error.cf | 2 +- .../08_field_edits/set_classes_in_warn_only.cf | 3 +-- .../set_empty_field_erroneous_message.cf | 2 +- .../set_empty_field_erroneous_message.cf.sub | 2 +- .../10_files/08_field_edits/set_value_line_long.cf | 2 +- .../10_files/08_field_edits/staging/011.x.cf | 2 +- .../10_files/08_field_edits/staging/012.x.cf | 2 +- .../10_files/08_field_edits/staging/013.x.cf | 2 +- .../10_files/08_field_edits/staging/014.x.cf | 2 +- .../10_files/08_field_edits/staging/021.x.cf | 2 +- .../10_files/08_field_edits/staging/022.x.cf | 2 +- .../10_files/08_field_edits/staging/025.cf | 2 +- .../10_files/08_field_edits/staging/026.cf | 2 +- .../10_files/08_field_edits/staging/034.x.cf | 2 +- .../10_files/08_field_edits/staging/035.x.cf | 2 +- .../10_files/08_field_edits/staging/039.cf | 2 +- .../10_files/08_field_edits/staging/040.cf | 2 +- .../10_files/08_field_edits/staging/041.x.cf | 2 +- .../10_files/08_field_edits/staging/042.x.cf | 2 +- .../10_files/08_field_edits/staging/043.x.cf | 2 +- .../10_files/08_field_edits/staging/044.x.cf | 2 +- .../10_files/08_field_edits/staging/045.x.cf | 2 +- .../10_files/08_field_edits/staging/046.x.cf | 2 +- tests/acceptance/10_files/09_insert_lines/001.cf | 2 +- tests/acceptance/10_files/09_insert_lines/002.cf | 2 +- tests/acceptance/10_files/09_insert_lines/003.cf | 2 +- tests/acceptance/10_files/09_insert_lines/004.cf | 2 +- tests/acceptance/10_files/09_insert_lines/005.cf | 2 +- tests/acceptance/10_files/09_insert_lines/006.cf | 2 +- tests/acceptance/10_files/09_insert_lines/007.cf | 2 +- tests/acceptance/10_files/09_insert_lines/008.cf | 2 +- tests/acceptance/10_files/09_insert_lines/009.cf | 2 +- tests/acceptance/10_files/09_insert_lines/010.cf | 2 +- tests/acceptance/10_files/09_insert_lines/011.cf | 2 +- tests/acceptance/10_files/09_insert_lines/012.cf | 2 +- tests/acceptance/10_files/09_insert_lines/013.cf | 2 +- tests/acceptance/10_files/09_insert_lines/014.cf | 2 +- tests/acceptance/10_files/09_insert_lines/015.cf | 2 +- tests/acceptance/10_files/09_insert_lines/016.cf | 2 +- tests/acceptance/10_files/09_insert_lines/017.cf | 2 +- tests/acceptance/10_files/09_insert_lines/019.cf | 2 +- tests/acceptance/10_files/09_insert_lines/020.cf | 2 +- tests/acceptance/10_files/09_insert_lines/021.cf | 2 +- tests/acceptance/10_files/09_insert_lines/101.cf | 2 +- tests/acceptance/10_files/09_insert_lines/102.cf | 2 +- tests/acceptance/10_files/09_insert_lines/103.cf | 2 +- tests/acceptance/10_files/09_insert_lines/104.cf | 2 +- tests/acceptance/10_files/09_insert_lines/105.cf | 2 +- tests/acceptance/10_files/09_insert_lines/106.cf | 2 +- tests/acceptance/10_files/09_insert_lines/107.cf | 2 +- tests/acceptance/10_files/09_insert_lines/108.cf | 2 +- tests/acceptance/10_files/09_insert_lines/109.cf | 2 +- tests/acceptance/10_files/09_insert_lines/112.cf | 2 +- tests/acceptance/10_files/09_insert_lines/113.cf | 2 +- tests/acceptance/10_files/09_insert_lines/114.cf | 2 +- tests/acceptance/10_files/09_insert_lines/115.cf | 2 +- tests/acceptance/10_files/09_insert_lines/116.cf | 2 +- tests/acceptance/10_files/09_insert_lines/117.cf | 2 +- tests/acceptance/10_files/09_insert_lines/118.cf | 2 +- tests/acceptance/10_files/09_insert_lines/119.cf | 2 +- tests/acceptance/10_files/09_insert_lines/121.cf | 2 +- tests/acceptance/10_files/09_insert_lines/122.cf | 2 +- tests/acceptance/10_files/09_insert_lines/201.cf | 2 +- tests/acceptance/10_files/09_insert_lines/202.cf | 2 +- tests/acceptance/10_files/09_insert_lines/203.cf | 2 +- tests/acceptance/10_files/09_insert_lines/204.cf | 2 +- tests/acceptance/10_files/09_insert_lines/205.cf | 2 +- tests/acceptance/10_files/09_insert_lines/206.cf | 2 +- tests/acceptance/10_files/09_insert_lines/207.cf | 2 +- tests/acceptance/10_files/09_insert_lines/208.cf | 2 +- tests/acceptance/10_files/09_insert_lines/212.cf | 2 +- tests/acceptance/10_files/09_insert_lines/213.cf | 2 +- tests/acceptance/10_files/09_insert_lines/214.cf | 2 +- tests/acceptance/10_files/09_insert_lines/215.cf | 2 +- tests/acceptance/10_files/09_insert_lines/216.cf | 2 +- tests/acceptance/10_files/09_insert_lines/217.cf | 2 +- tests/acceptance/10_files/09_insert_lines/218.cf | 2 +- tests/acceptance/10_files/09_insert_lines/219.cf | 2 +- tests/acceptance/10_files/09_insert_lines/221.cf | 2 +- tests/acceptance/10_files/09_insert_lines/222.cf | 2 +- tests/acceptance/10_files/09_insert_lines/300.cf | 2 +- tests/acceptance/10_files/09_insert_lines/301.cf | 2 +- tests/acceptance/10_files/09_insert_lines/302.cf | 2 +- tests/acceptance/10_files/09_insert_lines/303.cf | 2 +- tests/acceptance/10_files/09_insert_lines/400.cf | 2 +- .../09_insert_lines/block_insert_duplicate.cf | 3 +-- .../10_files/09_insert_lines/block_insert_order.cf | 2 +- .../10_files/09_insert_lines/crlf-in-cftemplate.cf | 2 +- .../09_insert_lines/crlf-in-edit_line-insert-file.cf | 2 +- .../10_files/09_insert_lines/crlf-in-edit_line.cf | 2 +- .../10_files/09_insert_lines/crlf-in-mustache.cf | 2 +- .../edit_line_bundle_called_from_namespace.cf | 2 +- .../10_files/09_insert_lines/insert-large-lines.cf | 2 +- .../insert_line_end_do_not_match_eof_control_body.cf | 2 +- .../09_insert_lines/insert_line_end_match_eof.cf | 2 +- .../insert_line_end_match_eof_control_body.cf | 2 +- .../insert_line_end_match_eof_default.cf | 2 +- .../09_insert_lines/insertion-order-reversal.cf | 2 +- .../10_files/09_insert_lines/multi-files-dirs.cf | 2 +- .../09_insert_lines/namespaced_edit_line_bundle.cf | 2 +- .../09_insert_lines/nothing_to_repeat_error.cf | 2 +- .../09_insert_lines/nothing_to_repeat_error.cf.sub | 2 +- .../09_insert_lines/preserve_block_blank_lines.cf | 2 +- .../09_insert_lines/same_text_in_two_regions.cf | 2 +- .../10_files/09_insert_lines/selectlinematching.cf | 2 +- .../09_insert_lines/selectlinematching.cf.sub_1 | 3 +-- .../09_insert_lines/selectlinematching.cf.sub_2 | 3 +-- .../10_files/09_insert_lines/staging/120.x.cf | 2 +- .../10_files/09_insert_lines/staging/220.x.cf | 2 +- .../10_files/09_insert_lines/staging/304.cf | 2 +- tests/acceptance/10_files/10_links/001.cf | 2 +- tests/acceptance/10_files/10_links/002.cf | 2 +- .../10_files/10_links/delete_dangling_symlink.cf | 2 +- .../acceptance/10_files/10_links/edit_linked_file.cf | 2 +- .../10_links/owner-mismatch-link-and-target.cf | 2 +- .../10_links/select_file_by_symlink_target.cf | 2 +- .../10_files/10_links/select_file_by_type.cf | 2 +- tests/acceptance/10_files/11_xml_edits/CFE-3806.cf | 2 +- .../10_files/11_xml_edits/build_xpath_001.cf | 2 +- .../10_files/11_xml_edits/build_xpath_002.cf | 2 +- .../10_files/11_xml_edits/build_xpath_003.cf | 2 +- .../10_files/11_xml_edits/delete_attribute_001.cf | 2 +- .../10_files/11_xml_edits/delete_attribute_002.cf | 2 +- .../10_files/11_xml_edits/delete_text_001.cf | 2 +- .../10_files/11_xml_edits/delete_text_002.cf | 2 +- .../10_files/11_xml_edits/delete_tree_001.cf | 2 +- .../10_files/11_xml_edits/delete_tree_002.cf | 2 +- .../10_files/11_xml_edits/insert_host_example.cf | 2 +- .../10_files/11_xml_edits/insert_text_001.cf | 2 +- .../10_files/11_xml_edits/insert_text_002.cf | 2 +- .../10_files/11_xml_edits/insert_tree_001.cf | 2 +- .../10_files/11_xml_edits/insert_tree_003.cf | 2 +- .../10_files/11_xml_edits/set_attribute_001.cf | 2 +- .../10_files/11_xml_edits/set_attribute_002.cf | 2 +- .../10_files/11_xml_edits/set_attribute_003.cf | 2 +- .../acceptance/10_files/11_xml_edits/set_text_001.cf | 2 +- .../acceptance/10_files/11_xml_edits/set_text_002.cf | 2 +- .../10_files/11_xml_edits/staging/insert_tree_002.cf | 2 +- .../10_files/11_xml_edits/staging/insert_tree_004.cf | 2 +- tests/acceptance/10_files/12_acl/acl.cf | 2 +- tests/acceptance/10_files/12_acl/acl.cf.sub | 2 +- tests/acceptance/10_files/12_acl/file_copy_acl.cf | 2 +- tests/acceptance/10_files/12_acl/file_edit_acl.cf | 2 +- tests/acceptance/10_files/12_acl/getacls.cf | 2 +- tests/acceptance/10_files/13_file_dir/001.cf | 2 +- tests/acceptance/10_files/13_file_dir/001.cf.sub | 3 +-- .../13_file_dir/never_delete_nonempty_dir.cf | 2 +- .../10_files/13_file_dir/never_delete_parent_dir.cf | 2 +- ...ing_symlinks_does_not_constantly_report_change.cf | 3 +-- ...symlinks_does_not_constantly_report_change.cf.sub | 3 +-- .../agent_control_default_directory_create_mode.cf | 2 +- ...ingle_copy_does_not_apply_to_nonmatching_files.cf | 2 +- ...gle_copy_does_not_apply_to_nonmatching_files_1.cf | 2 +- ...gle_copy_does_not_apply_to_nonmatching_files_2.cf | 2 +- ...gle_copy_does_not_apply_to_nonmatching_files_3.cf | 2 +- ...gle_copy_does_not_apply_to_nonmatching_files_4.cf | 2 +- ...gle_copy_does_not_apply_to_nonmatching_files_5.cf | 2 +- ...e_copy_prevents_subsequent_copy_on_exact_match.cf | 2 +- ...ts_subsequent_copy_on_regular_expression_match.cf | 2 +- ..._set_sticky_bits_without_root_owning_directory.cf | 2 +- tests/acceptance/10_files/copy_from_convert.cf | 2 +- .../acceptance/10_files/copy_from_preserve_false.cf | 2 +- tests/acceptance/10_files/copy_from_this_promiser.cf | 2 +- tests/acceptance/10_files/copy_local_file.cf | 2 +- tests/acceptance/10_files/copy_local_file3.cf | 2 +- .../file_select_attrs_consistent_behavior/main.cf | 2 +- tests/acceptance/10_files/files_with_spaces.cf | 2 +- ...ocally_copied_sparse_file_preserves_sparseness.cf | 2 +- .../10_files/move_obstruction_respects_warn_only.cf | 2 +- .../move_obstructions-promiser-is-symlink.cf | 2 +- ...he_missing_variable_is_empty_string_by_default.cf | 2 +- .../10_files/mustache_propagates_failure.cf | 2 +- .../mustache_render_multiline_template_data.cf | 2 +- .../acceptance/10_files/mustache_respects_dryryn.cf | 2 +- .../10_files/mustache_respects_dryryn.cf.sub | 2 +- .../10_files/mustache_respects_dryryn_option.cf | 2 +- .../10_files/mustache_respects_dryryn_option.cf.sub | 2 +- .../10_files/mustache_respects_warn_only.cf | 2 +- ...ous_backup_using_copy_from_without_create_true.cf | 2 +- ...backup_using_copy_from_without_create_true.cf.sub | 2 +- .../acceptance/10_files/purge_reports_as_repaired.cf | 2 +- tests/acceptance/10_files/rename/main.cf | 2 +- .../10_files/replace_patterns/basic_replace.cf | 2 +- .../10_files/replace_patterns/noop_replace.cf | 2 +- .../replace_patterns/staging/advanced_replace.cf | 2 +- .../acceptance/10_files/templating/basic_classes.cf | 2 +- tests/acceptance/10_files/templating/cftemplate.cf | 2 +- ...e_wont_render_cf_null_with_empty_datacontainer.cf | 4 +--- ...mustache_edit_template_string_vs_edit_template.cf | 3 +-- ...stache_edit_template_string_vs_string_mustache.cf | 2 +- .../10_files/templating/empty_template_empty_file.cf | 2 +- .../10_files/templating/large_template_blocks.cf | 2 +- tests/acceptance/10_files/templating/missing_file.cf | 2 +- .../10_files/templating/missing_template_file.cf | 2 +- .../acceptance/10_files/templating/mustache_abuse.cf | 2 +- .../templating/mustache_container_serialization.cf | 2 +- .../10_files/templating/mustache_datastate_demo.cf | 2 +- .../acceptance/10_files/templating/mustache_demo.cf | 2 +- .../templating/mustache_expect_list_find_string.cf | 2 +- .../mustache_from_json_or_classic_array.cf | 2 +- .../10_files/templating/mustache_html_escape.cf | 2 +- .../10_files/templating/mustache_inline_demo.cf | 2 +- .../10_files/templating/mustache_invalid_template.cf | 2 +- .../templating/mustache_invalid_template_data.cf | 2 +- ...llback_to_datastate_with_undefined_direct_data.cf | 2 +- ...fallback_to_datastate_with_undefined_mergedata.cf | 2 +- ...o_datastate_with_undefined_parsejson_storejson.cf | 2 +- .../mustache_no_render_with_undefined_direct_data.cf | 2 +- .../mustache_no_render_with_undefined_mergedata.cf | 2 +- ...e_no_render_with_undefined_parsejson_storejson.cf | 2 +- .../10_files/templating/mustache_render_quote.cf | 2 +- .../10_files/templating/mustache_repair_existing.cf | 2 +- .../10_files/templating/mustache_section.cf | 2 +- .../templating/mustache_top_level_iteration.cf | 2 +- .../10_files/templating/staging/array_expansion.cf | 2 +- .../templating/timed/expired_edit_line_locks.cf | 2 +- .../templating/timed/expired_edit_line_locks.cf.sub | 4 +--- tests/acceptance/10_files/this_promiser.cf | 2 +- tests/acceptance/10_files/unsafe/00_immutable.cf | 2 +- tests/acceptance/10_files/unsafe/01_immutable.cf | 2 +- tests/acceptance/10_files/unsafe/02_immutable.cf | 2 +- tests/acceptance/10_files/unsafe/03_immutable.cf | 2 +- tests/acceptance/10_files/unsafe/04_immutable.cf | 2 +- tests/acceptance/10_files/unsafe/05_immutable.cf | 2 +- tests/acceptance/10_files/unsafe/06_immutable.cf | 2 +- tests/acceptance/10_files/unsafe/07_immutable.cf | 2 +- tests/acceptance/10_files/unsafe/08_immutable.cf | 2 +- tests/acceptance/10_files/unsafe/09_immutable.cf | 2 +- tests/acceptance/10_files/unsafe/10_immutable.cf | 2 +- tests/acceptance/10_files/unsafe/11_immutable.cf | 2 +- tests/acceptance/10_files/unsafe/12_immutable.cf | 2 +- tests/acceptance/10_files/unsafe/13_immutable.cf | 2 +- ...n_set_sticky_bits_with_nonroot_owner_and_group.cf | 2 +- ...und-group-perms-if-no-listed-candidate-matches.cf | 3 +-- ...ound-user-perms-if-no-listed-candidate-matches.cf | 3 +-- .../acceptance/10_files/zendesk_1776/zendesk_1776.cf | 2 +- .../10_files/zendesk_1776/zendesk_1776.cf.sub | 3 +-- .../acceptance/10_files/zendesk_1779/zendesk_1779.cf | 2 +- .../10_files/zendesk_1779/zendesk_1779.cf.sub | 3 +-- .../00_syntax/missing_database_operation.cf | 2 +- tests/acceptance/14_reports/00_output/001.cf | 2 +- tests/acceptance/14_reports/00_output/001.cf.sub | 2 +- tests/acceptance/14_reports/00_output/002.cf | 2 +- .../acceptance/14_reports/00_output/report_array.cf | 2 +- .../14_reports/00_output/report_nested_variable.cf | 2 +- tests/acceptance/14_reports/00_output/report_once.cf | 2 +- .../00_output/staging/report_in_common_bundle.cf | 2 +- .../14_reports/00_output/unresolved_vars.cf | 2 +- .../14_reports/00_output/unresolved_with.cf | 2 +- .../14_reports/failed_reports_are_not_kept.cf | 2 +- .../report_to_file_suppresses_report_to_stdout.cf | 2 +- ...report_to_file_suppresses_report_to_stdout.cf.sub | 3 +-- .../reports_comments_emitted_in_verbose.cf | 2 +- tests/acceptance/15_control/01_common/001.x.cf | 3 +-- tests/acceptance/15_control/01_common/002.x.cf | 3 +-- tests/acceptance/15_control/01_common/003.cf | 3 +-- tests/acceptance/15_control/01_common/004.cf | 3 +-- tests/acceptance/15_control/01_common/007.cf | 3 +-- tests/acceptance/15_control/01_common/011.x.cf | 3 +-- tests/acceptance/15_control/01_common/012.x.cf | 3 +-- tests/acceptance/15_control/01_common/013.cf | 3 +-- tests/acceptance/15_control/01_common/014.cf | 3 +-- tests/acceptance/15_control/01_common/021.cf | 3 +-- tests/acceptance/15_control/01_common/022.cf | 3 +-- .../01_common/classic_evaluation_complex_policy.cf | 2 +- .../classic_evaluation_custom_promise_types.cf | 2 +- .../01_common/classic_evaluation_long_policy.cf | 2 +- .../15_control/01_common/default_bundlesequence.cf | 2 +- .../01_common/default_bundlesequence_namespace.x.cf | 2 +- .../15_control/01_common/inputs_directory.cf | 2 +- .../15_control/01_common/inputs_from_json.cf | 2 +- .../01_common/inputs_from_readstringlist.cf | 2 +- .../01_common/missing_inputs_directory.x.cf | 3 +-- .../acceptance/15_control/01_common/staging/005.x.cf | 3 +-- .../acceptance/15_control/01_common/staging/006.x.cf | 3 +-- .../01_common/top_down_evaluation_complex_policy.cf | 2 +- .../01_common/top_down_evaluation_long_policy.cf | 2 +- tests/acceptance/15_control/02_agent/001.cf | 3 +-- tests/acceptance/15_control/02_agent/002.cf | 3 +-- tests/acceptance/15_control/02_agent/002.x.cf | 3 +-- tests/acceptance/15_control/02_agent/003.cf | 3 +-- tests/acceptance/15_control/02_agent/003.x.cf | 3 +-- tests/acceptance/15_control/02_agent/004.x.cf | 3 +-- tests/acceptance/15_control/02_agent/005.x.cf | 3 +-- tests/acceptance/15_control/02_agent/006.x.cf | 3 +-- tests/acceptance/15_control/02_agent/007.x.cf | 3 +-- tests/acceptance/15_control/02_agent/008.x.cf | 3 +-- tests/acceptance/15_control/02_agent/021.cf | 3 +-- tests/acceptance/15_control/02_agent/022.cf | 3 +-- tests/acceptance/15_control/02_agent/023.cf | 3 +-- tests/acceptance/15_control/02_agent/031.cf | 3 +-- tests/acceptance/15_control/02_agent/109.x.cf | 3 +-- .../15_control/02_agent/abortbundle_classes.cf | 2 +- .../15_control/02_agent/abortbundle_classes.cf.sub | 2 +- .../02_agent/abortbundle_classexpression.cf | 2 +- .../02_agent/abortbundle_classexpression.cf.sub | 2 +- .../02_agent/abortbundle_nomatchclassexpression.cf | 2 +- .../abortbundle_nomatchclassexpression.cf.sub | 2 +- .../15_control/02_agent/abortbundle_regex.cf | 2 +- .../15_control/02_agent/abortbundle_regex.cf.sub | 2 +- .../02_agent/abortclasses_from_common_bundle.x.cf | 3 +-- .../acceptance/15_control/02_agent/staging/024.x.cf | 3 +-- .../acceptance/15_control/02_agent/staging/025.x.cf | 3 +-- .../acceptance/15_control/02_agent/staging/026.x.cf | 3 +-- .../acceptance/15_control/02_agent/staging/027.x.cf | 3 +-- tests/acceptance/15_control/file/file_inputs.cf | 2 +- tests/acceptance/16_cf-serverd/serial/001.cf | 2 +- tests/acceptance/16_cf-serverd/serial/001.cf.sub | 2 +- tests/acceptance/16_cf-serverd/serial/002.cf | 2 +- tests/acceptance/16_cf-serverd/serial/002.cf.sub | 2 +- tests/acceptance/16_cf-serverd/serial/003.cf | 2 +- tests/acceptance/16_cf-serverd/serial/003.cf.sub | 2 +- tests/acceptance/16_cf-serverd/serial/005.cf | 2 +- tests/acceptance/16_cf-serverd/serial/005.cf.sub | 2 +- tests/acceptance/16_cf-serverd/serial/006.cf | 2 +- tests/acceptance/16_cf-serverd/serial/006.cf.sub | 2 +- tests/acceptance/16_cf-serverd/serial/007.cf | 2 +- tests/acceptance/16_cf-serverd/serial/007.cf.sub | 2 +- tests/acceptance/16_cf-serverd/serial/008.cf | 2 +- tests/acceptance/16_cf-serverd/serial/008.cf.sub | 2 +- tests/acceptance/16_cf-serverd/serial/009.cf | 2 +- tests/acceptance/16_cf-serverd/serial/009.cf.sub | 2 +- tests/acceptance/16_cf-serverd/serial/010.cf | 2 +- tests/acceptance/16_cf-serverd/serial/010.cf.sub | 2 +- tests/acceptance/16_cf-serverd/serial/011.cf | 2 +- tests/acceptance/16_cf-serverd/serial/011.cf.sub | 2 +- .../serial/allow_path1_then_deny_path2_a.cf | 2 +- .../serial/allow_path1_then_deny_path2_a.cf.sub | 2 +- .../serial/allow_path1_then_deny_path2_b.cf | 2 +- .../serial/allow_path1_then_deny_path2_b.cf.sub | 2 +- .../serial/allowlegacyconnects_absent.srv | 2 +- .../serial/allowlegacyconnects_closed.srv | 2 +- .../serial/allowlegacyconnects_open.srv | 2 +- .../serial/copied_files_can_be_sparse.cf | 2 +- .../serial/copied_files_can_be_sparse.cf.sub | 2 +- .../16_cf-serverd/serial/copy_from_ciphers_fail.cf | 2 +- .../serial/copy_from_ciphers_fail.cf.sub | 2 +- .../serial/copy_from_ciphers_success.cf | 2 +- .../serial/copy_from_ciphers_success.cf.sub | 2 +- .../serial/copy_from_classic_protocol_fail.cf | 2 +- .../serial/copy_from_classic_protocol_fail.cf.sub | 2 +- .../serial/copy_from_classic_protocol_success.cf | 2 +- .../serial/copy_from_classic_protocol_success.cf.sub | 2 +- .../serial/copy_from_digest_different.cf | 2 +- .../serial/copy_from_digest_different.cf.sub | 2 +- .../serial/copy_from_digest_different_expand_ip.cf | 2 +- .../copy_from_digest_different_expand_ip.cf.sub | 2 +- ...y_from_digest_different_expand_ip_and_shortcut.cf | 2 +- ...om_digest_different_expand_ip_and_shortcut.cf.sub | 2 +- .../copy_from_digest_different_expand_shortcut.cf | 2 +- ...copy_from_digest_different_expand_shortcut.cf.sub | 2 +- .../16_cf-serverd/serial/copy_from_digest_same.cf | 2 +- .../serial/copy_from_digest_same.cf.sub | 2 +- .../serial/copy_from_digest_same_expand_ip.cf | 2 +- .../serial/copy_from_digest_same_expand_ip.cf.sub | 2 +- .../copy_from_digest_same_expand_ip_and_shortcut.cf | 2 +- ...py_from_digest_same_expand_ip_and_shortcut.cf.sub | 2 +- .../serial/copy_from_digest_same_expand_shortcut.cf | 2 +- .../copy_from_digest_same_expand_shortcut.cf.sub | 2 +- .../copy_from_encrypted_md5_zero_length_file.cf | 2 +- .../copy_from_encrypted_md5_zero_length_file.cf.sub | 2 +- .../copy_from_expand_ip_admit_directory_deny_file.cf | 2 +- ...y_from_expand_ip_admit_directory_deny_file.cf.sub | 2 +- .../serial/copy_from_expand_ip_directory.cf | 2 +- .../serial/copy_from_expand_ip_directory.cf.sub | 2 +- ...istent_file_connection_closed-classic_protocol.cf | 2 +- ...nt_file_connection_closed-classic_protocol.cf.sub | 2 +- .../copy_from_inexistent_file_connection_closed.cf | 2 +- ...opy_from_inexistent_file_connection_closed.cf.sub | 2 +- .../serial/copy_from_md5_zero_length_file.cf | 2 +- .../serial/copy_from_md5_zero_length_file.cf.sub | 2 +- .../serial/copy_from_reordered_ciphers_success.cf | 2 +- .../copy_from_reordered_ciphers_success.cf.sub | 2 +- .../16_cf-serverd/serial/copy_from_tls_1_3_fail.cf | 2 +- .../serial/copy_from_tls_1_3_fail.cf.sub | 2 +- .../serial/copy_from_tls_1_3_success.cf | 2 +- .../serial/copy_from_tls_1_3_success.cf.sub | 2 +- .../16_cf-serverd/serial/copy_missing_ok.cf | 2 +- .../16_cf-serverd/serial/copy_missing_ok.cf.sub | 2 +- .../serial/default_ciphers_tlsversion.srv | 2 +- .../16_cf-serverd/serial/lan_deny_connect.srv | 3 +-- .../serial/localhost_closed_deny_hostnames.srv | 3 +-- .../serial/localhost_closed_hostname.srv | 3 +-- .../16_cf-serverd/serial/localhost_deny_connect.srv | 3 +-- .../serial/localhost_deny_one_directory.srv | 2 +- .../localhost_deny_one_directory_with_regex.srv | 2 +- .../16_cf-serverd/serial/localhost_noaccess.srv | 3 +-- .../16_cf-serverd/serial/localhost_open.srv | 3 +-- .../serial/localhost_open_admit_hostnames.srv | 3 +-- .../16_cf-serverd/serial/localhost_open_hostname.srv | 3 +-- .../serial/localhost_open_with_data_select.srv | 2 +- tests/acceptance/16_cf-serverd/serial/network/004.cf | 2 +- .../16_cf-serverd/serial/network/004.cf.sub | 2 +- .../16_cf-serverd/serial/network/lan_open.srv | 3 +-- tests/acceptance/16_cf-serverd/serial/no_tls_1_3.srv | 2 +- .../serial/nondefault_ciphers_tlsversion.srv | 2 +- .../serial/reordered_default_ciphers_tlsversion.srv | 2 +- .../serial/simple_copy_from_admit_localhost.cf | 2 +- .../serial/simple_copy_from_admit_localhost.cf.sub | 2 +- .../serial/simple_copy_from_deny_localhost.cf | 2 +- .../serial/simple_copy_from_deny_localhost.cf.sub | 2 +- .../serial/tcp_port_copy_from_within_range.cf | 2 +- .../serial/tcp_port_listen_outside_range.x.cf | 2 +- .../serial/tcp_port_listen_within_range.cf | 3 +-- .../acceptance/16_cf-serverd/serial/tls_1_3_only.srv | 2 +- .../17_users/unsafe/05_hpux_set_non_trusted_mode.cf | 2 +- tests/acceptance/17_users/unsafe/10_add_user.cf | 2 +- .../acceptance/17_users/unsafe/10_add_user_locked.cf | 2 +- .../unsafe/10_add_user_locked_with_password.cf | 2 +- tests/acceptance/17_users/unsafe/10_add_user_warn.cf | 2 +- .../17_users/unsafe/10_add_user_with_description.cf | 2 +- .../unsafe/10_add_user_with_hashed_password.cf | 2 +- .../unsafe/10_add_user_with_many_attributes.cf | 2 +- .../unsafe/10_add_user_with_many_attributes_warn.cf | 2 +- .../unsafe/10_add_user_with_many_empty_attributes.cf | 2 +- .../17_users/unsafe/10_add_user_with_password.cf | 2 +- .../17_users/unsafe/10_add_user_with_primary_gid.cf | 2 +- .../unsafe/10_add_user_with_primary_group.cf | 2 +- .../unsafe/10_add_user_with_secondary_gid.cf | 2 +- .../unsafe/10_add_user_with_secondary_group.cf | 2 +- .../10_add_user_with_several_secondary_groups.cf | 2 +- .../17_users/unsafe/10_add_user_with_shell.cf | 2 +- .../17_users/unsafe/10_add_user_with_uid.cf | 2 +- .../unsafe/10_home_bundle_when_removing_user.cf | 2 +- .../unsafe/10_home_bundle_with_existing_user.cf | 2 +- ..._home_bundle_with_new_user_and_default_inherit.cf | 2 +- .../10_home_bundle_with_new_user_and_inherit.cf | 2 +- .../10_home_bundle_with_new_user_and_no_inherit.cf | 2 +- .../acceptance/17_users/unsafe/10_missing_policy.cf | 2 +- .../17_users/unsafe/10_modify_user_lock.cf | 2 +- .../17_users/unsafe/10_modify_user_lock_warn.cf | 2 +- .../unsafe/10_modify_user_lock_with_password.cf | 2 +- .../17_users/unsafe/10_modify_user_unlock.cf | 2 +- .../17_users/unsafe/10_modify_user_unlock_warn.cf | 2 +- .../unsafe/10_modify_user_unlock_with_password.cf | 2 +- .../unsafe/10_modify_user_with_hashed_password.cf | 2 +- .../unsafe/10_modify_user_with_many_attributes.cf | 2 +- .../10_modify_user_with_many_attributes_warn.cf | 2 +- .../10_modify_user_with_many_empty_attributes.cf | 2 +- .../17_users/unsafe/10_modify_user_with_password.cf | 2 +- .../unsafe/10_modify_user_with_same_password.cf | 2 +- ...wly_created_account_should_not_count_as_locked.cf | 2 +- .../unsafe/10_password_hash_is_not_cached.cf | 2 +- .../17_users/unsafe/10_password_with_no_data.cf | 2 +- .../17_users/unsafe/10_password_with_no_format.cf | 2 +- .../17_users/unsafe/10_promise_outcomes.cf | 2 +- tests/acceptance/17_users/unsafe/10_remove_user.cf | 2 +- .../17_users/unsafe/10_remove_user_warn.cf | 2 +- .../17_users/unsafe/15_hpux_set_trusted_mode.cf | 2 +- .../unsafe/20_modify_user_missing_secondary_group.cf | 2 +- .../unsafe/20_modify_user_secondary_groups.cf | 2 +- .../19_security/other_writeable/group_write.cf | 2 +- .../19_security/other_writeable/other_write.cf | 2 +- tests/acceptance/20_meta/basic.cf | 2 +- tests/acceptance/20_meta/this_bundle_meta_expands.cf | 2 +- tests/acceptance/21_methods/array_reset.cf | 3 +-- .../21_methods/call_methods_using_array_expansion.cf | 2 +- .../21_methods/callers/callers_directly.cf | 2 +- .../21_methods/callers/promisers_directly.cf | 3 +-- .../21_methods/callers/promisers_indirectly.cf | 3 +-- tests/acceptance/21_methods/method_outcomes.cf | 2 +- tests/acceptance/21_methods/reporting/kept.cf | 2 +- .../21_methods/usebundle_with_or_without.cf | 2 +- tests/acceptance/21_methods/warn_only.cf | 2 +- .../allroles_nonroot_role2_root_allowed.22009.srv | 3 +-- .../serial/allroles_root_allowed.22006.srv | 3 +-- .../serial/bundle2_role2_only_allowed.22012.srv | 3 +-- .../serial/bundles_all_allowed.22010.srv | 3 +-- .../bundles_all_allowed_regex_disallowed.22013.srv | 3 +-- .../bundles_all_allowed_regex_disallowed_admitted.cf | 2 +- .../bundles_all_allowed_regex_disallowed_denied.cf | 2 +- .../bundles_all_allowed_roles_disallowed_denied.cf | 2 +- .../serial/bundles_roles_all_allowed.22011.srv | 3 +-- .../serial/cfruncommand_argv0_quoted.22014.srv | 3 +-- .../serial/cfruncommand_argv0_quoted.cf | 2 +- .../serial/cfruncommand_deny_root.22001.srv | 3 +-- .../22_cf-runagent/serial/cfruncommand_deny_root.cf | 2 +- .../serial/cfruncommand_no_access.22002.srv | 3 +-- .../serial/cfruncommand_no_access.22003.srv | 3 +-- .../serial/cfruncommand_no_access.22004.srv | 3 +-- .../serial/cfruncommand_no_access_1.cf | 2 +- .../serial/cfruncommand_no_access_2.cf | 2 +- .../serial/cfruncommand_no_access_3.cf | 2 +- .../serial/cfruncommand_open.22000.srv | 3 +-- .../22_cf-runagent/serial/cfruncommand_open.cf | 2 +- .../cfruncommand_relative_paths_disallowed.srv | 3 +-- .../ns2_bundle2_ns1_role2_only_allowed.22015.srv | 3 +-- .../serial/role12_root_allowed.22007.srv | 3 +-- .../serial/role1_role2_root_allowed.22008.srv | 3 +-- .../serial/role1_root_allowed.22005.srv | 3 +-- .../serial/runagent_-B_bundle1_admitted_1.cf | 2 +- .../serial/runagent_-B_bundle1_bundle2_admitted_1.cf | 2 +- .../serial/runagent_-B_bundle1_bundle2_denied.cf | 2 +- .../serial/runagent_-B_bundle1_denied_1.cf | 2 +- .../serial/runagent_-B_bundle2_admitted.cf | 2 +- .../serial/runagent_-B_bundle2_bundle1_denied.cf | 2 +- .../serial/runagent_-B_bundle_denied.cf | 2 +- .../serial/runagent_-B_specialchars_denied.cf | 2 +- .../runagent_-D_ns1_role2_-B_bundle2_denied.cf | 2 +- .../runagent_-D_ns1_role2_-B_ns2_bundle2_admitted.cf | 2 +- .../runagent_-D_ns1_role2_-B_ns2_bundle2_denied.cf | 2 +- .../runagent_-D_ns2_role2_-B_ns2_bundle2_denied.cf | 2 +- .../serial/runagent_-D_role1-B_bundle1_admitted_1.cf | 2 +- .../serial/runagent_-D_role12_denied_1.cf | 2 +- .../serial/runagent_-D_role1_-B_bundle2_denied.cf | 2 +- .../serial/runagent_-D_role1_-D_role2_admitted.cf | 2 +- .../serial/runagent_-D_role1_admitted_1.cf | 2 +- .../serial/runagent_-D_role1_admitted_2.cf | 2 +- .../serial/runagent_-D_role1_admitted_3.cf | 2 +- .../serial/runagent_-D_role1_denied_1.cf | 2 +- .../serial/runagent_-D_role1_denied_2.cf | 2 +- .../serial/runagent_-D_role1_denied_3.cf | 2 +- .../serial/runagent_-D_role1_role2_admitted_1.cf | 2 +- .../serial/runagent_-D_role1_role2_admitted_2.cf | 2 +- .../serial/runagent_-D_role1_role2_denied_1.cf | 2 +- .../serial/runagent_-D_role1_role2_denied_2.cf | 2 +- .../serial/runagent_-D_role1_role2_denied_3.cf | 2 +- .../serial/runagent_-D_role2_-B_bundle1_denied.cf | 2 +- .../serial/runagent_-D_role2_-B_bundle2_admitted.cf | 2 +- .../serial/runagent_-D_role2_admitted_1.cf | 2 +- .../serial/runagent_-D_role2_admitted_2.cf | 2 +- .../serial/runagent_-D_role2_denied_1.cf | 2 +- .../serial/runagent_-D_role2_role1_denied_1.cf | 2 +- .../serial/runagent_-D_specialchars_denied.cf | 2 +- .../22_cf-runagent/serial/runagent_-o_deprecated.cf | 2 +- .../23_failsafe/failsafe_created_on_parse_error.cf | 2 +- .../23_failsafe/preexisting_failsafe_preserved.cf | 2 +- .../24_cmd_line_arguments/parsed_policy.cf | 2 +- .../25_cf-execd/mail_1st_run_empty_new_log.cf | 2 +- .../25_cf-execd/mail_empty_old_and_new_log.cf | 2 +- tests/acceptance/25_cf-execd/mail_exclude_filter.cf | 2 +- .../25_cf-execd/mail_include_and_exclude_filters.cf | 2 +- tests/acceptance/25_cf-execd/mail_include_filter.cf | 2 +- tests/acceptance/25_cf-execd/mail_no_filter.cf | 2 +- .../mailfilter_1st_run_everything_filtered.cf | 2 +- .../mailfilter_empty_old_log_everything_filtered.cf | 2 +- tests/acceptance/25_cf-execd/slow/dies_in_time.cf | 2 +- .../25_cf-execd/slow/kill_myself.execd.srv | 2 +- .../25_cf-execd/timed/mailfilter_repeated_runs.cf | 2 +- tests/acceptance/26_cf-net/serial/cf-net_connect.cf | 2 +- tests/acceptance/26_cf-net/serial/cf-net_get.cf | 2 +- tests/acceptance/26_cf-net/serial/cf-net_help.cf | 2 +- tests/acceptance/26_cf-net/serial/cf-net_stat.cf | 2 +- .../acceptance/26_cf-net/serial/cf-net_stat_deny.cf | 2 +- tests/acceptance/26_cf-net/serial/cf-net_stat_dir.cf | 2 +- .../serial/serverd_admit_localhost_15000.cf.srv | 2 +- tests/acceptance/27_cf-secret/decrypt.cf | 2 +- .../acceptance/27_cf-secret/encrypt-decrypt-args.cf | 2 +- tests/acceptance/27_cf-secret/encrypt-decrypt.cf | 2 +- tests/acceptance/27_cf-secret/encrypt-no-key.cf | 2 +- tests/acceptance/27_cf-secret/encrypt.x.cf | 2 +- tests/acceptance/28_inform_testing/common.cf.sub | 2 +- .../28_inform_testing/common_soft_fail.cf.sub | 2 +- tests/acceptance/29_simulate_mode/diff_mode.cf | 2 +- .../29_simulate_mode/manifest_full_mode.cf | 2 +- tests/acceptance/29_simulate_mode/manifest_mode.cf | 2 +- tests/acceptance/29_simulate_mode/promises.cf.sub | 2 +- .../29_simulate_mode/simulate_safe_functions.cf | 2 +- .../30_custom_promise_types/01_basic_module.cf | 2 +- tests/acceptance/30_custom_promise_types/02_if.cf | 2 +- .../30_custom_promise_types/05_meta_attr.cf | 2 +- .../acceptance/30_custom_promise_types/11_unless.cf | 2 +- .../30_custom_promise_types/12_multiple_promises.cf | 2 +- .../30_custom_promise_types/13_binary_path.cf | 2 +- .../14_multiple_promise_types_same_module.cf | 2 +- .../15_conflicting_interpreters.cf | 2 +- .../17_early_module_failure.cf | 2 +- .../17_early_module_failure.cf.sub | 2 +- .../18_early_module_failure_classes.cf | 2 +- .../30_custom_promise_types/22_what_module_gets.cf | 3 +-- .../23_action_policy/dryrun_supported.cf | 2 +- .../23_action_policy/dryrun_supported.cf.sub | 3 +-- .../23_action_policy/dryrun_unsupported.cf | 2 +- .../23_action_policy/dryrun_unsupported.cf.sub | 3 +-- .../23_action_policy/explicit_warn_fake_supported.cf | 2 +- .../explicit_warn_fake_supported.cf.sub | 3 +-- .../23_action_policy/explicit_warn_supported.cf | 2 +- .../23_action_policy/explicit_warn_supported.cf.sub | 3 +-- .../23_action_policy/explicit_warn_unsupported.cf | 2 +- .../explicit_warn_unsupported.cf.sub | 3 +-- .../23_action_policy/simulate_supported.cf | 2 +- .../23_action_policy/simulate_supported.cf.sub | 3 +-- .../23_action_policy/simulate_unsupported.cf | 2 +- .../23_action_policy/simulate_unsupported.cf.sub | 3 +-- tests/acceptance/31_tickets/CFE-2367/1/test.cf | 2 +- tests/acceptance/31_tickets/CFE-2367/2/test.cf | 2 +- tests/acceptance/31_tickets/CFE-3866/test.cf | 2 +- tests/acceptance/31_tickets/CFE-3987/1/test.cf | 2 +- tests/acceptance/31_tickets/CFE-3987/2/test.cf | 2 +- tests/acceptance/31_tickets/CFE-3988/1/test.cf | 2 +- tests/acceptance/31_tickets/ENT-8788/1/main.cf | 3 +-- tests/acceptance/31_tickets/ENT-8788/2/main.cf | 3 +-- .../acceptance/31_tickets/ENT-8818/1/staging/main.cf | 2 +- tests/acceptance/DCS.org | 9 ++++----- tests/acceptance/Makefile.am | 2 +- tests/acceptance/README | 12 ++++++------ tests/acceptance/{dcs.cf.sub => dcs.sub.cf} | 0 tests/acceptance/{default.cf.sub => default.sub.cf} | 4 ++-- tests/acceptance/selftest/flakey_meta_fail.cf | 2 +- tests/acceptance/selftest/flakey_meta_no_ticket.cf | 2 +- tests/acceptance/selftest/skipped.cf | 2 +- tests/acceptance/selftest/soft_no_ticket.cf | 2 +- tests/acceptance/testall | 6 +++--- 2049 files changed, 2067 insertions(+), 2378 deletions(-) rename tests/acceptance/{dcs.cf.sub => dcs.sub.cf} (100%) rename tests/acceptance/{default.cf.sub => default.sub.cf} (90%) diff --git a/tests/acceptance/00_basics/01_compiler/001.cf b/tests/acceptance/00_basics/01_compiler/001.cf index 29fea30665..40d0430d57 100644 --- a/tests/acceptance/00_basics/01_compiler/001.cf +++ b/tests/acceptance/00_basics/01_compiler/001.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -63,4 +63,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/00_basics/01_compiler/002.x.cf b/tests/acceptance/00_basics/01_compiler/002.x.cf index d12d7ba343..c33766a162 100644 --- a/tests/acceptance/00_basics/01_compiler/002.x.cf +++ b/tests/acceptance/00_basics/01_compiler/002.x.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/003.x.cf b/tests/acceptance/00_basics/01_compiler/003.x.cf index 0670dbc62f..0988458c22 100644 --- a/tests/acceptance/00_basics/01_compiler/003.x.cf +++ b/tests/acceptance/00_basics/01_compiler/003.x.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/004.x.cf b/tests/acceptance/00_basics/01_compiler/004.x.cf index 2470bf1c86..4b2928e3d4 100644 --- a/tests/acceptance/00_basics/01_compiler/004.x.cf +++ b/tests/acceptance/00_basics/01_compiler/004.x.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -56,4 +56,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/00_basics/01_compiler/007.cf b/tests/acceptance/00_basics/01_compiler/007.cf index 6a11e85cdc..39117618e8 100644 --- a/tests/acceptance/00_basics/01_compiler/007.cf +++ b/tests/acceptance/00_basics/01_compiler/007.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/008.x.cf b/tests/acceptance/00_basics/01_compiler/008.x.cf index ab04b43cfb..fb726bea04 100644 --- a/tests/acceptance/00_basics/01_compiler/008.x.cf +++ b/tests/acceptance/00_basics/01_compiler/008.x.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -55,4 +55,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/00_basics/01_compiler/013.cf b/tests/acceptance/00_basics/01_compiler/013.cf index e51ee3a1e4..3abf326527 100644 --- a/tests/acceptance/00_basics/01_compiler/013.cf +++ b/tests/acceptance/00_basics/01_compiler/013.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/014.x.cf b/tests/acceptance/00_basics/01_compiler/014.x.cf index 19e3971da2..9149c82b6b 100644 --- a/tests/acceptance/00_basics/01_compiler/014.x.cf +++ b/tests/acceptance/00_basics/01_compiler/014.x.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -55,4 +55,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/00_basics/01_compiler/019.cf b/tests/acceptance/00_basics/01_compiler/019.cf index 1ff4ae0a6f..33d42bc722 100644 --- a/tests/acceptance/00_basics/01_compiler/019.cf +++ b/tests/acceptance/00_basics/01_compiler/019.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/020.x.cf b/tests/acceptance/00_basics/01_compiler/020.x.cf index e33187bd17..518680a84b 100644 --- a/tests/acceptance/00_basics/01_compiler/020.x.cf +++ b/tests/acceptance/00_basics/01_compiler/020.x.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -55,4 +55,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/00_basics/01_compiler/025.cf b/tests/acceptance/00_basics/01_compiler/025.cf index a9432442bd..979bd6deef 100644 --- a/tests/acceptance/00_basics/01_compiler/025.cf +++ b/tests/acceptance/00_basics/01_compiler/025.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/026.x.cf b/tests/acceptance/00_basics/01_compiler/026.x.cf index 723fc5b7d2..91d77dba54 100644 --- a/tests/acceptance/00_basics/01_compiler/026.x.cf +++ b/tests/acceptance/00_basics/01_compiler/026.x.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -55,4 +55,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/00_basics/01_compiler/031.cf b/tests/acceptance/00_basics/01_compiler/031.cf index 69645ae0f9..20ae9b60b6 100644 --- a/tests/acceptance/00_basics/01_compiler/031.cf +++ b/tests/acceptance/00_basics/01_compiler/031.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/032.x.cf b/tests/acceptance/00_basics/01_compiler/032.x.cf index 74b95b4a09..07806a8055 100644 --- a/tests/acceptance/00_basics/01_compiler/032.x.cf +++ b/tests/acceptance/00_basics/01_compiler/032.x.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -49,4 +49,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/00_basics/01_compiler/033.x.cf b/tests/acceptance/00_basics/01_compiler/033.x.cf index e29f8411af..c318e1f830 100644 --- a/tests/acceptance/00_basics/01_compiler/033.x.cf +++ b/tests/acceptance/00_basics/01_compiler/033.x.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -52,4 +52,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/00_basics/01_compiler/034.x.cf b/tests/acceptance/00_basics/01_compiler/034.x.cf index 4d338397ba..34d78d2fd0 100644 --- a/tests/acceptance/00_basics/01_compiler/034.x.cf +++ b/tests/acceptance/00_basics/01_compiler/034.x.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -49,4 +49,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/00_basics/01_compiler/037.cf b/tests/acceptance/00_basics/01_compiler/037.cf index 1c516d0f78..4af0dfb41c 100644 --- a/tests/acceptance/00_basics/01_compiler/037.cf +++ b/tests/acceptance/00_basics/01_compiler/037.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/038.x.cf b/tests/acceptance/00_basics/01_compiler/038.x.cf index 5c2c1bfaa6..cc7183047a 100644 --- a/tests/acceptance/00_basics/01_compiler/038.x.cf +++ b/tests/acceptance/00_basics/01_compiler/038.x.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -53,4 +53,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/00_basics/01_compiler/040.x.cf b/tests/acceptance/00_basics/01_compiler/040.x.cf index 875f3d0790..61af9273d6 100644 --- a/tests/acceptance/00_basics/01_compiler/040.x.cf +++ b/tests/acceptance/00_basics/01_compiler/040.x.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/041.x.cf b/tests/acceptance/00_basics/01_compiler/041.x.cf index dfdd944eae..5b6022559d 100644 --- a/tests/acceptance/00_basics/01_compiler/041.x.cf +++ b/tests/acceptance/00_basics/01_compiler/041.x.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { init, test("banana"), check }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/042.x.cf b/tests/acceptance/00_basics/01_compiler/042.x.cf index 64c785fd86..bc0ddae5a8 100644 --- a/tests/acceptance/00_basics/01_compiler/042.x.cf +++ b/tests/acceptance/00_basics/01_compiler/042.x.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { init, test("banana"), check }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/044.x.cf b/tests/acceptance/00_basics/01_compiler/044.x.cf index 3eff3af820..95562bbc9c 100644 --- a/tests/acceptance/00_basics/01_compiler/044.x.cf +++ b/tests/acceptance/00_basics/01_compiler/044.x.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/045.x.cf b/tests/acceptance/00_basics/01_compiler/045.x.cf index e53214888e..27bdfd0a44 100644 --- a/tests/acceptance/00_basics/01_compiler/045.x.cf +++ b/tests/acceptance/00_basics/01_compiler/045.x.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/100.cf b/tests/acceptance/00_basics/01_compiler/100.cf index 5e87709a93..671847c011 100644 --- a/tests/acceptance/00_basics/01_compiler/100.cf +++ b/tests/acceptance/00_basics/01_compiler/100.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -47,4 +47,3 @@ bundle agent check DEBUG:: "$(test.subout)"; } - diff --git a/tests/acceptance/00_basics/01_compiler/101.cf b/tests/acceptance/00_basics/01_compiler/101.cf index 3306829509..2c494d7690 100644 --- a/tests/acceptance/00_basics/01_compiler/101.cf +++ b/tests/acceptance/00_basics/01_compiler/101.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/102.x.cf b/tests/acceptance/00_basics/01_compiler/102.x.cf index 3d12631a71..5fbd178f1a 100644 --- a/tests/acceptance/00_basics/01_compiler/102.x.cf +++ b/tests/acceptance/00_basics/01_compiler/102.x.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/105.cf b/tests/acceptance/00_basics/01_compiler/105.cf index b7b11db0cf..18d50d576c 100644 --- a/tests/acceptance/00_basics/01_compiler/105.cf +++ b/tests/acceptance/00_basics/01_compiler/105.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/200.x.cf b/tests/acceptance/00_basics/01_compiler/200.x.cf index 5b9418ecaa..fa622e0d0e 100644 --- a/tests/acceptance/00_basics/01_compiler/200.x.cf +++ b/tests/acceptance/00_basics/01_compiler/200.x.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -37,5 +37,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - - diff --git a/tests/acceptance/00_basics/01_compiler/704.x.cf b/tests/acceptance/00_basics/01_compiler/704.x.cf index 4480cceb65..f9490f6065 100644 --- a/tests/acceptance/00_basics/01_compiler/704.x.cf +++ b/tests/acceptance/00_basics/01_compiler/704.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/710.x.cf b/tests/acceptance/00_basics/01_compiler/710.x.cf index fb0ce84d10..2ad216bfa2 100644 --- a/tests/acceptance/00_basics/01_compiler/710.x.cf +++ b/tests/acceptance/00_basics/01_compiler/710.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/800.cf b/tests/acceptance/00_basics/01_compiler/800.cf index 7dbed70ef4..a1158333ea 100644 --- a/tests/acceptance/00_basics/01_compiler/800.cf +++ b/tests/acceptance/00_basics/01_compiler/800.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/cf-promises-99999999999.cf b/tests/acceptance/00_basics/01_compiler/cf-promises-99999999999.cf index 3a88cf4e18..b54b001c03 100644 --- a/tests/acceptance/00_basics/01_compiler/cf-promises-99999999999.cf +++ b/tests/acceptance/00_basics/01_compiler/cf-promises-99999999999.cf @@ -12,7 +12,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/cf-promises-common-bundles-only.cf b/tests/acceptance/00_basics/01_compiler/cf-promises-common-bundles-only.cf index a3bccef9cb..092d26a689 100644 --- a/tests/acceptance/00_basics/01_compiler/cf-promises-common-bundles-only.cf +++ b/tests/acceptance/00_basics/01_compiler/cf-promises-common-bundles-only.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/cf-promises-json-long-strings.cf b/tests/acceptance/00_basics/01_compiler/cf-promises-json-long-strings.cf index f93376f781..1894dab224 100644 --- a/tests/acceptance/00_basics/01_compiler/cf-promises-json-long-strings.cf +++ b/tests/acceptance/00_basics/01_compiler/cf-promises-json-long-strings.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "2.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/cf-promises-without-ppkeys.cf b/tests/acceptance/00_basics/01_compiler/cf-promises-without-ppkeys.cf index bef8002a46..d44b260802 100644 --- a/tests/acceptance/00_basics/01_compiler/cf-promises-without-ppkeys.cf +++ b/tests/acceptance/00_basics/01_compiler/cf-promises-without-ppkeys.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/classes_without_constraints.cf b/tests/acceptance/00_basics/01_compiler/classes_without_constraints.cf index 8f9747da36..05a0bf0a70 100644 --- a/tests/acceptance/00_basics/01_compiler/classes_without_constraints.cf +++ b/tests/acceptance/00_basics/01_compiler/classes_without_constraints.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/depends_on.cf b/tests/acceptance/00_basics/01_compiler/depends_on.cf index 813d3848cb..4dbee8e829 100644 --- a/tests/acceptance/00_basics/01_compiler/depends_on.cf +++ b/tests/acceptance/00_basics/01_compiler/depends_on.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/depends_on_canonify.cf b/tests/acceptance/00_basics/01_compiler/depends_on_canonify.cf index 54635db5d1..9b3e53f1ba 100644 --- a/tests/acceptance/00_basics/01_compiler/depends_on_canonify.cf +++ b/tests/acceptance/00_basics/01_compiler/depends_on_canonify.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/no_error_when_key_contains_space.cf b/tests/acceptance/00_basics/01_compiler/no_error_when_key_contains_space.cf index 8cba164686..1678bd2e5c 100644 --- a/tests/acceptance/00_basics/01_compiler/no_error_when_key_contains_space.cf +++ b/tests/acceptance/00_basics/01_compiler/no_error_when_key_contains_space.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -58,4 +58,3 @@ bundle agent check $(this.promise_filename), "no"); } - diff --git a/tests/acceptance/00_basics/01_compiler/staging/005.x.cf b/tests/acceptance/00_basics/01_compiler/staging/005.x.cf index ed9d31b817..236de264e4 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/005.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/005.x.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { init, test("banana"), check }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/006.x.cf b/tests/acceptance/00_basics/01_compiler/staging/006.x.cf index ff75216873..bdc91eda4e 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/006.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/006.x.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { init, test("banana"), check }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/009.x.cf b/tests/acceptance/00_basics/01_compiler/staging/009.x.cf index c0757fec52..9f60f07983 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/009.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/009.x.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/010.x.cf b/tests/acceptance/00_basics/01_compiler/staging/010.x.cf index 8e1b5622a3..f2888eebb0 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/010.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/010.x.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/011.x.cf b/tests/acceptance/00_basics/01_compiler/staging/011.x.cf index 02afcadcea..b89690d0ea 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/011.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/011.x.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { init, test("banana"), check }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/012.x.cf b/tests/acceptance/00_basics/01_compiler/staging/012.x.cf index 013cd4ad5b..54d2b63034 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/012.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/012.x.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { init, test("banana"), check }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/015.x.cf b/tests/acceptance/00_basics/01_compiler/staging/015.x.cf index d6d815f48b..5fee85eb40 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/015.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/015.x.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/016.x.cf b/tests/acceptance/00_basics/01_compiler/staging/016.x.cf index d1c2460f46..a8267bbec6 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/016.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/016.x.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/017.x.cf b/tests/acceptance/00_basics/01_compiler/staging/017.x.cf index a2ba44717d..6cce9f814d 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/017.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/017.x.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { init, test("banana"), check }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/018.x.cf b/tests/acceptance/00_basics/01_compiler/staging/018.x.cf index 9e41579802..a2d22be1e9 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/018.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/018.x.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { init, test("banana"), check }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/021.x.cf b/tests/acceptance/00_basics/01_compiler/staging/021.x.cf index abf6044dac..d2a41130b5 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/021.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/021.x.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/022.x.cf b/tests/acceptance/00_basics/01_compiler/staging/022.x.cf index f0ab21dc26..6d5a434e47 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/022.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/022.x.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/023.x.cf b/tests/acceptance/00_basics/01_compiler/staging/023.x.cf index 8bf6669563..df1f7b43bd 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/023.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/023.x.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { init, test("banana"), check }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/024.x.cf b/tests/acceptance/00_basics/01_compiler/staging/024.x.cf index efce8aaf01..5b41509e4e 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/024.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/024.x.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { init, test("banana"), check }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/027.x.cf b/tests/acceptance/00_basics/01_compiler/staging/027.x.cf index aa5dcc676f..5c7e913d1d 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/027.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/027.x.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/028.x.cf b/tests/acceptance/00_basics/01_compiler/staging/028.x.cf index b91c0375f6..9455b0474c 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/028.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/028.x.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/029.x.cf b/tests/acceptance/00_basics/01_compiler/staging/029.x.cf index 7ce9c42afa..2ab000187e 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/029.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/029.x.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { init, test("banana"), check }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/030.x.cf b/tests/acceptance/00_basics/01_compiler/staging/030.x.cf index 8f2106b090..42ac53ba70 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/030.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/030.x.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { init, test("banana"), check }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/035.x.cf b/tests/acceptance/00_basics/01_compiler/staging/035.x.cf index 9285a6a22c..aa2baa8541 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/035.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/035.x.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { init, test("banana"), check }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/036.x.cf b/tests/acceptance/00_basics/01_compiler/staging/036.x.cf index d7687dff2b..3dc90e6b4e 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/036.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/036.x.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { init, test("banana"), check }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/039.x.cf b/tests/acceptance/00_basics/01_compiler/staging/039.x.cf index 15eb40cb15..07262160b5 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/039.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/039.x.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { init, test("...com._"), check }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/043.cf b/tests/acceptance/00_basics/01_compiler/staging/043.cf index 2c2e079db0..e3a6fbba24 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/043.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/043.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/046.x.cf b/tests/acceptance/00_basics/01_compiler/staging/046.x.cf index e53214888e..27bdfd0a44 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/046.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/046.x.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/047.x.cf b/tests/acceptance/00_basics/01_compiler/staging/047.x.cf index 15eb40cb15..07262160b5 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/047.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/047.x.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { init, test("...com._"), check }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/048.x.cf b/tests/acceptance/00_basics/01_compiler/staging/048.x.cf index dfb90f931a..1d9d6d60a5 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/048.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/048.x.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { init, test("...com._"), check }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/701.x.cf b/tests/acceptance/00_basics/01_compiler/staging/701.x.cf index e5a70f1152..590ec191b8 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/701.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/701.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/staging/702.x.cf b/tests/acceptance/00_basics/01_compiler/staging/702.x.cf index be28277318..43e4239fb5 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/702.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/702.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; syslog_host => "...com..._"; diff --git a/tests/acceptance/00_basics/01_compiler/staging/703.x.cf b/tests/acceptance/00_basics/01_compiler/staging/703.x.cf index 9a4c1cba0c..2552d8fdee 100644 --- a/tests/acceptance/00_basics/01_compiler/staging/703.x.cf +++ b/tests/acceptance/00_basics/01_compiler/staging/703.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/string_contexts.cf b/tests/acceptance/00_basics/01_compiler/string_contexts.cf index 835fd8f3f6..98e53612b7 100644 --- a/tests/acceptance/00_basics/01_compiler/string_contexts.cf +++ b/tests/acceptance/00_basics/01_compiler/string_contexts.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/string_contexts.x.cf b/tests/acceptance/00_basics/01_compiler/string_contexts.x.cf index f72f5a96c3..8fc064d8d0 100644 --- a/tests/acceptance/00_basics/01_compiler/string_contexts.x.cf +++ b/tests/acceptance/00_basics/01_compiler/string_contexts.x.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/string_contexts_rval.cf b/tests/acceptance/00_basics/01_compiler/string_contexts_rval.cf index 762f9e5531..4b71e48ec4 100644 --- a/tests/acceptance/00_basics/01_compiler/string_contexts_rval.cf +++ b/tests/acceptance/00_basics/01_compiler/string_contexts_rval.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/01_compiler/with_iteration.cf b/tests/acceptance/00_basics/01_compiler/with_iteration.cf index 9ea16ee9a0..de8da1a20e 100644 --- a/tests/acceptance/00_basics/01_compiler/with_iteration.cf +++ b/tests/acceptance/00_basics/01_compiler/with_iteration.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/02_switches/001.cf b/tests/acceptance/00_basics/02_switches/001.cf index 410e81255c..b8cbd6d7e9 100644 --- a/tests/acceptance/00_basics/02_switches/001.cf +++ b/tests/acceptance/00_basics/02_switches/001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { test }; version => "1.0"; } @@ -26,4 +26,3 @@ bundle agent test DEBUG:: "Running: $(cmd)"; } - diff --git a/tests/acceptance/00_basics/02_switches/001.cf.sub b/tests/acceptance/00_basics/02_switches/001.cf.sub index 8939cef691..31f53fb329 100644 --- a/tests/acceptance/00_basics/02_switches/001.cf.sub +++ b/tests/acceptance/00_basics/02_switches/001.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -43,4 +43,3 @@ reports: !ok:: "$(fn[1]) FAIL"; } - diff --git a/tests/acceptance/00_basics/02_switches/002.cf b/tests/acceptance/00_basics/02_switches/002.cf index 867f677050..d1a2cf7109 100644 --- a/tests/acceptance/00_basics/02_switches/002.cf +++ b/tests/acceptance/00_basics/02_switches/002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { test }; version => "1.0"; } @@ -27,4 +27,3 @@ bundle agent test "Running: $(cmd)"; "Test results come from $(this.promise_filename).sub"; } - diff --git a/tests/acceptance/00_basics/02_switches/002.cf.sub b/tests/acceptance/00_basics/02_switches/002.cf.sub index 8939cef691..31f53fb329 100644 --- a/tests/acceptance/00_basics/02_switches/002.cf.sub +++ b/tests/acceptance/00_basics/02_switches/002.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -43,4 +43,3 @@ reports: !ok:: "$(fn[1]) FAIL"; } - diff --git a/tests/acceptance/00_basics/02_switches/003.cf b/tests/acceptance/00_basics/02_switches/003.cf index f6aa2640b8..17a5c6c87c 100644 --- a/tests/acceptance/00_basics/02_switches/003.cf +++ b/tests/acceptance/00_basics/02_switches/003.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { test }; version => "1.0"; } @@ -27,4 +27,3 @@ bundle agent test "Running: $(cmd)"; "Test results come from $(this.promise_filename).sub"; } - diff --git a/tests/acceptance/00_basics/02_switches/003.cf.sub b/tests/acceptance/00_basics/02_switches/003.cf.sub index 0081a42e24..2e26fc396e 100644 --- a/tests/acceptance/00_basics/02_switches/003.cf.sub +++ b/tests/acceptance/00_basics/02_switches/003.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -43,4 +43,3 @@ reports: !ok:: "$(fn[1]) Pass"; } - diff --git a/tests/acceptance/00_basics/02_switches/004.cf b/tests/acceptance/00_basics/02_switches/004.cf index b931e08c6c..a6294dc847 100644 --- a/tests/acceptance/00_basics/02_switches/004.cf +++ b/tests/acceptance/00_basics/02_switches/004.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { test }; version => "1.0"; } @@ -27,4 +27,3 @@ bundle agent test "Running: $(cmd)"; "Test results come from $(this.promise_filename).sub"; } - diff --git a/tests/acceptance/00_basics/02_switches/004.cf.sub b/tests/acceptance/00_basics/02_switches/004.cf.sub index 0081a42e24..2e26fc396e 100644 --- a/tests/acceptance/00_basics/02_switches/004.cf.sub +++ b/tests/acceptance/00_basics/02_switches/004.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -43,4 +43,3 @@ reports: !ok:: "$(fn[1]) Pass"; } - diff --git a/tests/acceptance/00_basics/02_switches/005.cf b/tests/acceptance/00_basics/02_switches/005.cf index 1fd66175e5..070ebda893 100644 --- a/tests/acceptance/00_basics/02_switches/005.cf +++ b/tests/acceptance/00_basics/02_switches/005.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { test }; version => "1.0"; } @@ -27,4 +27,3 @@ bundle agent test "Running: $(cmd)"; "Test results come from $(this.promise_filename).sub"; } - diff --git a/tests/acceptance/00_basics/02_switches/005.cf.sub b/tests/acceptance/00_basics/02_switches/005.cf.sub index 92c99f6d76..47d36cdc2c 100644 --- a/tests/acceptance/00_basics/02_switches/005.cf.sub +++ b/tests/acceptance/00_basics/02_switches/005.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -43,4 +43,3 @@ reports: !ok:: "$(fn[1]) Pass"; } - diff --git a/tests/acceptance/00_basics/02_switches/006.cf b/tests/acceptance/00_basics/02_switches/006.cf index 9b445d8950..964e91f74a 100644 --- a/tests/acceptance/00_basics/02_switches/006.cf +++ b/tests/acceptance/00_basics/02_switches/006.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { test }; version => "1.0"; } @@ -27,4 +27,3 @@ bundle agent test "Running: $(cmd)"; "Test results come from $(this.promise_filename).sub"; } - diff --git a/tests/acceptance/00_basics/02_switches/006.cf.sub b/tests/acceptance/00_basics/02_switches/006.cf.sub index efeda0b9db..6c819613ba 100644 --- a/tests/acceptance/00_basics/02_switches/006.cf.sub +++ b/tests/acceptance/00_basics/02_switches/006.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/02_switches/008.cf b/tests/acceptance/00_basics/02_switches/008.cf index d4c89484d9..6c507d82d8 100644 --- a/tests/acceptance/00_basics/02_switches/008.cf +++ b/tests/acceptance/00_basics/02_switches/008.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { test }; version => "1.0"; } @@ -27,4 +27,3 @@ bundle agent test "Running: $(cmd)"; "Test results come from $(this.promise_filename).sub"; } - diff --git a/tests/acceptance/00_basics/02_switches/008.cf.sub b/tests/acceptance/00_basics/02_switches/008.cf.sub index efeda0b9db..6c819613ba 100644 --- a/tests/acceptance/00_basics/02_switches/008.cf.sub +++ b/tests/acceptance/00_basics/02_switches/008.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/02_switches/010.cf b/tests/acceptance/00_basics/02_switches/010.cf index 84b515c5c6..2ab267ae3d 100644 --- a/tests/acceptance/00_basics/02_switches/010.cf +++ b/tests/acceptance/00_basics/02_switches/010.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { test }; version => "1.0"; } @@ -31,4 +31,3 @@ bundle agent test "Running: $(cmd2)"; "Setup comes from $(this.promise_filename).sub1, results come from $(this.promise_filename).sub2"; } - diff --git a/tests/acceptance/00_basics/02_switches/010.cf.sub1 b/tests/acceptance/00_basics/02_switches/010.cf.sub1 index d03c6c51a3..528de8bce4 100644 --- a/tests/acceptance/00_basics/02_switches/010.cf.sub1 +++ b/tests/acceptance/00_basics/02_switches/010.cf.sub1 @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -52,4 +52,3 @@ reports: DEBUG.!bingo:: "bingo is not set in $(this.promise_filename)"; } - diff --git a/tests/acceptance/00_basics/02_switches/010.cf.sub2 b/tests/acceptance/00_basics/02_switches/010.cf.sub2 index 1e08a61448..6a43a599a1 100644 --- a/tests/acceptance/00_basics/02_switches/010.cf.sub2 +++ b/tests/acceptance/00_basics/02_switches/010.cf.sub2 @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -45,4 +45,3 @@ reports: !bingo:: "$(fn[1]) Pass"; } - diff --git a/tests/acceptance/00_basics/02_switches/dry_run_perms_doesnt_lie.cf b/tests/acceptance/00_basics/02_switches/dry_run_perms_doesnt_lie.cf index 6755819227..caa05dc640 100644 --- a/tests/acceptance/00_basics/02_switches/dry_run_perms_doesnt_lie.cf +++ b/tests/acceptance/00_basics/02_switches/dry_run_perms_doesnt_lie.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/02_switches/dry_run_perms_doesnt_lie.cf.sub b/tests/acceptance/00_basics/02_switches/dry_run_perms_doesnt_lie.cf.sub index 3fa489730e..bbbbc6e999 100644 --- a/tests/acceptance/00_basics/02_switches/dry_run_perms_doesnt_lie.cf.sub +++ b/tests/acceptance/00_basics/02_switches/dry_run_perms_doesnt_lie.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/02_switches/show-evaluated-vars.cf b/tests/acceptance/00_basics/02_switches/show-evaluated-vars.cf index 86ee0f98ff..86ba31c56f 100644 --- a/tests/acceptance/00_basics/02_switches/show-evaluated-vars.cf +++ b/tests/acceptance/00_basics/02_switches/show-evaluated-vars.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -35,4 +35,3 @@ bundle agent check usebundle => dcs_passif_expected( "sub_agent_repaired", "sub_agent_not_kept", "$(this.promise_filename)"); } - diff --git a/tests/acceptance/00_basics/02_switches/staging/007.cf b/tests/acceptance/00_basics/02_switches/staging/007.cf index 9b445d8950..964e91f74a 100644 --- a/tests/acceptance/00_basics/02_switches/staging/007.cf +++ b/tests/acceptance/00_basics/02_switches/staging/007.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { test }; version => "1.0"; } @@ -27,4 +27,3 @@ bundle agent test "Running: $(cmd)"; "Test results come from $(this.promise_filename).sub"; } - diff --git a/tests/acceptance/00_basics/02_switches/staging/007.cf.sub b/tests/acceptance/00_basics/02_switches/staging/007.cf.sub index 28c7359b23..4f8cea02c0 100644 --- a/tests/acceptance/00_basics/02_switches/staging/007.cf.sub +++ b/tests/acceptance/00_basics/02_switches/staging/007.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/02_switches/staging/009.cf b/tests/acceptance/00_basics/02_switches/staging/009.cf index d4c89484d9..6c507d82d8 100644 --- a/tests/acceptance/00_basics/02_switches/staging/009.cf +++ b/tests/acceptance/00_basics/02_switches/staging/009.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { test }; version => "1.0"; } @@ -27,4 +27,3 @@ bundle agent test "Running: $(cmd)"; "Test results come from $(this.promise_filename).sub"; } - diff --git a/tests/acceptance/00_basics/02_switches/staging/009.cf.sub b/tests/acceptance/00_basics/02_switches/staging/009.cf.sub index 28c7359b23..4f8cea02c0 100644 --- a/tests/acceptance/00_basics/02_switches/staging/009.cf.sub +++ b/tests/acceptance/00_basics/02_switches/staging/009.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/02_switches/staging/negate_hard_class.cf b/tests/acceptance/00_basics/02_switches/staging/negate_hard_class.cf index f3085e0fcb..9209edc4c7 100644 --- a/tests/acceptance/00_basics/02_switches/staging/negate_hard_class.cf +++ b/tests/acceptance/00_basics/02_switches/staging/negate_hard_class.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/03_bodies/001.cf b/tests/acceptance/00_basics/03_bodies/001.cf index a05d6315fa..3486e14bf3 100644 --- a/tests/acceptance/00_basics/03_bodies/001.cf +++ b/tests/acceptance/00_basics/03_bodies/001.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/03_bodies/002.cf b/tests/acceptance/00_basics/03_bodies/002.cf index d8a793b614..ee7c969102 100644 --- a/tests/acceptance/00_basics/03_bodies/002.cf +++ b/tests/acceptance/00_basics/03_bodies/002.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/03_bodies/003.cf b/tests/acceptance/00_basics/03_bodies/003.cf index 8bc9826699..9f7bf80c4c 100644 --- a/tests/acceptance/00_basics/03_bodies/003.cf +++ b/tests/acceptance/00_basics/03_bodies/003.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/03_bodies/101.cf b/tests/acceptance/00_basics/03_bodies/101.cf index 17efb2596c..7e17381503 100644 --- a/tests/acceptance/00_basics/03_bodies/101.cf +++ b/tests/acceptance/00_basics/03_bodies/101.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "G", "g", default("$(this.promise_filename)") }; version => "1.0"; } @@ -140,4 +140,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/00_basics/03_bodies/102.cf b/tests/acceptance/00_basics/03_bodies/102.cf index 12b9b2628d..086c7a536d 100644 --- a/tests/acceptance/00_basics/03_bodies/102.cf +++ b/tests/acceptance/00_basics/03_bodies/102.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "g", default("$(this.promise_filename)") }; version => "1.0"; } @@ -142,4 +142,3 @@ bundle agent check "$(this.promise_filename) FAIL" report_to_file => "$(G.logfile)"; } - diff --git a/tests/acceptance/00_basics/03_bodies/103.cf b/tests/acceptance/00_basics/03_bodies/103.cf index 2f66ec5a22..5428b720ba 100644 --- a/tests/acceptance/00_basics/03_bodies/103.cf +++ b/tests/acceptance/00_basics/03_bodies/103.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "g", default("$(this.promise_filename)") }; version => "1.0"; } @@ -146,4 +146,3 @@ bundle agent check "$(this.promise_filename) FAIL" report_to_file => "$(G.logfile)"; } - diff --git a/tests/acceptance/00_basics/03_bodies/104.cf b/tests/acceptance/00_basics/03_bodies/104.cf index 022bb1d535..894e938765 100644 --- a/tests/acceptance/00_basics/03_bodies/104.cf +++ b/tests/acceptance/00_basics/03_bodies/104.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "g", default("$(this.promise_filename)") }; version => "1.0"; } @@ -147,4 +147,3 @@ bundle agent check "$(this.promise_filename) FAIL" report_to_file => "$(G.logfile)"; } - diff --git a/tests/acceptance/00_basics/03_bodies/109.cf b/tests/acceptance/00_basics/03_bodies/109.cf index 31b82e768a..419e3d7219 100644 --- a/tests/acceptance/00_basics/03_bodies/109.cf +++ b/tests/acceptance/00_basics/03_bodies/109.cf @@ -11,7 +11,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "g", default("$(this.promise_filename)") }; version => "1.0"; } @@ -167,4 +167,3 @@ bundle agent check "$(this.promise_filename) FAIL" report_to_file => "$(G.logfile)"; } - diff --git a/tests/acceptance/00_basics/03_bodies/112.cf b/tests/acceptance/00_basics/03_bodies/112.cf index 6373c38963..d62c3d602e 100644 --- a/tests/acceptance/00_basics/03_bodies/112.cf +++ b/tests/acceptance/00_basics/03_bodies/112.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "g", default("$(this.promise_filename)") }; version => "1.0"; } @@ -146,4 +146,3 @@ bundle agent check "$(this.promise_filename) FAIL" report_to_file => "$(G.logfile)"; } - diff --git a/tests/acceptance/00_basics/03_bodies/113.cf b/tests/acceptance/00_basics/03_bodies/113.cf index f875bc79d7..14c34e248a 100644 --- a/tests/acceptance/00_basics/03_bodies/113.cf +++ b/tests/acceptance/00_basics/03_bodies/113.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "g", default("$(this.promise_filename)") }; version => "1.0"; } @@ -147,4 +147,3 @@ bundle agent check "$(this.promise_filename) FAIL" report_to_file => "$(G.logfile)"; } - diff --git a/tests/acceptance/00_basics/03_bodies/114.cf b/tests/acceptance/00_basics/03_bodies/114.cf index d196d584e6..c862c94b1f 100644 --- a/tests/acceptance/00_basics/03_bodies/114.cf +++ b/tests/acceptance/00_basics/03_bodies/114.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "g", default("$(this.promise_filename)") }; version => "1.0"; } @@ -143,4 +143,3 @@ bundle agent check "$(this.promise_filename) FAIL" report_to_file => "$(G.logfile)"; } - diff --git a/tests/acceptance/00_basics/03_bodies/115.cf b/tests/acceptance/00_basics/03_bodies/115.cf index f704bf610c..abc78558e6 100644 --- a/tests/acceptance/00_basics/03_bodies/115.cf +++ b/tests/acceptance/00_basics/03_bodies/115.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "g", default("$(this.promise_filename)") }; version => "1.0"; } @@ -145,4 +145,3 @@ bundle agent check "$(this.promise_filename) FAIL" report_to_file => "$(G.logfile)"; } - diff --git a/tests/acceptance/00_basics/03_bodies/116.cf b/tests/acceptance/00_basics/03_bodies/116.cf index f60f987384..4bf1104fb8 100644 --- a/tests/acceptance/00_basics/03_bodies/116.cf +++ b/tests/acceptance/00_basics/03_bodies/116.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "g", default("$(this.promise_filename)") }; version => "1.0"; } @@ -148,4 +148,3 @@ bundle agent check "$(this.promise_filename) FAIL" report_to_file => "$(G.logfile)"; } - diff --git a/tests/acceptance/00_basics/03_bodies/117.cf b/tests/acceptance/00_basics/03_bodies/117.cf index 8437f00c90..922e31d315 100644 --- a/tests/acceptance/00_basics/03_bodies/117.cf +++ b/tests/acceptance/00_basics/03_bodies/117.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "g", default("$(this.promise_filename)") }; version => "1.0"; } @@ -148,4 +148,3 @@ bundle agent check "$(this.promise_filename) FAIL" report_to_file => "$(G.logfile)"; } - diff --git a/tests/acceptance/00_basics/03_bodies/118.cf b/tests/acceptance/00_basics/03_bodies/118.cf index d301e465fb..a996f5bbaf 100644 --- a/tests/acceptance/00_basics/03_bodies/118.cf +++ b/tests/acceptance/00_basics/03_bodies/118.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "g", default("$(this.promise_filename)") }; version => "1.0"; } @@ -148,4 +148,3 @@ bundle agent check "$(this.promise_filename) FAIL" report_to_file => "$(G.logfile)"; } - diff --git a/tests/acceptance/00_basics/03_bodies/119.cf b/tests/acceptance/00_basics/03_bodies/119.cf index e8eeea3ba3..4edaef07dd 100644 --- a/tests/acceptance/00_basics/03_bodies/119.cf +++ b/tests/acceptance/00_basics/03_bodies/119.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "g", default("$(this.promise_filename)") }; version => "1.0"; } @@ -148,4 +148,3 @@ bundle agent check "$(this.promise_filename) FAIL" report_to_file => "$(G.logfile)"; } - diff --git a/tests/acceptance/00_basics/03_bodies/120.cf b/tests/acceptance/00_basics/03_bodies/120.cf index a4cb564d52..75d1059620 100644 --- a/tests/acceptance/00_basics/03_bodies/120.cf +++ b/tests/acceptance/00_basics/03_bodies/120.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "g", default("$(this.promise_filename)") }; version => "1.0"; } @@ -148,4 +148,3 @@ bundle agent check "$(this.promise_filename) FAIL" report_to_file => "$(G.logfile)"; } - diff --git a/tests/acceptance/00_basics/03_bodies/121.cf b/tests/acceptance/00_basics/03_bodies/121.cf index d218e3f88c..98e93ba92c 100644 --- a/tests/acceptance/00_basics/03_bodies/121.cf +++ b/tests/acceptance/00_basics/03_bodies/121.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "g", default("$(this.promise_filename)") }; version => "1.0"; } @@ -148,4 +148,3 @@ bundle agent check "$(this.promise_filename) FAIL" report_to_file => "$(G.logfile)"; } - diff --git a/tests/acceptance/00_basics/03_bodies/122.x.cf b/tests/acceptance/00_basics/03_bodies/122.x.cf index 2eaea0ef9c..98d0db0190 100644 --- a/tests/acceptance/00_basics/03_bodies/122.x.cf +++ b/tests/acceptance/00_basics/03_bodies/122.x.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "g", default("$(this.promise_filename)") }; version => "1.0"; } @@ -148,4 +148,3 @@ bundle agent check "$(this.promise_filename) FAIL" report_to_file => "$(G.logfile)"; } - diff --git a/tests/acceptance/00_basics/03_bodies/123.cf b/tests/acceptance/00_basics/03_bodies/123.cf index 80dbc041fc..b05742a414 100644 --- a/tests/acceptance/00_basics/03_bodies/123.cf +++ b/tests/acceptance/00_basics/03_bodies/123.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/03_bodies/124.cf b/tests/acceptance/00_basics/03_bodies/124.cf index 822ded866d..27dc9fd5b3 100644 --- a/tests/acceptance/00_basics/03_bodies/124.cf +++ b/tests/acceptance/00_basics/03_bodies/124.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/03_bodies/125.cf b/tests/acceptance/00_basics/03_bodies/125.cf index 674cb06dd7..3f1d6a3932 100644 --- a/tests/acceptance/00_basics/03_bodies/125.cf +++ b/tests/acceptance/00_basics/03_bodies/125.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/03_bodies/401.x.cf b/tests/acceptance/00_basics/03_bodies/401.x.cf index 859e100ad0..f8e3543ede 100644 --- a/tests/acceptance/00_basics/03_bodies/401.x.cf +++ b/tests/acceptance/00_basics/03_bodies/401.x.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/03_bodies/CFE-1780/body-common-control-inputs/test.cf b/tests/acceptance/00_basics/03_bodies/CFE-1780/body-common-control-inputs/test.cf index 83239c4506..58ee06bd93 100644 --- a/tests/acceptance/00_basics/03_bodies/CFE-1780/body-common-control-inputs/test.cf +++ b/tests/acceptance/00_basics/03_bodies/CFE-1780/body-common-control-inputs/test.cf @@ -7,7 +7,7 @@ body common control { inputs => { - "../../../../default.cf.sub", + "../../../../default.sub.cf", }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/00_basics/03_bodies/CFE-1780/body-file-control-inputs/test.cf b/tests/acceptance/00_basics/03_bodies/CFE-1780/body-file-control-inputs/test.cf index b3040ce5c2..7dc0061925 100644 --- a/tests/acceptance/00_basics/03_bodies/CFE-1780/body-file-control-inputs/test.cf +++ b/tests/acceptance/00_basics/03_bodies/CFE-1780/body-file-control-inputs/test.cf @@ -7,7 +7,7 @@ body common control { inputs => { - "../../../../default.cf.sub", + "../../../../default.sub.cf", }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/00_basics/03_bodies/control-body-fncall.cf b/tests/acceptance/00_basics/03_bodies/control-body-fncall.cf index 8b06c192a4..340046b2b8 100644 --- a/tests/acceptance/00_basics/03_bodies/control-body-fncall.cf +++ b/tests/acceptance/00_basics/03_bodies/control-body-fncall.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/03_bodies/default_files_action.cf b/tests/acceptance/00_basics/03_bodies/default_files_action.cf index 27865b53a2..ce2be7fa0b 100644 --- a/tests/acceptance/00_basics/03_bodies/default_files_action.cf +++ b/tests/acceptance/00_basics/03_bodies/default_files_action.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/03_bodies/dynamic_inputs_findfiles.cf b/tests/acceptance/00_basics/03_bodies/dynamic_inputs_findfiles.cf index 753e93cec3..a344e28033 100644 --- a/tests/acceptance/00_basics/03_bodies/dynamic_inputs_findfiles.cf +++ b/tests/acceptance/00_basics/03_bodies/dynamic_inputs_findfiles.cf @@ -7,7 +7,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", @(dynamic.inputs), }; bundlesequence => { dynamic, default("$(this.promise_filename)") }; diff --git a/tests/acceptance/00_basics/03_bodies/dynamic_inputs_maplist.cf b/tests/acceptance/00_basics/03_bodies/dynamic_inputs_maplist.cf index f41108d1e6..05faa39932 100644 --- a/tests/acceptance/00_basics/03_bodies/dynamic_inputs_maplist.cf +++ b/tests/acceptance/00_basics/03_bodies/dynamic_inputs_maplist.cf @@ -7,7 +7,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", @(dynamic.inputs), }; bundlesequence => { dynamic, default("$(this.promise_filename)") }; diff --git a/tests/acceptance/00_basics/03_bodies/evaluation-should-respect-ifvarclass.cf b/tests/acceptance/00_basics/03_bodies/evaluation-should-respect-ifvarclass.cf index 9f64beb189..eadb0baa01 100644 --- a/tests/acceptance/00_basics/03_bodies/evaluation-should-respect-ifvarclass.cf +++ b/tests/acceptance/00_basics/03_bodies/evaluation-should-respect-ifvarclass.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/03_bodies/if-unless.cf b/tests/acceptance/00_basics/03_bodies/if-unless.cf index 8a15cdafd7..520c71eee5 100644 --- a/tests/acceptance/00_basics/03_bodies/if-unless.cf +++ b/tests/acceptance/00_basics/03_bodies/if-unless.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/03_bodies/ifvarclass-with-function.cf b/tests/acceptance/00_basics/03_bodies/ifvarclass-with-function.cf index 115561fea4..d36a2ce3ff 100644 --- a/tests/acceptance/00_basics/03_bodies/ifvarclass-with-function.cf +++ b/tests/acceptance/00_basics/03_bodies/ifvarclass-with-function.cf @@ -5,7 +5,7 @@ body common control { AUTO:: - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; !AUTO:: bundlesequence => { "init", "check" }; @@ -55,4 +55,3 @@ reports: DEBUG.invalid_function:: "invalid_function"; } - diff --git a/tests/acceptance/00_basics/03_bodies/inherit_from.cf b/tests/acceptance/00_basics/03_bodies/inherit_from.cf index 13f2193eff..d674dcdd9e 100644 --- a/tests/acceptance/00_basics/03_bodies/inherit_from.cf +++ b/tests/acceptance/00_basics/03_bodies/inherit_from.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/03_bodies/inherit_from_mismatched_args.x.cf b/tests/acceptance/00_basics/03_bodies/inherit_from_mismatched_args.x.cf index f191785452..9129c1d744 100644 --- a/tests/acceptance/00_basics/03_bodies/inherit_from_mismatched_args.x.cf +++ b/tests/acceptance/00_basics/03_bodies/inherit_from_mismatched_args.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/03_bodies/inherit_from_noargs.x.cf b/tests/acceptance/00_basics/03_bodies/inherit_from_noargs.x.cf index b6d92a164e..e562cdcd1f 100644 --- a/tests/acceptance/00_basics/03_bodies/inherit_from_noargs.x.cf +++ b/tests/acceptance/00_basics/03_bodies/inherit_from_noargs.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/03_bodies/inherit_from_parameters.cf b/tests/acceptance/00_basics/03_bodies/inherit_from_parameters.cf index 0f88628a73..6ddfd6ab01 100644 --- a/tests/acceptance/00_basics/03_bodies/inherit_from_parameters.cf +++ b/tests/acceptance/00_basics/03_bodies/inherit_from_parameters.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/03_bodies/inherit_from_self.x.cf b/tests/acceptance/00_basics/03_bodies/inherit_from_self.x.cf index 2cdef84702..8e66837451 100644 --- a/tests/acceptance/00_basics/03_bodies/inherit_from_self.x.cf +++ b/tests/acceptance/00_basics/03_bodies/inherit_from_self.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/03_bodies/inherit_from_with_global_var.cf b/tests/acceptance/00_basics/03_bodies/inherit_from_with_global_var.cf index c9dec4f368..64a8a7c763 100644 --- a/tests/acceptance/00_basics/03_bodies/inherit_from_with_global_var.cf +++ b/tests/acceptance/00_basics/03_bodies/inherit_from_with_global_var.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/03_bodies/log_file_permissions.cf b/tests/acceptance/00_basics/03_bodies/log_file_permissions.cf index d4a15c22d5..0af5a1db4c 100644 --- a/tests/acceptance/00_basics/03_bodies/log_file_permissions.cf +++ b/tests/acceptance/00_basics/03_bodies/log_file_permissions.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/03_bodies/multilevel_inherit_from_parameters.cf b/tests/acceptance/00_basics/03_bodies/multilevel_inherit_from_parameters.cf index 74d65692e5..833e32a851 100644 --- a/tests/acceptance/00_basics/03_bodies/multilevel_inherit_from_parameters.cf +++ b/tests/acceptance/00_basics/03_bodies/multilevel_inherit_from_parameters.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/03_bodies/report_error_when_body_missing.cf b/tests/acceptance/00_basics/03_bodies/report_error_when_body_missing.cf index c8435cde5d..f3ab2d8cb9 100644 --- a/tests/acceptance/00_basics/03_bodies/report_error_when_body_missing.cf +++ b/tests/acceptance/00_basics/03_bodies/report_error_when_body_missing.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/00_basics/03_bodies/staging/201.cf b/tests/acceptance/00_basics/03_bodies/staging/201.cf index d46de15ab3..855e9a7cba 100644 --- a/tests/acceptance/00_basics/03_bodies/staging/201.cf +++ b/tests/acceptance/00_basics/03_bodies/staging/201.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -129,4 +129,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/00_basics/03_bodies/staging/203.cf b/tests/acceptance/00_basics/03_bodies/staging/203.cf index f71586d0b2..26675bb028 100644 --- a/tests/acceptance/00_basics/03_bodies/staging/203.cf +++ b/tests/acceptance/00_basics/03_bodies/staging/203.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -129,4 +129,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/00_basics/03_bodies/staging/204.cf b/tests/acceptance/00_basics/03_bodies/staging/204.cf index 626c5e605c..fb87a50a6d 100644 --- a/tests/acceptance/00_basics/03_bodies/staging/204.cf +++ b/tests/acceptance/00_basics/03_bodies/staging/204.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -130,4 +130,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/00_basics/03_bodies/staging/209.cf b/tests/acceptance/00_basics/03_bodies/staging/209.cf index 7a3f7bd232..927dd97c06 100644 --- a/tests/acceptance/00_basics/03_bodies/staging/209.cf +++ b/tests/acceptance/00_basics/03_bodies/staging/209.cf @@ -11,7 +11,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -150,4 +150,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/00_basics/03_bodies/staging/212.cf b/tests/acceptance/00_basics/03_bodies/staging/212.cf index 77791b0f76..2dde5891f8 100644 --- a/tests/acceptance/00_basics/03_bodies/staging/212.cf +++ b/tests/acceptance/00_basics/03_bodies/staging/212.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -129,4 +129,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/00_basics/03_bodies/staging/213.cf b/tests/acceptance/00_basics/03_bodies/staging/213.cf index e170a471a8..d924fd95a5 100644 --- a/tests/acceptance/00_basics/03_bodies/staging/213.cf +++ b/tests/acceptance/00_basics/03_bodies/staging/213.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -130,4 +130,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/00_basics/03_bodies/staging/214.cf b/tests/acceptance/00_basics/03_bodies/staging/214.cf index d42b0b7968..cfae1139a4 100644 --- a/tests/acceptance/00_basics/03_bodies/staging/214.cf +++ b/tests/acceptance/00_basics/03_bodies/staging/214.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -125,4 +125,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/00_basics/03_bodies/staging/215.cf b/tests/acceptance/00_basics/03_bodies/staging/215.cf index c24a639a27..ce28a60e10 100644 --- a/tests/acceptance/00_basics/03_bodies/staging/215.cf +++ b/tests/acceptance/00_basics/03_bodies/staging/215.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -128,4 +128,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/00_basics/03_bodies/staging/216.cf b/tests/acceptance/00_basics/03_bodies/staging/216.cf index 38922d62d9..4bd72f874e 100644 --- a/tests/acceptance/00_basics/03_bodies/staging/216.cf +++ b/tests/acceptance/00_basics/03_bodies/staging/216.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -131,4 +131,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/00_basics/03_bodies/staging/217.cf b/tests/acceptance/00_basics/03_bodies/staging/217.cf index 5d839a96ec..cd477d5ba1 100644 --- a/tests/acceptance/00_basics/03_bodies/staging/217.cf +++ b/tests/acceptance/00_basics/03_bodies/staging/217.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -132,4 +132,3 @@ bundle agent check "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/00_basics/03_bodies/staging/218.cf b/tests/acceptance/00_basics/03_bodies/staging/218.cf index 350c630751..890ce116e1 100644 --- a/tests/acceptance/00_basics/03_bodies/staging/218.cf +++ b/tests/acceptance/00_basics/03_bodies/staging/218.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/03_bodies/staging/219.cf b/tests/acceptance/00_basics/03_bodies/staging/219.cf index ed9c0de952..44a34c52c1 100644 --- a/tests/acceptance/00_basics/03_bodies/staging/219.cf +++ b/tests/acceptance/00_basics/03_bodies/staging/219.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/03_bodies/staging/221.cf b/tests/acceptance/00_basics/03_bodies/staging/221.cf index 6f6adade07..633b09ec86 100644 --- a/tests/acceptance/00_basics/03_bodies/staging/221.cf +++ b/tests/acceptance/00_basics/03_bodies/staging/221.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/03_bodies/staging/223.x.cf b/tests/acceptance/00_basics/03_bodies/staging/223.x.cf index 34c96430e8..110ccae1d6 100644 --- a/tests/acceptance/00_basics/03_bodies/staging/223.x.cf +++ b/tests/acceptance/00_basics/03_bodies/staging/223.x.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -148,4 +148,3 @@ bundle agent check "$(this.promise_filename) FAIL" report_to_file => "$(G.logfile)"; } - diff --git a/tests/acceptance/00_basics/03_bodies/staging/224.x.cf b/tests/acceptance/00_basics/03_bodies/staging/224.x.cf index 6e3a3eae75..3cdf1a6a51 100644 --- a/tests/acceptance/00_basics/03_bodies/staging/224.x.cf +++ b/tests/acceptance/00_basics/03_bodies/staging/224.x.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -148,4 +148,3 @@ bundle agent check "$(this.promise_filename) FAIL" report_to_file => "$(G.logfile)"; } - diff --git a/tests/acceptance/00_basics/03_bodies/staging/225.cf b/tests/acceptance/00_basics/03_bodies/staging/225.cf index 92c182e82c..53651ab2a2 100644 --- a/tests/acceptance/00_basics/03_bodies/staging/225.cf +++ b/tests/acceptance/00_basics/03_bodies/staging/225.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -148,4 +148,3 @@ bundle agent check "$(this.promise_filename) FAIL" report_to_file => "$(G.logfile)"; } - diff --git a/tests/acceptance/00_basics/04_bundles/agent-bundle-class-bundle-scope-default-perspective.cf b/tests/acceptance/00_basics/04_bundles/agent-bundle-class-bundle-scope-default-perspective.cf index f67074e04a..f8304cd920 100755 --- a/tests/acceptance/00_basics/04_bundles/agent-bundle-class-bundle-scope-default-perspective.cf +++ b/tests/acceptance/00_basics/04_bundles/agent-bundle-class-bundle-scope-default-perspective.cf @@ -1,7 +1,7 @@ #!/var/cfengine/bin/cf-agent -f- body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/00_basics/04_bundles/agent-bundle-class-bundle-scope-namespace-perspective.cf b/tests/acceptance/00_basics/04_bundles/agent-bundle-class-bundle-scope-namespace-perspective.cf index a62f4ce532..b13dc734f0 100755 --- a/tests/acceptance/00_basics/04_bundles/agent-bundle-class-bundle-scope-namespace-perspective.cf +++ b/tests/acceptance/00_basics/04_bundles/agent-bundle-class-bundle-scope-namespace-perspective.cf @@ -1,7 +1,7 @@ #!/var/cfengine/bin/cf-agent -f- body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/00_basics/04_bundles/agent-bundle-namespaced-class-default-perspective.cf b/tests/acceptance/00_basics/04_bundles/agent-bundle-namespaced-class-default-perspective.cf index a75dd14b86..76c2ad49c2 100755 --- a/tests/acceptance/00_basics/04_bundles/agent-bundle-namespaced-class-default-perspective.cf +++ b/tests/acceptance/00_basics/04_bundles/agent-bundle-namespaced-class-default-perspective.cf @@ -1,7 +1,7 @@ #!/var/cfengine/bin/cf-agent -f- body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/00_basics/04_bundles/agent-bundle-namespaced-class-namespace-perspective.cf b/tests/acceptance/00_basics/04_bundles/agent-bundle-namespaced-class-namespace-perspective.cf index eacf60be5e..96b9383cae 100755 --- a/tests/acceptance/00_basics/04_bundles/agent-bundle-namespaced-class-namespace-perspective.cf +++ b/tests/acceptance/00_basics/04_bundles/agent-bundle-namespaced-class-namespace-perspective.cf @@ -1,7 +1,7 @@ #!/var/cfengine/bin/cf-agent -f- body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/00_basics/04_bundles/bundle-iteration.cf b/tests/acceptance/00_basics/04_bundles/bundle-iteration.cf index 44f621294e..a5487a4533 100644 --- a/tests/acceptance/00_basics/04_bundles/bundle-iteration.cf +++ b/tests/acceptance/00_basics/04_bundles/bundle-iteration.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/00_basics/04_bundles/call_namespaced_bundle_from_namespace_without_specifying_namespace.cf b/tests/acceptance/00_basics/04_bundles/call_namespaced_bundle_from_namespace_without_specifying_namespace.cf index 9f373fdef1..29bb4eec4a 100644 --- a/tests/acceptance/00_basics/04_bundles/call_namespaced_bundle_from_namespace_without_specifying_namespace.cf +++ b/tests/acceptance/00_basics/04_bundles/call_namespaced_bundle_from_namespace_without_specifying_namespace.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/04_bundles/duplicate_promise_handles.cf b/tests/acceptance/00_basics/04_bundles/duplicate_promise_handles.cf index 862346a2a2..57721eed47 100644 --- a/tests/acceptance/00_basics/04_bundles/duplicate_promise_handles.cf +++ b/tests/acceptance/00_basics/04_bundles/duplicate_promise_handles.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/app_based_inputs.cf b/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/app_based_inputs.cf index 557377e0da..b34736045d 100644 --- a/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/app_based_inputs.cf +++ b/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/app_based_inputs.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/classification_bundles_not_in_sequence.cf b/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/classification_bundles_not_in_sequence.cf index 2ef2776e0e..3bccf18563 100644 --- a/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/classification_bundles_not_in_sequence.cf +++ b/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/classification_bundles_not_in_sequence.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/classification_bundles_not_in_sequence2.cf b/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/classification_bundles_not_in_sequence2.cf index 07b07876b5..7bf4601b30 100644 --- a/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/classification_bundles_not_in_sequence2.cf +++ b/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/classification_bundles_not_in_sequence2.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/classification_bundles_not_in_sequence3.cf b/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/classification_bundles_not_in_sequence3.cf index 113fe28858..5d88425595 100644 --- a/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/classification_bundles_not_in_sequence3.cf +++ b/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/classification_bundles_not_in_sequence3.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/dynamic_inputs_based_on_class_set_using_variable_file_control_extends_inputs.cf b/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/dynamic_inputs_based_on_class_set_using_variable_file_control_extends_inputs.cf index 05fe0493fb..94699e542b 100644 --- a/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/dynamic_inputs_based_on_class_set_using_variable_file_control_extends_inputs.cf +++ b/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/dynamic_inputs_based_on_class_set_using_variable_file_control_extends_inputs.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/simple.cf b/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/simple.cf index 07b07876b5..7bf4601b30 100644 --- a/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/simple.cf +++ b/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/simple.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/04_bundles/empty_list_or_datacontainer_should_not_error_bundlesequence/bundlesequence_iterate_over_data_container.cf b/tests/acceptance/00_basics/04_bundles/empty_list_or_datacontainer_should_not_error_bundlesequence/bundlesequence_iterate_over_data_container.cf index 02fbdad689..758aaa17d6 100644 --- a/tests/acceptance/00_basics/04_bundles/empty_list_or_datacontainer_should_not_error_bundlesequence/bundlesequence_iterate_over_data_container.cf +++ b/tests/acceptance/00_basics/04_bundles/empty_list_or_datacontainer_should_not_error_bundlesequence/bundlesequence_iterate_over_data_container.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { collect_stories_metadata, test_precheck, def, test, @(def.container), check }; } diff --git a/tests/acceptance/00_basics/04_bundles/getindices-vars-need-secondpass.cf b/tests/acceptance/00_basics/04_bundles/getindices-vars-need-secondpass.cf index fa70031a49..a0ae00d0b4 100644 --- a/tests/acceptance/00_basics/04_bundles/getindices-vars-need-secondpass.cf +++ b/tests/acceptance/00_basics/04_bundles/getindices-vars-need-secondpass.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/00_basics/04_bundles/namespaced.cf b/tests/acceptance/00_basics/04_bundles/namespaced.cf index 6a10660840..8db5442bc2 100644 --- a/tests/acceptance/00_basics/04_bundles/namespaced.cf +++ b/tests/acceptance/00_basics/04_bundles/namespaced.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub", "namespaced.cf.sub" }; + inputs => { "../../default.sub.cf", "namespaced.cf.sub" }; bundlesequence => { ns1:mytest("x"), ns2:mytest("x", "y"), diff --git a/tests/acceptance/00_basics/04_bundles/namespaced.x.cf b/tests/acceptance/00_basics/04_bundles/namespaced.x.cf index 7aa425f68c..cb7feec168 100644 --- a/tests/acceptance/00_basics/04_bundles/namespaced.x.cf +++ b/tests/acceptance/00_basics/04_bundles/namespaced.x.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub", "namespaced.cf.subx" }; + inputs => { "../../default.sub.cf", "namespaced.cf.subx" }; bundlesequence => { mytest, default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/00_basics/04_bundles/non_default_def.cf b/tests/acceptance/00_basics/04_bundles/non_default_def.cf index 59f99b5e41..6a737d1d26 100644 --- a/tests/acceptance/00_basics/04_bundles/non_default_def.cf +++ b/tests/acceptance/00_basics/04_bundles/non_default_def.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/00_basics/04_bundles/passing-vars.cf b/tests/acceptance/00_basics/04_bundles/passing-vars.cf index 304d6afd01..411cf54165 100644 --- a/tests/acceptance/00_basics/04_bundles/passing-vars.cf +++ b/tests/acceptance/00_basics/04_bundles/passing-vars.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/04_bundles/unless.cf b/tests/acceptance/00_basics/04_bundles/unless.cf index aab8111c60..681af026cd 100644 --- a/tests/acceptance/00_basics/04_bundles/unless.cf +++ b/tests/acceptance/00_basics/04_bundles/unless.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; } diff --git a/tests/acceptance/00_basics/04_bundles/unless_vars_order.cf b/tests/acceptance/00_basics/04_bundles/unless_vars_order.cf index a8b6ca555b..4a2da0e866 100644 --- a/tests/acceptance/00_basics/04_bundles/unless_vars_order.cf +++ b/tests/acceptance/00_basics/04_bundles/unless_vars_order.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; } diff --git a/tests/acceptance/00_basics/04_bundles/unsupported_promise_types_in_common.x.cf b/tests/acceptance/00_basics/04_bundles/unsupported_promise_types_in_common.x.cf index eec961e8f2..dd5535a5b9 100644 --- a/tests/acceptance/00_basics/04_bundles/unsupported_promise_types_in_common.x.cf +++ b/tests/acceptance/00_basics/04_bundles/unsupported_promise_types_in_common.x.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } @@ -23,4 +23,3 @@ bundle agent reporter(x) reports: "${x}"; } - diff --git a/tests/acceptance/00_basics/04_bundles/wrong-bundle-type.cf b/tests/acceptance/00_basics/04_bundles/wrong-bundle-type.cf index 4015e75941..34f8381459 100644 --- a/tests/acceptance/00_basics/04_bundles/wrong-bundle-type.cf +++ b/tests/acceptance/00_basics/04_bundles/wrong-bundle-type.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -32,4 +32,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/00_basics/05_licenses/001.cf b/tests/acceptance/00_basics/05_licenses/001.cf index 58cbe71ecb..9a19457b1d 100644 --- a/tests/acceptance/00_basics/05_licenses/001.cf +++ b/tests/acceptance/00_basics/05_licenses/001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -43,4 +43,3 @@ bundle agent check fail:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/00_basics/05_licenses/001.cf.sub b/tests/acceptance/00_basics/05_licenses/001.cf.sub index 7e90ec7914..da26888955 100644 --- a/tests/acceptance/00_basics/05_licenses/001.cf.sub +++ b/tests/acceptance/00_basics/05_licenses/001.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; host_licenses_paid => "0"; @@ -35,4 +35,3 @@ bundle agent check vars: "dummy" string => "dummy"; } - diff --git a/tests/acceptance/00_basics/06_host_specific_data/01-vars.cf b/tests/acceptance/00_basics/06_host_specific_data/01-vars.cf index 3007dfcc17..06b7ceedc7 100644 --- a/tests/acceptance/00_basics/06_host_specific_data/01-vars.cf +++ b/tests/acceptance/00_basics/06_host_specific_data/01-vars.cf @@ -1,7 +1,7 @@ # basic test of the host_specific.json functionality: 'vars' object body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/06_host_specific_data/02-variables.cf b/tests/acceptance/00_basics/06_host_specific_data/02-variables.cf index 9ad8edcda1..1843165612 100644 --- a/tests/acceptance/00_basics/06_host_specific_data/02-variables.cf +++ b/tests/acceptance/00_basics/06_host_specific_data/02-variables.cf @@ -1,7 +1,7 @@ # basic test of the host_specific.json functionality: 'variables' object body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/06_host_specific_data/03-variables-value.cf b/tests/acceptance/00_basics/06_host_specific_data/03-variables-value.cf index 3bd5590e4c..d75887d71a 100644 --- a/tests/acceptance/00_basics/06_host_specific_data/03-variables-value.cf +++ b/tests/acceptance/00_basics/06_host_specific_data/03-variables-value.cf @@ -1,7 +1,7 @@ # basic test of the host_specific.json functionality: 'variables' object with the 'value' field body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/06_host_specific_data/04-classes.cf b/tests/acceptance/00_basics/06_host_specific_data/04-classes.cf index 9be75a4c28..421a5af2fc 100644 --- a/tests/acceptance/00_basics/06_host_specific_data/04-classes.cf +++ b/tests/acceptance/00_basics/06_host_specific_data/04-classes.cf @@ -1,7 +1,7 @@ # basic test of the host_specific.json functionality: 'classes' object body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/06_host_specific_data/05-variables-tag-comment.cf b/tests/acceptance/00_basics/06_host_specific_data/05-variables-tag-comment.cf index 4e420abff9..b9c0591d9f 100644 --- a/tests/acceptance/00_basics/06_host_specific_data/05-variables-tag-comment.cf +++ b/tests/acceptance/00_basics/06_host_specific_data/05-variables-tag-comment.cf @@ -1,7 +1,7 @@ # basic test of the host_specific.json functionality: 'variables' object with a tag and a comment body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/06_host_specific_data/06-classes-tag-comment.cf b/tests/acceptance/00_basics/06_host_specific_data/06-classes-tag-comment.cf index 3b63e6e123..2f989a3f73 100644 --- a/tests/acceptance/00_basics/06_host_specific_data/06-classes-tag-comment.cf +++ b/tests/acceptance/00_basics/06_host_specific_data/06-classes-tag-comment.cf @@ -1,7 +1,7 @@ # basic test of the host_specific.json functionality: 'classes' object with a tag and a comment body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/06_host_specific_data/07-invalid-data.cf b/tests/acceptance/00_basics/06_host_specific_data/07-invalid-data.cf index 065eb58bbe..b7d4f94f8b 100644 --- a/tests/acceptance/00_basics/06_host_specific_data/07-invalid-data.cf +++ b/tests/acceptance/00_basics/06_host_specific_data/07-invalid-data.cf @@ -1,7 +1,7 @@ # basic test of the host_specific.json functionality: 'classes' object with a tag and a comment body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/06_host_specific_data/08-class-expression.cf b/tests/acceptance/00_basics/06_host_specific_data/08-class-expression.cf index 6de71e05c7..e2df4797ff 100644 --- a/tests/acceptance/00_basics/06_host_specific_data/08-class-expression.cf +++ b/tests/acceptance/00_basics/06_host_specific_data/08-class-expression.cf @@ -1,7 +1,7 @@ # basic test of the host_specific.json functionality: 'classes' object with a tag and a comment body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/06_host_specific_data/09-class-reg-expression.cf b/tests/acceptance/00_basics/06_host_specific_data/09-class-reg-expression.cf index 83933041f1..52635d641f 100644 --- a/tests/acceptance/00_basics/06_host_specific_data/09-class-reg-expression.cf +++ b/tests/acceptance/00_basics/06_host_specific_data/09-class-reg-expression.cf @@ -1,7 +1,7 @@ # basic test of the host_specific.json functionality: 'classes' object with a tag and a comment body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/06_host_specific_data/10-variable-references.cf b/tests/acceptance/00_basics/06_host_specific_data/10-variable-references.cf index 0f186d4946..1da6cc1d3f 100644 --- a/tests/acceptance/00_basics/06_host_specific_data/10-variable-references.cf +++ b/tests/acceptance/00_basics/06_host_specific_data/10-variable-references.cf @@ -1,7 +1,7 @@ # basic test of the host_specific.json functionality: 'classes' object with a tag and a comment body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/06_host_specific_data/11-augments-no-override.cf b/tests/acceptance/00_basics/06_host_specific_data/11-augments-no-override.cf index 5493677f5f..79e3d2bbb9 100644 --- a/tests/acceptance/00_basics/06_host_specific_data/11-augments-no-override.cf +++ b/tests/acceptance/00_basics/06_host_specific_data/11-augments-no-override.cf @@ -1,7 +1,7 @@ # basic test of the host_specific.json functionality: 'variables' object with a tag and a comment body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/CFE-1886.cf b/tests/acceptance/00_basics/CFE-1886.cf index c2fc8bcdc3..af9805e69b 100644 --- a/tests/acceptance/00_basics/CFE-1886.cf +++ b/tests/acceptance/00_basics/CFE-1886.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/augments.cf b/tests/acceptance/00_basics/def.json/augments.cf index 1598f42c1c..65e22b58d5 100644 --- a/tests/acceptance/00_basics/def.json/augments.cf +++ b/tests/acceptance/00_basics/def.json/augments.cf @@ -1,7 +1,7 @@ # basic test of the def.json facility: augments body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/augments_classes/augments_classes.cf b/tests/acceptance/00_basics/def.json/augments_classes/augments_classes.cf index 7a2f7cd1eb..1dd25ad17f 100644 --- a/tests/acceptance/00_basics/def.json/augments_classes/augments_classes.cf +++ b/tests/acceptance/00_basics/def.json/augments_classes/augments_classes.cf @@ -1,7 +1,7 @@ # basic test of the def.json facility: augments body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/augments_order.cf b/tests/acceptance/00_basics/def.json/augments_order.cf index bb229e882e..d029b42253 100644 --- a/tests/acceptance/00_basics/def.json/augments_order.cf +++ b/tests/acceptance/00_basics/def.json/augments_order.cf @@ -1,7 +1,7 @@ # test that 'augments' in def.json are applied last body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/bad-json.cf b/tests/acceptance/00_basics/def.json/bad-json.cf index 2eb0c23bf9..e6ea9261b6 100644 --- a/tests/acceptance/00_basics/def.json/bad-json.cf +++ b/tests/acceptance/00_basics/def.json/bad-json.cf @@ -1,7 +1,7 @@ # test of the def.json facility: complain if a bad JSON file is found body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/class_from_classexpression.cf b/tests/acceptance/00_basics/def.json/class_from_classexpression.cf index 80531c1716..08df96c6b9 100644 --- a/tests/acceptance/00_basics/def.json/class_from_classexpression.cf +++ b/tests/acceptance/00_basics/def.json/class_from_classexpression.cf @@ -1,7 +1,7 @@ # basic test of the def.json facility: augments body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/classes.cf b/tests/acceptance/00_basics/def.json/classes.cf index a68989fcbe..b368d4c9ee 100644 --- a/tests/acceptance/00_basics/def.json/classes.cf +++ b/tests/acceptance/00_basics/def.json/classes.cf @@ -1,7 +1,7 @@ # basic test of the def.json facility: classes body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/classes_with_ns.cf b/tests/acceptance/00_basics/def.json/classes_with_ns.cf index 6c6e47d615..06ee3c7d02 100644 --- a/tests/acceptance/00_basics/def.json/classes_with_ns.cf +++ b/tests/acceptance/00_basics/def.json/classes_with_ns.cf @@ -1,7 +1,7 @@ # basic test of the def.json facility: classes with namespace specification body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/classes_with_ns_tags.cf b/tests/acceptance/00_basics/def.json/classes_with_ns_tags.cf index f7203e8e32..4ca40b7253 100644 --- a/tests/acceptance/00_basics/def.json/classes_with_ns_tags.cf +++ b/tests/acceptance/00_basics/def.json/classes_with_ns_tags.cf @@ -1,7 +1,7 @@ # basic test of the def.json facility: classes with namespace specification and tags body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/concurrent-vars-and-variables-keys/both-can-define-vars.cf b/tests/acceptance/00_basics/def.json/concurrent-vars-and-variables-keys/both-can-define-vars.cf index 0e8e4a808e..beb15fbd5b 100644 --- a/tests/acceptance/00_basics/def.json/concurrent-vars-and-variables-keys/both-can-define-vars.cf +++ b/tests/acceptance/00_basics/def.json/concurrent-vars-and-variables-keys/both-can-define-vars.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/concurrent-vars-and-variables-keys/variables-wins-variables-listed-first/variables-wins.cf b/tests/acceptance/00_basics/def.json/concurrent-vars-and-variables-keys/variables-wins-variables-listed-first/variables-wins.cf index 1b659fa5a4..0f713777fa 100644 --- a/tests/acceptance/00_basics/def.json/concurrent-vars-and-variables-keys/variables-wins-variables-listed-first/variables-wins.cf +++ b/tests/acceptance/00_basics/def.json/concurrent-vars-and-variables-keys/variables-wins-variables-listed-first/variables-wins.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../../../default.cf.sub" }; + inputs => { "../../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/concurrent-vars-and-variables-keys/variables-wins.cf b/tests/acceptance/00_basics/def.json/concurrent-vars-and-variables-keys/variables-wins.cf index 0078280244..7282dfd2f9 100644 --- a/tests/acceptance/00_basics/def.json/concurrent-vars-and-variables-keys/variables-wins.cf +++ b/tests/acceptance/00_basics/def.json/concurrent-vars-and-variables-keys/variables-wins.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/def_preferred.json/def_preferred.cf b/tests/acceptance/00_basics/def.json/def_preferred.json/def_preferred.cf index b12827224f..526046b2e5 100644 --- a/tests/acceptance/00_basics/def.json/def_preferred.json/def_preferred.cf +++ b/tests/acceptance/00_basics/def.json/def_preferred.json/def_preferred.cf @@ -1,9 +1,9 @@ body common control { - # Feel free to avoid including "default.cf.sub" and define your + # Feel free to avoid including "default.sub.cf" and define your # own bundlesequence for simple tests - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/00_basics/def.json/inputs.cf b/tests/acceptance/00_basics/def.json/inputs.cf index 45b2f83d92..97602f4bf8 100644 --- a/tests/acceptance/00_basics/def.json/inputs.cf +++ b/tests/acceptance/00_basics/def.json/inputs.cf @@ -1,7 +1,7 @@ # basic test of the def.json facility: inputs body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/json-inputs-not-array.cf b/tests/acceptance/00_basics/def.json/json-inputs-not-array.cf index 446fe6b259..cd6545f547 100644 --- a/tests/acceptance/00_basics/def.json/json-inputs-not-array.cf +++ b/tests/acceptance/00_basics/def.json/json-inputs-not-array.cf @@ -2,7 +2,7 @@ # error message. body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/json-inputs-not-auto-applied.cf b/tests/acceptance/00_basics/def.json/json-inputs-not-auto-applied.cf index 6578101594..306f22e36d 100644 --- a/tests/acceptance/00_basics/def.json/json-inputs-not-auto-applied.cf +++ b/tests/acceptance/00_basics/def.json/json-inputs-not-auto-applied.cf @@ -1,7 +1,7 @@ # Test that def.json:inputs is not auto loaded. body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/policy_server_classes.cf b/tests/acceptance/00_basics/def.json/policy_server_classes.cf index 9d2361d8d5..a61acf5ca3 100644 --- a/tests/acceptance/00_basics/def.json/policy_server_classes.cf +++ b/tests/acceptance/00_basics/def.json/policy_server_classes.cf @@ -1,7 +1,7 @@ # basic test of the def.json facility: classes body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/show_vars_JSON.cf b/tests/acceptance/00_basics/def.json/show_vars_JSON.cf index 5c26d1865f..58252279b3 100644 --- a/tests/acceptance/00_basics/def.json/show_vars_JSON.cf +++ b/tests/acceptance/00_basics/def.json/show_vars_JSON.cf @@ -1,7 +1,7 @@ # basic test of the def.json facility: classes body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/state.cf b/tests/acceptance/00_basics/def.json/state.cf index 5fee065ed2..fb438f3e19 100644 --- a/tests/acceptance/00_basics/def.json/state.cf +++ b/tests/acceptance/00_basics/def.json/state.cf @@ -1,7 +1,7 @@ # full test of the def.json facility body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/variables.cf b/tests/acceptance/00_basics/def.json/variables.cf index 9280795336..86d9e180cf 100644 --- a/tests/acceptance/00_basics/def.json/variables.cf +++ b/tests/acceptance/00_basics/def.json/variables.cf @@ -1,7 +1,7 @@ # basic test of the def.json facility: variables body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/variables_bare_array.cf b/tests/acceptance/00_basics/def.json/variables_bare_array.cf index 76ea51d0e1..f411625969 100644 --- a/tests/acceptance/00_basics/def.json/variables_bare_array.cf +++ b/tests/acceptance/00_basics/def.json/variables_bare_array.cf @@ -1,7 +1,7 @@ # basic test of the def.json facility: variables body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/variables_bare_string.cf b/tests/acceptance/00_basics/def.json/variables_bare_string.cf index 3a41ebcdc3..909040f830 100644 --- a/tests/acceptance/00_basics/def.json/variables_bare_string.cf +++ b/tests/acceptance/00_basics/def.json/variables_bare_string.cf @@ -1,7 +1,7 @@ # basic test of the def.json facility: variables body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/variables_with_bundle.cf b/tests/acceptance/00_basics/def.json/variables_with_bundle.cf index 62d94417f9..1a446a93de 100644 --- a/tests/acceptance/00_basics/def.json/variables_with_bundle.cf +++ b/tests/acceptance/00_basics/def.json/variables_with_bundle.cf @@ -1,7 +1,7 @@ # basic test of the def.json facility: variables with bundle specification body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/variables_with_ns.cf b/tests/acceptance/00_basics/def.json/variables_with_ns.cf index e59d9a9ba3..ea014dbe59 100644 --- a/tests/acceptance/00_basics/def.json/variables_with_ns.cf +++ b/tests/acceptance/00_basics/def.json/variables_with_ns.cf @@ -1,7 +1,7 @@ # basic test of the def.json facility: variables with namespace and bundle specification body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/vars.cf b/tests/acceptance/00_basics/def.json/vars.cf index fe2b0afe7c..121eb00c28 100644 --- a/tests/acceptance/00_basics/def.json/vars.cf +++ b/tests/acceptance/00_basics/def.json/vars.cf @@ -1,7 +1,7 @@ # basic test of the def.json facility: vars body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/vars_with_bundle.cf b/tests/acceptance/00_basics/def.json/vars_with_bundle.cf index 9f35de0762..4984a8a9c9 100644 --- a/tests/acceptance/00_basics/def.json/vars_with_bundle.cf +++ b/tests/acceptance/00_basics/def.json/vars_with_bundle.cf @@ -1,7 +1,7 @@ # basic test of the def.json facility: vars with bundle specification body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/def.json/vars_with_ns.cf b/tests/acceptance/00_basics/def.json/vars_with_ns.cf index a10f97c283..0108e7c091 100644 --- a/tests/acceptance/00_basics/def.json/vars_with_ns.cf +++ b/tests/acceptance/00_basics/def.json/vars_with_ns.cf @@ -1,7 +1,7 @@ # basic test of the def.json facility: vars with namespace and bundle specification body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/environment/hpux.cf b/tests/acceptance/00_basics/environment/hpux.cf index f95d4e21bc..0501cd03b4 100644 --- a/tests/acceptance/00_basics/environment/hpux.cf +++ b/tests/acceptance/00_basics/environment/hpux.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/environment/proc-net-functions.cf b/tests/acceptance/00_basics/environment/proc-net-functions.cf index 6d4833d8e4..460669d382 100644 --- a/tests/acceptance/00_basics/environment/proc-net-functions.cf +++ b/tests/acceptance/00_basics/environment/proc-net-functions.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/environment/proc-net-functions.cf.sub b/tests/acceptance/00_basics/environment/proc-net-functions.cf.sub index 84ecb38768..2ead202564 100644 --- a/tests/acceptance/00_basics/environment/proc-net-functions.cf.sub +++ b/tests/acceptance/00_basics/environment/proc-net-functions.cf.sub @@ -4,7 +4,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/environment/proc-net.cf b/tests/acceptance/00_basics/environment/proc-net.cf index 733153c5d7..f014c88717 100644 --- a/tests/acceptance/00_basics/environment/proc-net.cf +++ b/tests/acceptance/00_basics/environment/proc-net.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/environment/proc-net.cf.sub b/tests/acceptance/00_basics/environment/proc-net.cf.sub index 53c317c26c..165e30c908 100644 --- a/tests/acceptance/00_basics/environment/proc-net.cf.sub +++ b/tests/acceptance/00_basics/environment/proc-net.cf.sub @@ -4,7 +4,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/environment/workdir_correct_after_files_promise.cf b/tests/acceptance/00_basics/environment/workdir_correct_after_files_promise.cf index 4d326a7585..840425ff24 100644 --- a/tests/acceptance/00_basics/environment/workdir_correct_after_files_promise.cf +++ b/tests/acceptance/00_basics/environment/workdir_correct_after_files_promise.cf @@ -5,7 +5,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/environment/workdir_correct_after_files_promise.cf.sub b/tests/acceptance/00_basics/environment/workdir_correct_after_files_promise.cf.sub index 3b71fde81e..a876e45571 100644 --- a/tests/acceptance/00_basics/environment/workdir_correct_after_files_promise.cf.sub +++ b/tests/acceptance/00_basics/environment/workdir_correct_after_files_promise.cf.sub @@ -5,7 +5,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/ifelapsed_and_expireafter/expireafter.cf b/tests/acceptance/00_basics/ifelapsed_and_expireafter/expireafter.cf index f38df35173..addccaa4c8 100644 --- a/tests/acceptance/00_basics/ifelapsed_and_expireafter/expireafter.cf +++ b/tests/acceptance/00_basics/ifelapsed_and_expireafter/expireafter.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/ifelapsed_and_expireafter/expireafter.cf.sub b/tests/acceptance/00_basics/ifelapsed_and_expireafter/expireafter.cf.sub index bd772e0f98..3e1ca1c0cf 100644 --- a/tests/acceptance/00_basics/ifelapsed_and_expireafter/expireafter.cf.sub +++ b/tests/acceptance/00_basics/ifelapsed_and_expireafter/expireafter.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "hang" }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/ifelapsed_and_expireafter/locks.cf b/tests/acceptance/00_basics/ifelapsed_and_expireafter/locks.cf index 29f792aafd..aac018a86d 100644 --- a/tests/acceptance/00_basics/ifelapsed_and_expireafter/locks.cf +++ b/tests/acceptance/00_basics/ifelapsed_and_expireafter/locks.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/ifelapsed_and_expireafter/redmine_6334.cf b/tests/acceptance/00_basics/ifelapsed_and_expireafter/redmine_6334.cf index 52babc3728..4d1f0548a2 100644 --- a/tests/acceptance/00_basics/ifelapsed_and_expireafter/redmine_6334.cf +++ b/tests/acceptance/00_basics/ifelapsed_and_expireafter/redmine_6334.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/ifelapsed_and_expireafter/timed/defaults.cf b/tests/acceptance/00_basics/ifelapsed_and_expireafter/timed/defaults.cf index ae7c717b89..7dbeae45e1 100644 --- a/tests/acceptance/00_basics/ifelapsed_and_expireafter/timed/defaults.cf +++ b/tests/acceptance/00_basics/ifelapsed_and_expireafter/timed/defaults.cf @@ -21,7 +21,7 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default($(this.promiser_filename)) }; } diff --git a/tests/acceptance/00_basics/ifelapsed_and_expireafter/timed/defaults.cf.sub b/tests/acceptance/00_basics/ifelapsed_and_expireafter/timed/defaults.cf.sub index 59b7ac0965..668797b4a2 100644 --- a/tests/acceptance/00_basics/ifelapsed_and_expireafter/timed/defaults.cf.sub +++ b/tests/acceptance/00_basics/ifelapsed_and_expireafter/timed/defaults.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { "test" }; } diff --git a/tests/acceptance/00_basics/ifelapsed_and_expireafter/timed/package_lock.cf b/tests/acceptance/00_basics/ifelapsed_and_expireafter/timed/package_lock.cf index 76ab8a2908..39c3d0cb02 100644 --- a/tests/acceptance/00_basics/ifelapsed_and_expireafter/timed/package_lock.cf +++ b/tests/acceptance/00_basics/ifelapsed_and_expireafter/timed/package_lock.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/00_basics/ifelapsed_and_expireafter/timed/package_lock.cf.sub b/tests/acceptance/00_basics/ifelapsed_and_expireafter/timed/package_lock.cf.sub index e86035bf91..8656495427 100644 --- a/tests/acceptance/00_basics/ifelapsed_and_expireafter/timed/package_lock.cf.sub +++ b/tests/acceptance/00_basics/ifelapsed_and_expireafter/timed/package_lock.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { "test" }; } diff --git a/tests/acceptance/00_basics/macros/if.cf b/tests/acceptance/00_basics/macros/if.cf index 47aa9cb3df..18e9041e62 100644 --- a/tests/acceptance/00_basics/macros/if.cf +++ b/tests/acceptance/00_basics/macros/if.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/macros/if_eof_without_endif.x.cf b/tests/acceptance/00_basics/macros/if_eof_without_endif.x.cf index 4d8c4ec731..8a0d250ef4 100644 --- a/tests/acceptance/00_basics/macros/if_eof_without_endif.x.cf +++ b/tests/acceptance/00_basics/macros/if_eof_without_endif.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/macros/if_eof_without_endif2.x.cf b/tests/acceptance/00_basics/macros/if_eof_without_endif2.x.cf index 180d21635e..ec698e553b 100644 --- a/tests/acceptance/00_basics/macros/if_eof_without_endif2.x.cf +++ b/tests/acceptance/00_basics/macros/if_eof_without_endif2.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/macros/if_feature.cf b/tests/acceptance/00_basics/macros/if_feature.cf index b1a60d6366..954acb1388 100644 --- a/tests/acceptance/00_basics/macros/if_feature.cf +++ b/tests/acceptance/00_basics/macros/if_feature.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/macros/if_feature_nested.x.cf b/tests/acceptance/00_basics/macros/if_feature_nested.x.cf index 8079aab73d..8d58d5d284 100644 --- a/tests/acceptance/00_basics/macros/if_feature_nested.x.cf +++ b/tests/acceptance/00_basics/macros/if_feature_nested.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/macros/if_feature_pam.cf b/tests/acceptance/00_basics/macros/if_feature_pam.cf index bafaa650fb..1f8c3a6ab5 100644 --- a/tests/acceptance/00_basics/macros/if_feature_pam.cf +++ b/tests/acceptance/00_basics/macros/if_feature_pam.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/macros/if_ignore.cf b/tests/acceptance/00_basics/macros/if_ignore.cf index 108585e8e0..be4c8df67a 100644 --- a/tests/acceptance/00_basics/macros/if_ignore.cf +++ b/tests/acceptance/00_basics/macros/if_ignore.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/macros/if_ignore_with_addsign.cf b/tests/acceptance/00_basics/macros/if_ignore_with_addsign.cf index 63dd940cdf..24e96416fd 100644 --- a/tests/acceptance/00_basics/macros/if_ignore_with_addsign.cf +++ b/tests/acceptance/00_basics/macros/if_ignore_with_addsign.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/macros/if_mismatched.x.cf b/tests/acceptance/00_basics/macros/if_mismatched.x.cf index 75c0668cde..efcc3e97b9 100644 --- a/tests/acceptance/00_basics/macros/if_mismatched.x.cf +++ b/tests/acceptance/00_basics/macros/if_mismatched.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/macros/if_multiple_endif.x.cf b/tests/acceptance/00_basics/macros/if_multiple_endif.x.cf index 79cbb517b9..a209618af0 100644 --- a/tests/acceptance/00_basics/macros/if_multiple_endif.x.cf +++ b/tests/acceptance/00_basics/macros/if_multiple_endif.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/macros/if_nested.x.cf b/tests/acceptance/00_basics/macros/if_nested.x.cf index 14be0ae2b1..d978fd890d 100644 --- a/tests/acceptance/00_basics/macros/if_nested.x.cf +++ b/tests/acceptance/00_basics/macros/if_nested.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/macros/if_on_first_line.cf b/tests/acceptance/00_basics/macros/if_on_first_line.cf index a15478e478..741db4b500 100644 --- a/tests/acceptance/00_basics/macros/if_on_first_line.cf +++ b/tests/acceptance/00_basics/macros/if_on_first_line.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/macros/if_triple.cf b/tests/acceptance/00_basics/macros/if_triple.cf index c25501f442..0f6dcb2c88 100644 --- a/tests/acceptance/00_basics/macros/if_triple.cf +++ b/tests/acceptance/00_basics/macros/if_triple.cf @@ -5,7 +5,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/00_basics/namespaces_can_not_contain_funny_characters.cf b/tests/acceptance/00_basics/namespaces_can_not_contain_funny_characters.cf index fc0e97159b..c81e504b32 100644 --- a/tests/acceptance/00_basics/namespaces_can_not_contain_funny_characters.cf +++ b/tests/acceptance/00_basics/namespaces_can_not_contain_funny_characters.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/00_basics/namespaces_can_not_contain_funny_characters.cf.sub b/tests/acceptance/00_basics/namespaces_can_not_contain_funny_characters.cf.sub index 1f875da876..aa562fa686 100644 --- a/tests/acceptance/00_basics/namespaces_can_not_contain_funny_characters.cf.sub +++ b/tests/acceptance/00_basics/namespaces_can_not_contain_funny_characters.cf.sub @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -25,5 +25,3 @@ body file control # Variable dereferences should work namespace => "{}()$:[]"; } - - diff --git a/tests/acceptance/00_basics/validation/validation_tagging_directory.cf b/tests/acceptance/00_basics/validation/validation_tagging_directory.cf index f9015d0e48..96eca00d6a 100644 --- a/tests/acceptance/00_basics/validation/validation_tagging_directory.cf +++ b/tests/acceptance/00_basics/validation/validation_tagging_directory.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/001.cf b/tests/acceptance/01_vars/01_basic/001.cf index fea185a2e8..2ab2a15c17 100644 --- a/tests/acceptance/01_vars/01_basic/001.cf +++ b/tests/acceptance/01_vars/01_basic/001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -50,4 +50,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/01_basic/002.x.cf b/tests/acceptance/01_vars/01_basic/002.x.cf index 71878640a3..1c17d406ba 100644 --- a/tests/acceptance/01_vars/01_basic/002.x.cf +++ b/tests/acceptance/01_vars/01_basic/002.x.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -40,4 +40,3 @@ bundle agent check cfengine_3: "$(this.promise_filename) Pass"; } - diff --git a/tests/acceptance/01_vars/01_basic/004.x.cf b/tests/acceptance/01_vars/01_basic/004.x.cf index eb72828605..1405e8604b 100644 --- a/tests/acceptance/01_vars/01_basic/004.x.cf +++ b/tests/acceptance/01_vars/01_basic/004.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -37,4 +37,3 @@ bundle agent check cfengine_3:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/01_basic/005.x.cf b/tests/acceptance/01_vars/01_basic/005.x.cf index 416d0e3bd6..9f8a377622 100644 --- a/tests/acceptance/01_vars/01_basic/005.x.cf +++ b/tests/acceptance/01_vars/01_basic/005.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -37,4 +37,3 @@ bundle agent check cfengine_3:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/01_basic/006.x.cf b/tests/acceptance/01_vars/01_basic/006.x.cf index 4fb9ca23ee..7ff2764d00 100644 --- a/tests/acceptance/01_vars/01_basic/006.x.cf +++ b/tests/acceptance/01_vars/01_basic/006.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -37,4 +37,3 @@ bundle agent check cfengine_3:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/01_basic/007.x.cf b/tests/acceptance/01_vars/01_basic/007.x.cf index 5dacc90dac..4a05fc6a65 100644 --- a/tests/acceptance/01_vars/01_basic/007.x.cf +++ b/tests/acceptance/01_vars/01_basic/007.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -37,4 +37,3 @@ bundle agent check cfengine_3:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/01_basic/008.x.cf b/tests/acceptance/01_vars/01_basic/008.x.cf index 18fe3857ff..661a4c1e00 100644 --- a/tests/acceptance/01_vars/01_basic/008.x.cf +++ b/tests/acceptance/01_vars/01_basic/008.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -37,4 +37,3 @@ bundle agent check cfengine_3:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/01_basic/009.cf b/tests/acceptance/01_vars/01_basic/009.cf index f1a75fcc31..939e3f91ba 100644 --- a/tests/acceptance/01_vars/01_basic/009.cf +++ b/tests/acceptance/01_vars/01_basic/009.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -48,4 +48,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/01_basic/010.cf b/tests/acceptance/01_vars/01_basic/010.cf index f0a28e636a..bed3a728df 100644 --- a/tests/acceptance/01_vars/01_basic/010.cf +++ b/tests/acceptance/01_vars/01_basic/010.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -50,4 +50,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/01_basic/012.cf b/tests/acceptance/01_vars/01_basic/012.cf index 2dd9ec847b..8e5f0555d0 100644 --- a/tests/acceptance/01_vars/01_basic/012.cf +++ b/tests/acceptance/01_vars/01_basic/012.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -43,4 +43,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/01_basic/013.cf b/tests/acceptance/01_vars/01_basic/013.cf index 62ce0873f7..3217f04edc 100644 --- a/tests/acceptance/01_vars/01_basic/013.cf +++ b/tests/acceptance/01_vars/01_basic/013.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -64,4 +64,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/01_basic/105.cf b/tests/acceptance/01_vars/01_basic/105.cf index 7cea48df2e..1d8beeeb69 100644 --- a/tests/acceptance/01_vars/01_basic/105.cf +++ b/tests/acceptance/01_vars/01_basic/105.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -52,4 +52,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/01_basic/106.cf b/tests/acceptance/01_vars/01_basic/106.cf index 7ff48721ef..1481fbf916 100644 --- a/tests/acceptance/01_vars/01_basic/106.cf +++ b/tests/acceptance/01_vars/01_basic/106.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -42,4 +42,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/01_basic/107.cf b/tests/acceptance/01_vars/01_basic/107.cf index 63768fca74..88e5f8501a 100644 --- a/tests/acceptance/01_vars/01_basic/107.cf +++ b/tests/acceptance/01_vars/01_basic/107.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/108.cf b/tests/acceptance/01_vars/01_basic/108.cf index 5849726eff..d6ef47c8a7 100644 --- a/tests/acceptance/01_vars/01_basic/108.cf +++ b/tests/acceptance/01_vars/01_basic/108.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub", "108.cf.sub" }; + inputs => { "../../default.sub.cf", "108.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/109.cf b/tests/acceptance/01_vars/01_basic/109.cf index 1291c74165..70868f2bd0 100644 --- a/tests/acceptance/01_vars/01_basic/109.cf +++ b/tests/acceptance/01_vars/01_basic/109.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub", "109.cf.sub" }; + inputs => { "../../default.sub.cf", "109.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/110.cf b/tests/acceptance/01_vars/01_basic/110.cf index c1be8dc2fe..bdee0e15b6 100644 --- a/tests/acceptance/01_vars/01_basic/110.cf +++ b/tests/acceptance/01_vars/01_basic/110.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub", "110.cf.sub" }; + inputs => { "../../default.sub.cf", "110.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/111.cf b/tests/acceptance/01_vars/01_basic/111.cf index 0169506dc3..b5153a7bd9 100644 --- a/tests/acceptance/01_vars/01_basic/111.cf +++ b/tests/acceptance/01_vars/01_basic/111.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/CFE-2191.cf b/tests/acceptance/01_vars/01_basic/CFE-2191.cf index 3ed5591cbc..b93d490af7 100644 --- a/tests/acceptance/01_vars/01_basic/CFE-2191.cf +++ b/tests/acceptance/01_vars/01_basic/CFE-2191.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/CFE-628.cf b/tests/acceptance/01_vars/01_basic/CFE-628.cf index c1db73e67a..e930e65c9d 100644 --- a/tests/acceptance/01_vars/01_basic/CFE-628.cf +++ b/tests/acceptance/01_vars/01_basic/CFE-628.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/access_classic_array_key_value_using_with.cf b/tests/acceptance/01_vars/01_basic/access_classic_array_key_value_using_with.cf index 91642295dd..cfe747a9db 100644 --- a/tests/acceptance/01_vars/01_basic/access_classic_array_key_value_using_with.cf +++ b/tests/acceptance/01_vars/01_basic/access_classic_array_key_value_using_with.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/calling_bundle.cf b/tests/acceptance/01_vars/01_basic/calling_bundle.cf index 2fde108f14..fab86612a3 100644 --- a/tests/acceptance/01_vars/01_basic/calling_bundle.cf +++ b/tests/acceptance/01_vars/01_basic/calling_bundle.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/01_basic/can_not_define_variables_in_remote_bundles.cf b/tests/acceptance/01_vars/01_basic/can_not_define_variables_in_remote_bundles.cf index 06ed578014..2bf9a2a69e 100644 --- a/tests/acceptance/01_vars/01_basic/can_not_define_variables_in_remote_bundles.cf +++ b/tests/acceptance/01_vars/01_basic/can_not_define_variables_in_remote_bundles.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/cpusockets.cf b/tests/acceptance/01_vars/01_basic/cpusockets.cf index d26d3f4ba4..c9167831ed 100644 --- a/tests/acceptance/01_vars/01_basic/cpusockets.cf +++ b/tests/acceptance/01_vars/01_basic/cpusockets.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/duplicate_bundles.cf b/tests/acceptance/01_vars/01_basic/duplicate_bundles.cf index 8354f83069..44b0956030 100644 --- a/tests/acceptance/01_vars/01_basic/duplicate_bundles.cf +++ b/tests/acceptance/01_vars/01_basic/duplicate_bundles.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/empty-splice-does-not-segfault.cf b/tests/acceptance/01_vars/01_basic/empty-splice-does-not-segfault.cf index 870422043f..0380fe6c6d 100644 --- a/tests/acceptance/01_vars/01_basic/empty-splice-does-not-segfault.cf +++ b/tests/acceptance/01_vars/01_basic/empty-splice-does-not-segfault.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/long_string_from_embedded.cf b/tests/acceptance/01_vars/01_basic/long_string_from_embedded.cf index 333ac56422..57d94778ad 100644 --- a/tests/acceptance/01_vars/01_basic/long_string_from_embedded.cf +++ b/tests/acceptance/01_vars/01_basic/long_string_from_embedded.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/multi_index_arrays_variable_lookup.cf b/tests/acceptance/01_vars/01_basic/multi_index_arrays_variable_lookup.cf index de7a914bb0..9908a1f27a 100644 --- a/tests/acceptance/01_vars/01_basic/multi_index_arrays_variable_lookup.cf +++ b/tests/acceptance/01_vars/01_basic/multi_index_arrays_variable_lookup.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -49,4 +49,3 @@ bundle agent check "$(this.promise_filename) Pass"; } - 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 f7e36e8ead..01242d5de6 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 @@ -3,7 +3,7 @@ body file control { inputs => { - "../../../../../default.cf.sub", + "../../../../../default.sub.cf", }; } bundle agent __main__ 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 4dd235b4c9..fa548f6ba9 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 @@ -3,7 +3,7 @@ body file control { inputs => { - "../../../../../default.cf.sub", + "../../../../../default.sub.cf", }; } bundle agent __main__ diff --git a/tests/acceptance/01_vars/01_basic/namespaces/bundle_qualified_refs/3/main.cf b/tests/acceptance/01_vars/01_basic/namespaces/bundle_qualified_refs/3/main.cf index 900ffd4966..4c76ecfa03 100644 --- a/tests/acceptance/01_vars/01_basic/namespaces/bundle_qualified_refs/3/main.cf +++ b/tests/acceptance/01_vars/01_basic/namespaces/bundle_qualified_refs/3/main.cf @@ -4,7 +4,7 @@ body file control { inputs => { - "../../../../../default.cf.sub", + "../../../../../default.sub.cf", }; } bundle agent __main__ diff --git a/tests/acceptance/01_vars/01_basic/namespaces/namespaced-bundles.cf b/tests/acceptance/01_vars/01_basic/namespaces/namespaced-bundles.cf index fd07452e99..5b40bfb23b 100644 --- a/tests/acceptance/01_vars/01_basic/namespaces/namespaced-bundles.cf +++ b/tests/acceptance/01_vars/01_basic/namespaces/namespaced-bundles.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../../default.cf.sub", "namespaced-bundles.cf.sub1", "namespaced-bundles.cf.sub2" }; + inputs => { "../../../default.sub.cf", "namespaced-bundles.cf.sub1", "namespaced-bundles.cf.sub2" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/namespaces/nested-expansion-including-namespace.cf b/tests/acceptance/01_vars/01_basic/namespaces/nested-expansion-including-namespace.cf index 26ca2ca07c..66d8195ea3 100644 --- a/tests/acceptance/01_vars/01_basic/namespaces/nested-expansion-including-namespace.cf +++ b/tests/acceptance/01_vars/01_basic/namespaces/nested-expansion-including-namespace.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/namespaces/nested_expansion_namespaced_variables.cf b/tests/acceptance/01_vars/01_basic/namespaces/nested_expansion_namespaced_variables.cf index eea51d6db7..fee869b288 100644 --- a/tests/acceptance/01_vars/01_basic/namespaces/nested_expansion_namespaced_variables.cf +++ b/tests/acceptance/01_vars/01_basic/namespaces/nested_expansion_namespaced_variables.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../../default.cf.sub",}; + inputs => { "../../../default.sub.cf",}; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/nested_parens_var_ref.cf b/tests/acceptance/01_vars/01_basic/nested_parens_var_ref.cf index 1dc941a439..a28eab1cc1 100644 --- a/tests/acceptance/01_vars/01_basic/nested_parens_var_ref.cf +++ b/tests/acceptance/01_vars/01_basic/nested_parens_var_ref.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/parse_long_slists.cf b/tests/acceptance/01_vars/01_basic/parse_long_slists.cf index 4c403a3217..27098d11cf 100644 --- a/tests/acceptance/01_vars/01_basic/parse_long_slists.cf +++ b/tests/acceptance/01_vars/01_basic/parse_long_slists.cf @@ -1,5 +1,5 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/parse_number.cf b/tests/acceptance/01_vars/01_basic/parse_number.cf index a664a29576..2b13bbe44a 100644 --- a/tests/acceptance/01_vars/01_basic/parse_number.cf +++ b/tests/acceptance/01_vars/01_basic/parse_number.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -20,7 +20,8 @@ bundle agent init "zero" string => "00000"; "negate" string => "-137"; "spacey" string => "17 - "; # Spaces ignored after number + +"; # Spaces ignored after number "kilo" string => "42k"; "kibi" string => "42K"; "mega" string => "42m"; diff --git a/tests/acceptance/01_vars/01_basic/parse_number_3572.cf b/tests/acceptance/01_vars/01_basic/parse_number_3572.cf index 6980cb0799..3a89bbd1b0 100644 --- a/tests/acceptance/01_vars/01_basic/parse_number_3572.cf +++ b/tests/acceptance/01_vars/01_basic/parse_number_3572.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/policy_release_id.cf b/tests/acceptance/01_vars/01_basic/policy_release_id.cf index 91b400bd82..5f53ad807e 100644 --- a/tests/acceptance/01_vars/01_basic/policy_release_id.cf +++ b/tests/acceptance/01_vars/01_basic/policy_release_id.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/promise_dirname.cf b/tests/acceptance/01_vars/01_basic/promise_dirname.cf index 72c3cfa486..aa94f27963 100644 --- a/tests/acceptance/01_vars/01_basic/promise_dirname.cf +++ b/tests/acceptance/01_vars/01_basic/promise_dirname.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/01_basic/qualified_array_with_spaced_index.cf b/tests/acceptance/01_vars/01_basic/qualified_array_with_spaced_index.cf index 8d427e545e..a56f2c8432 100644 --- a/tests/acceptance/01_vars/01_basic/qualified_array_with_spaced_index.cf +++ b/tests/acceptance/01_vars/01_basic/qualified_array_with_spaced_index.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/staging/002.x.cf b/tests/acceptance/01_vars/01_basic/staging/002.x.cf index 6f4d9c45a2..c9661f0ba2 100644 --- a/tests/acceptance/01_vars/01_basic/staging/002.x.cf +++ b/tests/acceptance/01_vars/01_basic/staging/002.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -37,4 +37,3 @@ bundle agent check cfengine_3:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/01_basic/staging/003.x.cf b/tests/acceptance/01_vars/01_basic/staging/003.x.cf index 80af3d24ea..dfcc85590a 100644 --- a/tests/acceptance/01_vars/01_basic/staging/003.x.cf +++ b/tests/acceptance/01_vars/01_basic/staging/003.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -37,4 +37,3 @@ bundle agent check cfengine_3:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/01_basic/staging/011.cf b/tests/acceptance/01_vars/01_basic/staging/011.cf index a6836389d7..67ff9673b2 100644 --- a/tests/acceptance/01_vars/01_basic/staging/011.cf +++ b/tests/acceptance/01_vars/01_basic/staging/011.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/staging/025.cf b/tests/acceptance/01_vars/01_basic/staging/025.cf index c03d506156..85ab267d94 100644 --- a/tests/acceptance/01_vars/01_basic/staging/025.cf +++ b/tests/acceptance/01_vars/01_basic/staging/025.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/staging/026.cf b/tests/acceptance/01_vars/01_basic/staging/026.cf index 72f9bf2b23..d2e26dc43d 100644 --- a/tests/acceptance/01_vars/01_basic/staging/026.cf +++ b/tests/acceptance/01_vars/01_basic/staging/026.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/staging/107.cf b/tests/acceptance/01_vars/01_basic/staging/107.cf index 29aa3b46cf..0ed8a7bb8a 100644 --- a/tests/acceptance/01_vars/01_basic/staging/107.cf +++ b/tests/acceptance/01_vars/01_basic/staging/107.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -45,4 +45,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/01_basic/staging/this_promises_in_command_args.cf b/tests/acceptance/01_vars/01_basic/staging/this_promises_in_command_args.cf index 8ef0fd79e0..4335c39dfb 100644 --- a/tests/acceptance/01_vars/01_basic/staging/this_promises_in_command_args.cf +++ b/tests/acceptance/01_vars/01_basic/staging/this_promises_in_command_args.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/sys_flavor_on_aix_no_dots.cf b/tests/acceptance/01_vars/01_basic/sys_flavor_on_aix_no_dots.cf index b8a648fc44..5925e93bee 100644 --- a/tests/acceptance/01_vars/01_basic/sys_flavor_on_aix_no_dots.cf +++ b/tests/acceptance/01_vars/01_basic/sys_flavor_on_aix_no_dots.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/sysvars.cf b/tests/acceptance/01_vars/01_basic/sysvars.cf index 4758b01c3c..1e78446267 100644 --- a/tests/acceptance/01_vars/01_basic/sysvars.cf +++ b/tests/acceptance/01_vars/01_basic/sysvars.cf @@ -1,7 +1,7 @@ # Test $(sys.inputdir), $(sys.masterdir), $(sys.libdir), $(sys.bindir), $(sys.failsafe_policy_path), $(sys.update_policy_path), $(sys.local_libdir) body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/01_basic/this_promiser_ifvarclass.cf b/tests/acceptance/01_vars/01_basic/this_promiser_ifvarclass.cf index 3a160f7fe5..6ae3c99ca0 100644 --- a/tests/acceptance/01_vars/01_basic/this_promiser_ifvarclass.cf +++ b/tests/acceptance/01_vars/01_basic/this_promiser_ifvarclass.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/this_promiser_with_readjson.cf b/tests/acceptance/01_vars/01_basic/this_promiser_with_readjson.cf index 382b594fca..1e385d487b 100644 --- a/tests/acceptance/01_vars/01_basic/this_promiser_with_readjson.cf +++ b/tests/acceptance/01_vars/01_basic/this_promiser_with_readjson.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/this_variables.cf b/tests/acceptance/01_vars/01_basic/this_variables.cf index d24a4cebab..e43d5fb1c1 100644 --- a/tests/acceptance/01_vars/01_basic/this_variables.cf +++ b/tests/acceptance/01_vars/01_basic/this_variables.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/time_based_vars.cf b/tests/acceptance/01_vars/01_basic/time_based_vars.cf index 5be685cff8..330d43adaf 100644 --- a/tests/acceptance/01_vars/01_basic/time_based_vars.cf +++ b/tests/acceptance/01_vars/01_basic/time_based_vars.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/unresolved_variables.cf b/tests/acceptance/01_vars/01_basic/unresolved_variables.cf index 803551ddbf..8d0b3e7cb2 100644 --- a/tests/acceptance/01_vars/01_basic/unresolved_variables.cf +++ b/tests/acceptance/01_vars/01_basic/unresolved_variables.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/uptime_systime_and_sysday.cf b/tests/acceptance/01_vars/01_basic/uptime_systime_and_sysday.cf index caccc2b129..4e37b89a75 100644 --- a/tests/acceptance/01_vars/01_basic/uptime_systime_and_sysday.cf +++ b/tests/acceptance/01_vars/01_basic/uptime_systime_and_sysday.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/01_basic/var_expansion_in_meta.cf b/tests/acceptance/01_vars/01_basic/var_expansion_in_meta.cf index 0cad82867c..ca651ded37 100644 --- a/tests/acceptance/01_vars/01_basic/var_expansion_in_meta.cf +++ b/tests/acceptance/01_vars/01_basic/var_expansion_in_meta.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/var_meta_tags_overridden_correctly.cf b/tests/acceptance/01_vars/01_basic/var_meta_tags_overridden_correctly.cf index d9d9dcff7c..648396638d 100644 --- a/tests/acceptance/01_vars/01_basic/var_meta_tags_overridden_correctly.cf +++ b/tests/acceptance/01_vars/01_basic/var_meta_tags_overridden_correctly.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/01_basic/vars_comments_emitted_in_show_vars.cf b/tests/acceptance/01_vars/01_basic/vars_comments_emitted_in_show_vars.cf index 7a2aad82eb..12a7e8660b 100644 --- a/tests/acceptance/01_vars/01_basic/vars_comments_emitted_in_show_vars.cf +++ b/tests/acceptance/01_vars/01_basic/vars_comments_emitted_in_show_vars.cf @@ -1,7 +1,7 @@ # Test $(sys.inputdir), $(sys.masterdir), $(sys.libdir), $(sys.bindir), $(sys.failsafe_policy_path), $(sys.update_policy_path), $(sys.local_libdir) body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/01_basic/vars_comments_emitted_in_verbose.cf b/tests/acceptance/01_vars/01_basic/vars_comments_emitted_in_verbose.cf index f2009b7df9..8c539a569a 100644 --- a/tests/acceptance/01_vars/01_basic/vars_comments_emitted_in_verbose.cf +++ b/tests/acceptance/01_vars/01_basic/vars_comments_emitted_in_verbose.cf @@ -1,7 +1,7 @@ # Test $(sys.inputdir), $(sys.masterdir), $(sys.libdir), $(sys.bindir), $(sys.failsafe_policy_path), $(sys.update_policy_path), $(sys.local_libdir) body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/01_basic/vars_in_arrays.cf b/tests/acceptance/01_vars/01_basic/vars_in_arrays.cf index 03c89cbae5..b4b0dd86e2 100644 --- a/tests/acceptance/01_vars/01_basic/vars_in_arrays.cf +++ b/tests/acceptance/01_vars/01_basic/vars_in_arrays.cf @@ -5,7 +5,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "init", "check" }; version => "1.0"; } @@ -74,4 +74,3 @@ bundle edit_line write "$(list)"; "$(oneandtwo)"; } - diff --git a/tests/acceptance/01_vars/02_functions/001.cf b/tests/acceptance/01_vars/02_functions/001.cf index 69994df3f6..3e6f97ac28 100644 --- a/tests/acceptance/01_vars/02_functions/001.cf +++ b/tests/acceptance/01_vars/02_functions/001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -84,4 +84,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/002.cf b/tests/acceptance/01_vars/02_functions/002.cf index 40e360abd5..7d43df6fa1 100644 --- a/tests/acceptance/01_vars/02_functions/002.cf +++ b/tests/acceptance/01_vars/02_functions/002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -91,4 +91,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/003.cf b/tests/acceptance/01_vars/02_functions/003.cf index 47cd7bf2e8..b221216da5 100644 --- a/tests/acceptance/01_vars/02_functions/003.cf +++ b/tests/acceptance/01_vars/02_functions/003.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -54,4 +54,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/004.cf b/tests/acceptance/01_vars/02_functions/004.cf index e76eae5b1f..73ef9bd954 100644 --- a/tests/acceptance/01_vars/02_functions/004.cf +++ b/tests/acceptance/01_vars/02_functions/004.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -82,4 +82,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/005.cf b/tests/acceptance/01_vars/02_functions/005.cf index b76b94bf98..b647fb1b04 100644 --- a/tests/acceptance/01_vars/02_functions/005.cf +++ b/tests/acceptance/01_vars/02_functions/005.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -82,4 +82,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/006.cf b/tests/acceptance/01_vars/02_functions/006.cf index 69be5b101e..0137178ed9 100644 --- a/tests/acceptance/01_vars/02_functions/006.cf +++ b/tests/acceptance/01_vars/02_functions/006.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -58,4 +58,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/007.cf b/tests/acceptance/01_vars/02_functions/007.cf index b6f0c762d1..2a0fc4b7f8 100644 --- a/tests/acceptance/01_vars/02_functions/007.cf +++ b/tests/acceptance/01_vars/02_functions/007.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -88,4 +88,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/008.cf b/tests/acceptance/01_vars/02_functions/008.cf index a304093d28..9113204f64 100644 --- a/tests/acceptance/01_vars/02_functions/008.cf +++ b/tests/acceptance/01_vars/02_functions/008.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/010.cf b/tests/acceptance/01_vars/02_functions/010.cf index 8345ab227d..52eccf6d0d 100644 --- a/tests/acceptance/01_vars/02_functions/010.cf +++ b/tests/acceptance/01_vars/02_functions/010.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -44,4 +44,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/011.cf b/tests/acceptance/01_vars/02_functions/011.cf index 081bc598e5..8e815c9da7 100644 --- a/tests/acceptance/01_vars/02_functions/011.cf +++ b/tests/acceptance/01_vars/02_functions/011.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -69,4 +69,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/012.cf b/tests/acceptance/01_vars/02_functions/012.cf index 1f955160cd..ed278d13a8 100644 --- a/tests/acceptance/01_vars/02_functions/012.cf +++ b/tests/acceptance/01_vars/02_functions/012.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -71,4 +71,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/013.cf b/tests/acceptance/01_vars/02_functions/013.cf index d39f24652e..b3f1685b7b 100644 --- a/tests/acceptance/01_vars/02_functions/013.cf +++ b/tests/acceptance/01_vars/02_functions/013.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -70,4 +70,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/014.cf b/tests/acceptance/01_vars/02_functions/014.cf index 6134b53b21..d25c45a85f 100644 --- a/tests/acceptance/01_vars/02_functions/014.cf +++ b/tests/acceptance/01_vars/02_functions/014.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -70,4 +70,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/015.cf b/tests/acceptance/01_vars/02_functions/015.cf index 180695a3a4..a23fb60726 100644 --- a/tests/acceptance/01_vars/02_functions/015.cf +++ b/tests/acceptance/01_vars/02_functions/015.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -69,4 +69,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/016.cf b/tests/acceptance/01_vars/02_functions/016.cf index 9910904b18..b7376f32a8 100644 --- a/tests/acceptance/01_vars/02_functions/016.cf +++ b/tests/acceptance/01_vars/02_functions/016.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -72,4 +72,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/017.cf b/tests/acceptance/01_vars/02_functions/017.cf index 54912582c3..b83871009a 100644 --- a/tests/acceptance/01_vars/02_functions/017.cf +++ b/tests/acceptance/01_vars/02_functions/017.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -71,4 +71,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/018.cf b/tests/acceptance/01_vars/02_functions/018.cf index f49eb7246b..957e7fadb4 100644 --- a/tests/acceptance/01_vars/02_functions/018.cf +++ b/tests/acceptance/01_vars/02_functions/018.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -71,4 +71,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/019.cf b/tests/acceptance/01_vars/02_functions/019.cf index 1bf12b4169..845e41fe6a 100644 --- a/tests/acceptance/01_vars/02_functions/019.cf +++ b/tests/acceptance/01_vars/02_functions/019.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -69,4 +69,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/020.cf b/tests/acceptance/01_vars/02_functions/020.cf index 09abae9d63..146813588f 100644 --- a/tests/acceptance/01_vars/02_functions/020.cf +++ b/tests/acceptance/01_vars/02_functions/020.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -71,4 +71,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/021.cf b/tests/acceptance/01_vars/02_functions/021.cf index 90823eacad..50fd2c090f 100644 --- a/tests/acceptance/01_vars/02_functions/021.cf +++ b/tests/acceptance/01_vars/02_functions/021.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -71,4 +71,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/024.cf b/tests/acceptance/01_vars/02_functions/024.cf index e0c8ccff8d..867bd7ccc4 100644 --- a/tests/acceptance/01_vars/02_functions/024.cf +++ b/tests/acceptance/01_vars/02_functions/024.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/025.cf b/tests/acceptance/01_vars/02_functions/025.cf index e543f38a82..004571d9d3 100644 --- a/tests/acceptance/01_vars/02_functions/025.cf +++ b/tests/acceptance/01_vars/02_functions/025.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/026.cf b/tests/acceptance/01_vars/02_functions/026.cf index 6a7ca5a86d..11af325962 100644 --- a/tests/acceptance/01_vars/02_functions/026.cf +++ b/tests/acceptance/01_vars/02_functions/026.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/027.cf b/tests/acceptance/01_vars/02_functions/027.cf index 840b1429fa..d9f3e95862 100644 --- a/tests/acceptance/01_vars/02_functions/027.cf +++ b/tests/acceptance/01_vars/02_functions/027.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/028.cf b/tests/acceptance/01_vars/02_functions/028.cf index c4cf0316fa..401fa1632c 100644 --- a/tests/acceptance/01_vars/02_functions/028.cf +++ b/tests/acceptance/01_vars/02_functions/028.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/029.cf b/tests/acceptance/01_vars/02_functions/029.cf index 6f944c55e2..6149c19fe1 100644 --- a/tests/acceptance/01_vars/02_functions/029.cf +++ b/tests/acceptance/01_vars/02_functions/029.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/030.cf b/tests/acceptance/01_vars/02_functions/030.cf index c88560ca99..95bfd808e6 100644 --- a/tests/acceptance/01_vars/02_functions/030.cf +++ b/tests/acceptance/01_vars/02_functions/030.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/031.cf b/tests/acceptance/01_vars/02_functions/031.cf index ff625ab08b..296c1d5323 100644 --- a/tests/acceptance/01_vars/02_functions/031.cf +++ b/tests/acceptance/01_vars/02_functions/031.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/032.cf b/tests/acceptance/01_vars/02_functions/032.cf index a2260a518f..4f254969e0 100644 --- a/tests/acceptance/01_vars/02_functions/032.cf +++ b/tests/acceptance/01_vars/02_functions/032.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/033.cf b/tests/acceptance/01_vars/02_functions/033.cf index e437d2fbe9..061bbac5f2 100644 --- a/tests/acceptance/01_vars/02_functions/033.cf +++ b/tests/acceptance/01_vars/02_functions/033.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/034.cf b/tests/acceptance/01_vars/02_functions/034.cf index 9997a643d1..08106e2be0 100644 --- a/tests/acceptance/01_vars/02_functions/034.cf +++ b/tests/acceptance/01_vars/02_functions/034.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/037.cf b/tests/acceptance/01_vars/02_functions/037.cf index c57fb0b261..d10a07e62e 100644 --- a/tests/acceptance/01_vars/02_functions/037.cf +++ b/tests/acceptance/01_vars/02_functions/037.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/038.cf b/tests/acceptance/01_vars/02_functions/038.cf index 4f79176c42..2957a1d7a3 100644 --- a/tests/acceptance/01_vars/02_functions/038.cf +++ b/tests/acceptance/01_vars/02_functions/038.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/039.cf b/tests/acceptance/01_vars/02_functions/039.cf index 3411c0351c..ba887c972d 100644 --- a/tests/acceptance/01_vars/02_functions/039.cf +++ b/tests/acceptance/01_vars/02_functions/039.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/040.cf b/tests/acceptance/01_vars/02_functions/040.cf index 745b846956..c9e5656d1d 100644 --- a/tests/acceptance/01_vars/02_functions/040.cf +++ b/tests/acceptance/01_vars/02_functions/040.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/041.cf b/tests/acceptance/01_vars/02_functions/041.cf index 4ca15aedb3..7c2f985df3 100644 --- a/tests/acceptance/01_vars/02_functions/041.cf +++ b/tests/acceptance/01_vars/02_functions/041.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/042.cf b/tests/acceptance/01_vars/02_functions/042.cf index b40488902c..74a7a43b73 100644 --- a/tests/acceptance/01_vars/02_functions/042.cf +++ b/tests/acceptance/01_vars/02_functions/042.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/043.cf b/tests/acceptance/01_vars/02_functions/043.cf index f719481f76..543e732bbe 100644 --- a/tests/acceptance/01_vars/02_functions/043.cf +++ b/tests/acceptance/01_vars/02_functions/043.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/044.cf b/tests/acceptance/01_vars/02_functions/044.cf index 6fa00e9530..76d7e0650c 100644 --- a/tests/acceptance/01_vars/02_functions/044.cf +++ b/tests/acceptance/01_vars/02_functions/044.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/045.cf b/tests/acceptance/01_vars/02_functions/045.cf index b9b4ffae7a..50d6c6fbe7 100644 --- a/tests/acceptance/01_vars/02_functions/045.cf +++ b/tests/acceptance/01_vars/02_functions/045.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/046.cf b/tests/acceptance/01_vars/02_functions/046.cf index d48d497f19..0b03d64be0 100644 --- a/tests/acceptance/01_vars/02_functions/046.cf +++ b/tests/acceptance/01_vars/02_functions/046.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/047.cf b/tests/acceptance/01_vars/02_functions/047.cf index 4e2cd17012..ebde3b12d7 100644 --- a/tests/acceptance/01_vars/02_functions/047.cf +++ b/tests/acceptance/01_vars/02_functions/047.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/050.cf b/tests/acceptance/01_vars/02_functions/050.cf index 7b455b542e..c3296891a1 100644 --- a/tests/acceptance/01_vars/02_functions/050.cf +++ b/tests/acceptance/01_vars/02_functions/050.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/051.cf b/tests/acceptance/01_vars/02_functions/051.cf index 5b72d79cfb..acd9015d64 100644 --- a/tests/acceptance/01_vars/02_functions/051.cf +++ b/tests/acceptance/01_vars/02_functions/051.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -46,4 +46,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/052.cf b/tests/acceptance/01_vars/02_functions/052.cf index 8984aa8044..393711c655 100644 --- a/tests/acceptance/01_vars/02_functions/052.cf +++ b/tests/acceptance/01_vars/02_functions/052.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -46,4 +46,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/053.cf b/tests/acceptance/01_vars/02_functions/053.cf index 45e76bda9a..6ad6eecb94 100644 --- a/tests/acceptance/01_vars/02_functions/053.cf +++ b/tests/acceptance/01_vars/02_functions/053.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -46,4 +46,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/054.cf b/tests/acceptance/01_vars/02_functions/054.cf index b2c805f381..d7027656aa 100644 --- a/tests/acceptance/01_vars/02_functions/054.cf +++ b/tests/acceptance/01_vars/02_functions/054.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -46,4 +46,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/055.cf b/tests/acceptance/01_vars/02_functions/055.cf index 08e3533620..7ff7266ae9 100644 --- a/tests/acceptance/01_vars/02_functions/055.cf +++ b/tests/acceptance/01_vars/02_functions/055.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -46,4 +46,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/056.x.cf b/tests/acceptance/01_vars/02_functions/056.x.cf index a473e0420a..e0d9ea93cd 100644 --- a/tests/acceptance/01_vars/02_functions/056.x.cf +++ b/tests/acceptance/01_vars/02_functions/056.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -46,4 +46,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/059.x.cf b/tests/acceptance/01_vars/02_functions/059.x.cf index 8e5a401387..86597faec0 100644 --- a/tests/acceptance/01_vars/02_functions/059.x.cf +++ b/tests/acceptance/01_vars/02_functions/059.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -46,4 +46,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/060.x.cf b/tests/acceptance/01_vars/02_functions/060.x.cf index b91b35d82b..87048307ca 100644 --- a/tests/acceptance/01_vars/02_functions/060.x.cf +++ b/tests/acceptance/01_vars/02_functions/060.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -46,4 +46,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/061.x.cf b/tests/acceptance/01_vars/02_functions/061.x.cf index 47baf3086b..b4ad66fe01 100644 --- a/tests/acceptance/01_vars/02_functions/061.x.cf +++ b/tests/acceptance/01_vars/02_functions/061.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -46,4 +46,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/062.x.cf b/tests/acceptance/01_vars/02_functions/062.x.cf index b910d84570..0144e37cb0 100644 --- a/tests/acceptance/01_vars/02_functions/062.x.cf +++ b/tests/acceptance/01_vars/02_functions/062.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -46,4 +46,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/063.x.cf b/tests/acceptance/01_vars/02_functions/063.x.cf index 8f9411ac7d..4c32d985cd 100644 --- a/tests/acceptance/01_vars/02_functions/063.x.cf +++ b/tests/acceptance/01_vars/02_functions/063.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -46,4 +46,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/064.x.cf b/tests/acceptance/01_vars/02_functions/064.x.cf index b91b35d82b..87048307ca 100644 --- a/tests/acceptance/01_vars/02_functions/064.x.cf +++ b/tests/acceptance/01_vars/02_functions/064.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -46,4 +46,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/065.cf b/tests/acceptance/01_vars/02_functions/065.cf index e245b34d58..968e79ed40 100644 --- a/tests/acceptance/01_vars/02_functions/065.cf +++ b/tests/acceptance/01_vars/02_functions/065.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -46,4 +46,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/066.cf b/tests/acceptance/01_vars/02_functions/066.cf index 8622d149a6..1d62255346 100644 --- a/tests/acceptance/01_vars/02_functions/066.cf +++ b/tests/acceptance/01_vars/02_functions/066.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/067.cf b/tests/acceptance/01_vars/02_functions/067.cf index 675ea54d47..7027b4221a 100644 --- a/tests/acceptance/01_vars/02_functions/067.cf +++ b/tests/acceptance/01_vars/02_functions/067.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/068.cf b/tests/acceptance/01_vars/02_functions/068.cf index 7383f9993b..3e8bbe9826 100644 --- a/tests/acceptance/01_vars/02_functions/068.cf +++ b/tests/acceptance/01_vars/02_functions/068.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/069.cf b/tests/acceptance/01_vars/02_functions/069.cf index 2984947b25..06ec42be49 100644 --- a/tests/acceptance/01_vars/02_functions/069.cf +++ b/tests/acceptance/01_vars/02_functions/069.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/071.cf b/tests/acceptance/01_vars/02_functions/071.cf index e398b5d90c..80402dbeb3 100644 --- a/tests/acceptance/01_vars/02_functions/071.cf +++ b/tests/acceptance/01_vars/02_functions/071.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/080.cf b/tests/acceptance/01_vars/02_functions/080.cf index ac10c64bb9..4bf784d593 100644 --- a/tests/acceptance/01_vars/02_functions/080.cf +++ b/tests/acceptance/01_vars/02_functions/080.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/201.cf b/tests/acceptance/01_vars/02_functions/201.cf index 065ec73cf9..e9b4ee1d01 100644 --- a/tests/acceptance/01_vars/02_functions/201.cf +++ b/tests/acceptance/01_vars/02_functions/201.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -60,4 +60,3 @@ bundle agent check "$(G.testfile).expected", "$(this.promise_filename)"); } - diff --git a/tests/acceptance/01_vars/02_functions/202.cf b/tests/acceptance/01_vars/02_functions/202.cf index 8920000f4c..3118dbf05f 100644 --- a/tests/acceptance/01_vars/02_functions/202.cf +++ b/tests/acceptance/01_vars/02_functions/202.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -67,4 +67,3 @@ bundle agent check "$(G.testfile).expected", "$(this.promise_filename)"); } - diff --git a/tests/acceptance/01_vars/02_functions/203.cf b/tests/acceptance/01_vars/02_functions/203.cf index 2215ff721b..ed032a9368 100644 --- a/tests/acceptance/01_vars/02_functions/203.cf +++ b/tests/acceptance/01_vars/02_functions/203.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -69,4 +69,3 @@ bundle agent check "$(G.testfile).expected", "$(this.promise_filename)"); } - diff --git a/tests/acceptance/01_vars/02_functions/204.cf b/tests/acceptance/01_vars/02_functions/204.cf index d1ed563de5..69fdcf1f35 100644 --- a/tests/acceptance/01_vars/02_functions/204.cf +++ b/tests/acceptance/01_vars/02_functions/204.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -75,4 +75,3 @@ bundle agent check "$(G.testfile).expected", "$(this.promise_filename)"); } - diff --git a/tests/acceptance/01_vars/02_functions/205.cf b/tests/acceptance/01_vars/02_functions/205.cf index b42e163655..fa59d10456 100644 --- a/tests/acceptance/01_vars/02_functions/205.cf +++ b/tests/acceptance/01_vars/02_functions/205.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/211.cf b/tests/acceptance/01_vars/02_functions/211.cf index 0d9a3baf0d..947d6f77fb 100644 --- a/tests/acceptance/01_vars/02_functions/211.cf +++ b/tests/acceptance/01_vars/02_functions/211.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -74,4 +74,3 @@ bundle agent check "$(G.testfile).expected", "$(this.promise_filename)"); } - diff --git a/tests/acceptance/01_vars/02_functions/212.cf b/tests/acceptance/01_vars/02_functions/212.cf index 41502bae97..d748aa4e40 100644 --- a/tests/acceptance/01_vars/02_functions/212.cf +++ b/tests/acceptance/01_vars/02_functions/212.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -67,4 +67,3 @@ bundle agent check "$(G.testfile).expected", "$(this.promise_filename)"); } - diff --git a/tests/acceptance/01_vars/02_functions/221.cf b/tests/acceptance/01_vars/02_functions/221.cf index 5980d0fb01..6225ed44ca 100644 --- a/tests/acceptance/01_vars/02_functions/221.cf +++ b/tests/acceptance/01_vars/02_functions/221.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/222.cf b/tests/acceptance/01_vars/02_functions/222.cf index c5ddbaf826..b47132bca5 100644 --- a/tests/acceptance/01_vars/02_functions/222.cf +++ b/tests/acceptance/01_vars/02_functions/222.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/223.cf b/tests/acceptance/01_vars/02_functions/223.cf index 23f8d991a5..463b042a09 100644 --- a/tests/acceptance/01_vars/02_functions/223.cf +++ b/tests/acceptance/01_vars/02_functions/223.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/224.cf b/tests/acceptance/01_vars/02_functions/224.cf index 09ed34baf8..fe3958cd5b 100644 --- a/tests/acceptance/01_vars/02_functions/224.cf +++ b/tests/acceptance/01_vars/02_functions/224.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/225.cf b/tests/acceptance/01_vars/02_functions/225.cf index 3410e211ef..a93f141285 100644 --- a/tests/acceptance/01_vars/02_functions/225.cf +++ b/tests/acceptance/01_vars/02_functions/225.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/226.cf b/tests/acceptance/01_vars/02_functions/226.cf index 8e0e16c6a3..c7cb4ebe97 100644 --- a/tests/acceptance/01_vars/02_functions/226.cf +++ b/tests/acceptance/01_vars/02_functions/226.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/227.cf b/tests/acceptance/01_vars/02_functions/227.cf index eb130dec01..37b2713ee9 100644 --- a/tests/acceptance/01_vars/02_functions/227.cf +++ b/tests/acceptance/01_vars/02_functions/227.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/300.cf b/tests/acceptance/01_vars/02_functions/300.cf index 01116f4b1c..69e7e5c29c 100644 --- a/tests/acceptance/01_vars/02_functions/300.cf +++ b/tests/acceptance/01_vars/02_functions/300.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -42,4 +42,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/310.cf b/tests/acceptance/01_vars/02_functions/310.cf index d7813f768b..e841b94919 100644 --- a/tests/acceptance/01_vars/02_functions/310.cf +++ b/tests/acceptance/01_vars/02_functions/310.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/311.cf b/tests/acceptance/01_vars/02_functions/311.cf index 1002c916f7..23e3919d41 100644 --- a/tests/acceptance/01_vars/02_functions/311.cf +++ b/tests/acceptance/01_vars/02_functions/311.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/312.cf b/tests/acceptance/01_vars/02_functions/312.cf index 13e8fa6fd4..2d668d4c43 100644 --- a/tests/acceptance/01_vars/02_functions/312.cf +++ b/tests/acceptance/01_vars/02_functions/312.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/313.cf b/tests/acceptance/01_vars/02_functions/313.cf index d033450bff..163a80e9a7 100644 --- a/tests/acceptance/01_vars/02_functions/313.cf +++ b/tests/acceptance/01_vars/02_functions/313.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/400.cf b/tests/acceptance/01_vars/02_functions/400.cf index 65a7a38999..677b3c36e0 100644 --- a/tests/acceptance/01_vars/02_functions/400.cf +++ b/tests/acceptance/01_vars/02_functions/400.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/401.cf b/tests/acceptance/01_vars/02_functions/401.cf index b38fc03185..f2dabee378 100644 --- a/tests/acceptance/01_vars/02_functions/401.cf +++ b/tests/acceptance/01_vars/02_functions/401.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/410.cf b/tests/acceptance/01_vars/02_functions/410.cf index ec7b97f6df..37204fe3a6 100644 --- a/tests/acceptance/01_vars/02_functions/410.cf +++ b/tests/acceptance/01_vars/02_functions/410.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/420.cf b/tests/acceptance/01_vars/02_functions/420.cf index 69ac3a91ac..c0d874cbbd 100644 --- a/tests/acceptance/01_vars/02_functions/420.cf +++ b/tests/acceptance/01_vars/02_functions/420.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/421.cf b/tests/acceptance/01_vars/02_functions/421.cf index 46146102bd..c5fdc0cbab 100644 --- a/tests/acceptance/01_vars/02_functions/421.cf +++ b/tests/acceptance/01_vars/02_functions/421.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/440.cf b/tests/acceptance/01_vars/02_functions/440.cf index 4293042d94..f25f9d5087 100644 --- a/tests/acceptance/01_vars/02_functions/440.cf +++ b/tests/acceptance/01_vars/02_functions/440.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/441.cf b/tests/acceptance/01_vars/02_functions/441.cf index 0d374b76a5..e46582c4ea 100644 --- a/tests/acceptance/01_vars/02_functions/441.cf +++ b/tests/acceptance/01_vars/02_functions/441.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/442.cf b/tests/acceptance/01_vars/02_functions/442.cf index 8909b75a6a..10f1111e6b 100644 --- a/tests/acceptance/01_vars/02_functions/442.cf +++ b/tests/acceptance/01_vars/02_functions/442.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/443.cf b/tests/acceptance/01_vars/02_functions/443.cf index 86040e9ff3..9af6c1b974 100644 --- a/tests/acceptance/01_vars/02_functions/443.cf +++ b/tests/acceptance/01_vars/02_functions/443.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "g", default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/444.cf b/tests/acceptance/01_vars/02_functions/444.cf index 5c4c57976f..ea4303032a 100644 --- a/tests/acceptance/01_vars/02_functions/444.cf +++ b/tests/acceptance/01_vars/02_functions/444.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/445.cf b/tests/acceptance/01_vars/02_functions/445.cf index f9b13a6299..00f14f1938 100644 --- a/tests/acceptance/01_vars/02_functions/445.cf +++ b/tests/acceptance/01_vars/02_functions/445.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/447.cf b/tests/acceptance/01_vars/02_functions/447.cf index 3f88cccf08..9a4e80719b 100644 --- a/tests/acceptance/01_vars/02_functions/447.cf +++ b/tests/acceptance/01_vars/02_functions/447.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/450.cf b/tests/acceptance/01_vars/02_functions/450.cf index 38c1d09e1a..f8f1009b19 100644 --- a/tests/acceptance/01_vars/02_functions/450.cf +++ b/tests/acceptance/01_vars/02_functions/450.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/500.cf b/tests/acceptance/01_vars/02_functions/500.cf index b51b94c5c3..97fab50c76 100644 --- a/tests/acceptance/01_vars/02_functions/500.cf +++ b/tests/acceptance/01_vars/02_functions/500.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/501.cf b/tests/acceptance/01_vars/02_functions/501.cf index 4d459c273c..91d0c2e9b7 100644 --- a/tests/acceptance/01_vars/02_functions/501.cf +++ b/tests/acceptance/01_vars/02_functions/501.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/520.cf b/tests/acceptance/01_vars/02_functions/520.cf index 89e37ee9de..dee54e7dfd 100644 --- a/tests/acceptance/01_vars/02_functions/520.cf +++ b/tests/acceptance/01_vars/02_functions/520.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/521.cf b/tests/acceptance/01_vars/02_functions/521.cf index 82f8b91ea9..db76ae4668 100644 --- a/tests/acceptance/01_vars/02_functions/521.cf +++ b/tests/acceptance/01_vars/02_functions/521.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/600.cf b/tests/acceptance/01_vars/02_functions/600.cf index e9d3d5a823..4dec9ec3f2 100644 --- a/tests/acceptance/01_vars/02_functions/600.cf +++ b/tests/acceptance/01_vars/02_functions/600.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/601.cf b/tests/acceptance/01_vars/02_functions/601.cf index 63f960bca6..9118ac0798 100644 --- a/tests/acceptance/01_vars/02_functions/601.cf +++ b/tests/acceptance/01_vars/02_functions/601.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/620.cf b/tests/acceptance/01_vars/02_functions/620.cf index d207c78b07..ccf848618c 100644 --- a/tests/acceptance/01_vars/02_functions/620.cf +++ b/tests/acceptance/01_vars/02_functions/620.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/621.cf b/tests/acceptance/01_vars/02_functions/621.cf index 19fe601bc0..61540e5e7d 100644 --- a/tests/acceptance/01_vars/02_functions/621.cf +++ b/tests/acceptance/01_vars/02_functions/621.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/700.cf b/tests/acceptance/01_vars/02_functions/700.cf index 0eef7a109f..14fd81ad22 100644 --- a/tests/acceptance/01_vars/02_functions/700.cf +++ b/tests/acceptance/01_vars/02_functions/700.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/02_functions/701.cf b/tests/acceptance/01_vars/02_functions/701.cf index 6108c8b73e..8817a1cab8 100644 --- a/tests/acceptance/01_vars/02_functions/701.cf +++ b/tests/acceptance/01_vars/02_functions/701.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/02_functions/702.cf b/tests/acceptance/01_vars/02_functions/702.cf index 9034501b02..2838167835 100644 --- a/tests/acceptance/01_vars/02_functions/702.cf +++ b/tests/acceptance/01_vars/02_functions/702.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/02_functions/CFE-2704-0.cf b/tests/acceptance/01_vars/02_functions/CFE-2704-0.cf index f64c9dc367..14b8c34050 100644 --- a/tests/acceptance/01_vars/02_functions/CFE-2704-0.cf +++ b/tests/acceptance/01_vars/02_functions/CFE-2704-0.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/02_functions/CFE-2704-1.cf b/tests/acceptance/01_vars/02_functions/CFE-2704-1.cf index d21f4336f7..5e13a410f6 100644 --- a/tests/acceptance/01_vars/02_functions/CFE-2704-1.cf +++ b/tests/acceptance/01_vars/02_functions/CFE-2704-1.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/02_functions/CFE-954.cf b/tests/acceptance/01_vars/02_functions/CFE-954.cf index def229180c..2d09f5b117 100644 --- a/tests/acceptance/01_vars/02_functions/CFE-954.cf +++ b/tests/acceptance/01_vars/02_functions/CFE-954.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } bundle agent init diff --git a/tests/acceptance/01_vars/02_functions/and.cf b/tests/acceptance/01_vars/02_functions/and.cf index 9e56882016..063633b15c 100644 --- a/tests/acceptance/01_vars/02_functions/and.cf +++ b/tests/acceptance/01_vars/02_functions/and.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/array_subkey_collision.cf b/tests/acceptance/01_vars/02_functions/array_subkey_collision.cf index 509bfcdfd7..6c713ff79e 100644 --- a/tests/acceptance/01_vars/02_functions/array_subkey_collision.cf +++ b/tests/acceptance/01_vars/02_functions/array_subkey_collision.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/basename_1.cf b/tests/acceptance/01_vars/02_functions/basename_1.cf index b38b3d132f..f637b3024f 100644 --- a/tests/acceptance/01_vars/02_functions/basename_1.cf +++ b/tests/acceptance/01_vars/02_functions/basename_1.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/basename_2.cf b/tests/acceptance/01_vars/02_functions/basename_2.cf index 8d3d83666f..32d7d39b1c 100644 --- a/tests/acceptance/01_vars/02_functions/basename_2.cf +++ b/tests/acceptance/01_vars/02_functions/basename_2.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/bundlesmatching.cf b/tests/acceptance/01_vars/02_functions/bundlesmatching.cf index 7818204f8b..5bfe823ef9 100644 --- a/tests/acceptance/01_vars/02_functions/bundlesmatching.cf +++ b/tests/acceptance/01_vars/02_functions/bundlesmatching.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/02_functions/bundlesmatching_dynamicsequence.cf b/tests/acceptance/01_vars/02_functions/bundlesmatching_dynamicsequence.cf index 42a4a943a2..0e915a68f4 100644 --- a/tests/acceptance/01_vars/02_functions/bundlesmatching_dynamicsequence.cf +++ b/tests/acceptance/01_vars/02_functions/bundlesmatching_dynamicsequence.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/02_functions/bundlestate.cf b/tests/acceptance/01_vars/02_functions/bundlestate.cf index d44956c7ca..67f7ca3935 100644 --- a/tests/acceptance/01_vars/02_functions/bundlestate.cf +++ b/tests/acceptance/01_vars/02_functions/bundlestate.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub", "bundlestate.cf.sub" }; + inputs => { "../../default.sub.cf", "bundlestate.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/cache_name.cf b/tests/acceptance/01_vars/02_functions/cache_name.cf index abbace9238..bff0257413 100644 --- a/tests/acceptance/01_vars/02_functions/cache_name.cf +++ b/tests/acceptance/01_vars/02_functions/cache_name.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/canonifyuniquely.cf b/tests/acceptance/01_vars/02_functions/canonifyuniquely.cf index d0ec78b10e..644719730a 100644 --- a/tests/acceptance/01_vars/02_functions/canonifyuniquely.cf +++ b/tests/acceptance/01_vars/02_functions/canonifyuniquely.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -89,4 +89,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/cf_version.cf b/tests/acceptance/01_vars/02_functions/cf_version.cf index 242f2070ad..1a128dac25 100644 --- a/tests/acceptance/01_vars/02_functions/cf_version.cf +++ b/tests/acceptance/01_vars/02_functions/cf_version.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/classesmatching.cf b/tests/acceptance/01_vars/02_functions/classesmatching.cf index 9f43b510e3..a9e7824941 100644 --- a/tests/acceptance/01_vars/02_functions/classesmatching.cf +++ b/tests/acceptance/01_vars/02_functions/classesmatching.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/02_functions/classfiltercsv_1.cf b/tests/acceptance/01_vars/02_functions/classfiltercsv_1.cf index 0d9ee2f787..444ba55bda 100644 --- a/tests/acceptance/01_vars/02_functions/classfiltercsv_1.cf +++ b/tests/acceptance/01_vars/02_functions/classfiltercsv_1.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/classfiltercsv_2.cf b/tests/acceptance/01_vars/02_functions/classfiltercsv_2.cf index 9b16b1a11a..6c2572f1cf 100644 --- a/tests/acceptance/01_vars/02_functions/classfiltercsv_2.cf +++ b/tests/acceptance/01_vars/02_functions/classfiltercsv_2.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/classfiltercsv_3.cf b/tests/acceptance/01_vars/02_functions/classfiltercsv_3.cf index cd02d2e317..8c1d7b1a0a 100644 --- a/tests/acceptance/01_vars/02_functions/classfiltercsv_3.cf +++ b/tests/acceptance/01_vars/02_functions/classfiltercsv_3.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/classfiltercsv_4.cf b/tests/acceptance/01_vars/02_functions/classfiltercsv_4.cf index d40e8910bc..979a215a50 100644 --- a/tests/acceptance/01_vars/02_functions/classfiltercsv_4.cf +++ b/tests/acceptance/01_vars/02_functions/classfiltercsv_4.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/classfiltercsv_5.cf b/tests/acceptance/01_vars/02_functions/classfiltercsv_5.cf index df44d26228..625f271e79 100644 --- a/tests/acceptance/01_vars/02_functions/classfiltercsv_5.cf +++ b/tests/acceptance/01_vars/02_functions/classfiltercsv_5.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/classfilterdata_collecting.cf b/tests/acceptance/01_vars/02_functions/classfilterdata_collecting.cf index 71a470aa74..dba9671cdf 100644 --- a/tests/acceptance/01_vars/02_functions/classfilterdata_collecting.cf +++ b/tests/acceptance/01_vars/02_functions/classfilterdata_collecting.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/02_functions/classmatch.cf b/tests/acceptance/01_vars/02_functions/classmatch.cf index dc180b403d..0934fc81f8 100644 --- a/tests/acceptance/01_vars/02_functions/classmatch.cf +++ b/tests/acceptance/01_vars/02_functions/classmatch.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/02_functions/countlinesmatching.cf b/tests/acceptance/01_vars/02_functions/countlinesmatching.cf index a4f0b179af..f08754eee0 100644 --- a/tests/acceptance/01_vars/02_functions/countlinesmatching.cf +++ b/tests/acceptance/01_vars/02_functions/countlinesmatching.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/02_functions/countlinesmatching_errors_on_absent_file.cf b/tests/acceptance/01_vars/02_functions/countlinesmatching_errors_on_absent_file.cf index 5fc505da90..f5f6c6fe8b 100644 --- a/tests/acceptance/01_vars/02_functions/countlinesmatching_errors_on_absent_file.cf +++ b/tests/acceptance/01_vars/02_functions/countlinesmatching_errors_on_absent_file.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/countlinesmatching_returns_0_on_inaccessable_file.cf b/tests/acceptance/01_vars/02_functions/countlinesmatching_returns_0_on_inaccessable_file.cf index ed57633891..e3983c257f 100644 --- a/tests/acceptance/01_vars/02_functions/countlinesmatching_returns_0_on_inaccessable_file.cf +++ b/tests/acceptance/01_vars/02_functions/countlinesmatching_returns_0_on_inaccessable_file.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -50,4 +50,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/data_expand.cf b/tests/acceptance/01_vars/02_functions/data_expand.cf index 3d45a407a5..d1fef6916e 100644 --- a/tests/acceptance/01_vars/02_functions/data_expand.cf +++ b/tests/acceptance/01_vars/02_functions/data_expand.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/data_readstringarray.cf b/tests/acceptance/01_vars/02_functions/data_readstringarray.cf index 03515c0502..9ed03a1e4d 100644 --- a/tests/acceptance/01_vars/02_functions/data_readstringarray.cf +++ b/tests/acceptance/01_vars/02_functions/data_readstringarray.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/data_readstringarrayidx.cf b/tests/acceptance/01_vars/02_functions/data_readstringarrayidx.cf index 1f90dd0e3a..2d4b2b99df 100644 --- a/tests/acceptance/01_vars/02_functions/data_readstringarrayidx.cf +++ b/tests/acceptance/01_vars/02_functions/data_readstringarrayidx.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/data_regextract-2.cf b/tests/acceptance/01_vars/02_functions/data_regextract-2.cf index 42f8152d4d..3e0c8f9951 100644 --- a/tests/acceptance/01_vars/02_functions/data_regextract-2.cf +++ b/tests/acceptance/01_vars/02_functions/data_regextract-2.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/02_functions/data_regextract.cf b/tests/acceptance/01_vars/02_functions/data_regextract.cf index ff7eba0f80..82ff3e04d0 100644 --- a/tests/acceptance/01_vars/02_functions/data_regextract.cf +++ b/tests/acceptance/01_vars/02_functions/data_regextract.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/02_functions/datastate.cf b/tests/acceptance/01_vars/02_functions/datastate.cf index ed4550e464..36ce5d8b7d 100644 --- a/tests/acceptance/01_vars/02_functions/datastate.cf +++ b/tests/acceptance/01_vars/02_functions/datastate.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub", "datastate.cf.sub" }; + inputs => { "../../default.sub.cf", "datastate.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/dirname.cf b/tests/acceptance/01_vars/02_functions/dirname.cf index e7bd6dd2e6..f32efdc054 100644 --- a/tests/acceptance/01_vars/02_functions/dirname.cf +++ b/tests/acceptance/01_vars/02_functions/dirname.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -156,5 +156,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - - diff --git a/tests/acceptance/01_vars/02_functions/eval.cf b/tests/acceptance/01_vars/02_functions/eval.cf index debc267781..62bdc00e18 100644 --- a/tests/acceptance/01_vars/02_functions/eval.cf +++ b/tests/acceptance/01_vars/02_functions/eval.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/eval_class.cf b/tests/acceptance/01_vars/02_functions/eval_class.cf index 6fee459685..24bcf7d42d 100644 --- a/tests/acceptance/01_vars/02_functions/eval_class.cf +++ b/tests/acceptance/01_vars/02_functions/eval_class.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } 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 9e75f1c470..417ea9fa11 100644 --- a/tests/acceptance/01_vars/02_functions/every_some_none.cf +++ b/tests/acceptance/01_vars/02_functions/every_some_none.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/execresult.cf b/tests/acceptance/01_vars/02_functions/execresult.cf index d4a64917fd..b2cd12a176 100644 --- a/tests/acceptance/01_vars/02_functions/execresult.cf +++ b/tests/acceptance/01_vars/02_functions/execresult.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/execresult_4k.cf b/tests/acceptance/01_vars/02_functions/execresult_4k.cf index f6fc2bc5b7..e0d08e86a6 100644 --- a/tests/acceptance/01_vars/02_functions/execresult_4k.cf +++ b/tests/acceptance/01_vars/02_functions/execresult_4k.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/execresult_action_immediate.cf b/tests/acceptance/01_vars/02_functions/execresult_action_immediate.cf index 91a4301b44..4ec4aa1a78 100644 --- a/tests/acceptance/01_vars/02_functions/execresult_action_immediate.cf +++ b/tests/acceptance/01_vars/02_functions/execresult_action_immediate.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/execresult_multiples.cf b/tests/acceptance/01_vars/02_functions/execresult_multiples.cf index e8ab5e6214..f7cdc07d29 100644 --- a/tests/acceptance/01_vars/02_functions/execresult_multiples.cf +++ b/tests/acceptance/01_vars/02_functions/execresult_multiples.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/execresult_select.cf b/tests/acceptance/01_vars/02_functions/execresult_select.cf index 4f3edda5a2..c2eb1bc4fa 100644 --- a/tests/acceptance/01_vars/02_functions/execresult_select.cf +++ b/tests/acceptance/01_vars/02_functions/execresult_select.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/execresult_stderr.cf b/tests/acceptance/01_vars/02_functions/execresult_stderr.cf index d006607268..5cf8a27db4 100644 --- a/tests/acceptance/01_vars/02_functions/execresult_stderr.cf +++ b/tests/acceptance/01_vars/02_functions/execresult_stderr.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/filesexist-can-detect-files-containing-hash-character.cf b/tests/acceptance/01_vars/02_functions/filesexist-can-detect-files-containing-hash-character.cf index 3eeff0f87f..cb6b6a8a2e 100644 --- a/tests/acceptance/01_vars/02_functions/filesexist-can-detect-files-containing-hash-character.cf +++ b/tests/acceptance/01_vars/02_functions/filesexist-can-detect-files-containing-hash-character.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/filesexist-is-collecting.cf b/tests/acceptance/01_vars/02_functions/filesexist-is-collecting.cf index b954d9db46..2214cbcc68 100644 --- a/tests/acceptance/01_vars/02_functions/filesexist-is-collecting.cf +++ b/tests/acceptance/01_vars/02_functions/filesexist-is-collecting.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/filestat.cf b/tests/acceptance/01_vars/02_functions/filestat.cf index d15b21c625..7d8c7af4b2 100644 --- a/tests/acceptance/01_vars/02_functions/filestat.cf +++ b/tests/acceptance/01_vars/02_functions/filestat.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/filestat_linktarget.cf b/tests/acceptance/01_vars/02_functions/filestat_linktarget.cf index 5e22d8db44..ef07c52de1 100644 --- a/tests/acceptance/01_vars/02_functions/filestat_linktarget.cf +++ b/tests/acceptance/01_vars/02_functions/filestat_linktarget.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/filestat_linktarget_relative_symlink.cf b/tests/acceptance/01_vars/02_functions/filestat_linktarget_relative_symlink.cf index 8bea1d739a..0ea22dde3f 100644 --- a/tests/acceptance/01_vars/02_functions/filestat_linktarget_relative_symlink.cf +++ b/tests/acceptance/01_vars/02_functions/filestat_linktarget_relative_symlink.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/filestat_xattr.cf b/tests/acceptance/01_vars/02_functions/filestat_xattr.cf index 8004ce1a87..e9100f021f 100644 --- a/tests/acceptance/01_vars/02_functions/filestat_xattr.cf +++ b/tests/acceptance/01_vars/02_functions/filestat_xattr.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/filter.cf b/tests/acceptance/01_vars/02_functions/filter.cf index 541f14a536..269e25bf49 100644 --- a/tests/acceptance/01_vars/02_functions/filter.cf +++ b/tests/acceptance/01_vars/02_functions/filter.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/findfiles-GLOB_BRACE.cf b/tests/acceptance/01_vars/02_functions/findfiles-GLOB_BRACE.cf index 72123d650b..52366b150e 100644 --- a/tests/acceptance/01_vars/02_functions/findfiles-GLOB_BRACE.cf +++ b/tests/acceptance/01_vars/02_functions/findfiles-GLOB_BRACE.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/findfiles.cf b/tests/acceptance/01_vars/02_functions/findfiles.cf index 2827d45871..1d06a1a3eb 100644 --- a/tests/acceptance/01_vars/02_functions/findfiles.cf +++ b/tests/acceptance/01_vars/02_functions/findfiles.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/findfiles_glob_bracket.cf b/tests/acceptance/01_vars/02_functions/findfiles_glob_bracket.cf index 79647c829e..1a7f69799e 100644 --- a/tests/acceptance/01_vars/02_functions/findfiles_glob_bracket.cf +++ b/tests/acceptance/01_vars/02_functions/findfiles_glob_bracket.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "init", "test", "check" }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/findlocalgroups.cf b/tests/acceptance/01_vars/02_functions/findlocalgroups.cf index 2852b516bd..cdf085a348 100644 --- a/tests/acceptance/01_vars/02_functions/findlocalgroups.cf +++ b/tests/acceptance/01_vars/02_functions/findlocalgroups.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/findlocalusers.cf b/tests/acceptance/01_vars/02_functions/findlocalusers.cf index 095a44ddef..181da562e0 100644 --- a/tests/acceptance/01_vars/02_functions/findlocalusers.cf +++ b/tests/acceptance/01_vars/02_functions/findlocalusers.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/fold.cf b/tests/acceptance/01_vars/02_functions/fold.cf index 9c2deefeb9..8732d27ea2 100644 --- a/tests/acceptance/01_vars/02_functions/fold.cf +++ b/tests/acceptance/01_vars/02_functions/fold.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/format.cf b/tests/acceptance/01_vars/02_functions/format.cf index ef86c440a2..8115d68ee1 100644 --- a/tests/acceptance/01_vars/02_functions/format.cf +++ b/tests/acceptance/01_vars/02_functions/format.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } 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 818ae3168f..7133b01617 100644 --- a/tests/acceptance/01_vars/02_functions/format_edge_case.cf +++ b/tests/acceptance/01_vars/02_functions/format_edge_case.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/function_with_skipped_promise.cf b/tests/acceptance/01_vars/02_functions/function_with_skipped_promise.cf index f2ec7feb55..3f5aadc3fb 100644 --- a/tests/acceptance/01_vars/02_functions/function_with_skipped_promise.cf +++ b/tests/acceptance/01_vars/02_functions/function_with_skipped_promise.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/getfields.cf b/tests/acceptance/01_vars/02_functions/getfields.cf index 8ebb521f5e..d6274b9809 100644 --- a/tests/acceptance/01_vars/02_functions/getfields.cf +++ b/tests/acceptance/01_vars/02_functions/getfields.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/getgroupinfo.cf b/tests/acceptance/01_vars/02_functions/getgroupinfo.cf index 68c9ae7eb3..ebc67b2f03 100644 --- a/tests/acceptance/01_vars/02_functions/getgroupinfo.cf +++ b/tests/acceptance/01_vars/02_functions/getgroupinfo.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/getgroups.cf b/tests/acceptance/01_vars/02_functions/getgroups.cf index 983380f4fe..c74c77f678 100644 --- a/tests/acceptance/01_vars/02_functions/getgroups.cf +++ b/tests/acceptance/01_vars/02_functions/getgroups.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/getindices.cf b/tests/acceptance/01_vars/02_functions/getindices.cf index f682f5d1f8..c5d023689c 100644 --- a/tests/acceptance/01_vars/02_functions/getindices.cf +++ b/tests/acceptance/01_vars/02_functions/getindices.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/getindices_returns_empty_list_if_array_index_has_no_key_values.cf b/tests/acceptance/01_vars/02_functions/getindices_returns_empty_list_if_array_index_has_no_key_values.cf index 5b5dba80a1..c0b2421579 100644 --- a/tests/acceptance/01_vars/02_functions/getindices_returns_empty_list_if_array_index_has_no_key_values.cf +++ b/tests/acceptance/01_vars/02_functions/getindices_returns_empty_list_if_array_index_has_no_key_values.cf @@ -6,7 +6,7 @@ ####################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/getindices_returns_empty_list_if_datacontainer_index_has_no_key_values.cf b/tests/acceptance/01_vars/02_functions/getindices_returns_empty_list_if_datacontainer_index_has_no_key_values.cf index 8c560d6ccf..55328f0204 100644 --- a/tests/acceptance/01_vars/02_functions/getindices_returns_empty_list_if_datacontainer_index_has_no_key_values.cf +++ b/tests/acceptance/01_vars/02_functions/getindices_returns_empty_list_if_datacontainer_index_has_no_key_values.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } 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 27342861ab..4600f3dd17 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 @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } 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 6fc8f93606..9e38de2018 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 @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/getindices_size2_with_expansion.cf b/tests/acceptance/01_vars/02_functions/getindices_size2_with_expansion.cf index 71d6f5441b..140b70f3d3 100644 --- a/tests/acceptance/01_vars/02_functions/getindices_size2_with_expansion.cf +++ b/tests/acceptance/01_vars/02_functions/getindices_size2_with_expansion.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/getindices_with_multi_index_arrays.cf b/tests/acceptance/01_vars/02_functions/getindices_with_multi_index_arrays.cf index dea05a86ae..85d6e87971 100644 --- a/tests/acceptance/01_vars/02_functions/getindices_with_multi_index_arrays.cf +++ b/tests/acceptance/01_vars/02_functions/getindices_with_multi_index_arrays.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/gettags.cf b/tests/acceptance/01_vars/02_functions/gettags.cf index 425443cb43..ed2df21691 100644 --- a/tests/acceptance/01_vars/02_functions/gettags.cf +++ b/tests/acceptance/01_vars/02_functions/gettags.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } @@ -64,4 +64,3 @@ bundle common dummy meta: "tags" slist => { "dummytag1", "dummytag2", "foo=bar", "foo=hello" }; } - diff --git a/tests/acceptance/01_vars/02_functions/getuserinfo.cf b/tests/acceptance/01_vars/02_functions/getuserinfo.cf index 829610105e..bd20ab454a 100644 --- a/tests/acceptance/01_vars/02_functions/getuserinfo.cf +++ b/tests/acceptance/01_vars/02_functions/getuserinfo.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/getvalues.cf b/tests/acceptance/01_vars/02_functions/getvalues.cf index 9087b7fbea..8d274de1f7 100644 --- a/tests/acceptance/01_vars/02_functions/getvalues.cf +++ b/tests/acceptance/01_vars/02_functions/getvalues.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/getvalues_array_returns_first_index_values.cf b/tests/acceptance/01_vars/02_functions/getvalues_array_returns_first_index_values.cf index d64eb20d1c..f78136732b 100644 --- a/tests/acceptance/01_vars/02_functions/getvalues_array_returns_first_index_values.cf +++ b/tests/acceptance/01_vars/02_functions/getvalues_array_returns_first_index_values.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/getvalues_array_slist.cf b/tests/acceptance/01_vars/02_functions/getvalues_array_slist.cf index 4ff46972c6..4da2748095 100644 --- a/tests/acceptance/01_vars/02_functions/getvalues_array_slist.cf +++ b/tests/acceptance/01_vars/02_functions/getvalues_array_slist.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/getvalues_array_string.cf b/tests/acceptance/01_vars/02_functions/getvalues_array_string.cf index 417ca4fc79..b0922d900a 100644 --- a/tests/acceptance/01_vars/02_functions/getvalues_array_string.cf +++ b/tests/acceptance/01_vars/02_functions/getvalues_array_string.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/getvalues_containers.cf b/tests/acceptance/01_vars/02_functions/getvalues_containers.cf index c47506e79d..90e089c86c 100644 --- a/tests/acceptance/01_vars/02_functions/getvalues_containers.cf +++ b/tests/acceptance/01_vars/02_functions/getvalues_containers.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/getvalues_flattens-list-elements.cf b/tests/acceptance/01_vars/02_functions/getvalues_flattens-list-elements.cf index 1e115ff5fb..55f2ec0aea 100644 --- a/tests/acceptance/01_vars/02_functions/getvalues_flattens-list-elements.cf +++ b/tests/acceptance/01_vars/02_functions/getvalues_flattens-list-elements.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/getvalues_plain_slist.cf b/tests/acceptance/01_vars/02_functions/getvalues_plain_slist.cf index ce47c25d3e..0ae781a38f 100644 --- a/tests/acceptance/01_vars/02_functions/getvalues_plain_slist.cf +++ b/tests/acceptance/01_vars/02_functions/getvalues_plain_slist.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/getvalues_plain_string.cf b/tests/acceptance/01_vars/02_functions/getvalues_plain_string.cf index 4cdc122cbf..fe424910fe 100644 --- a/tests/acceptance/01_vars/02_functions/getvalues_plain_string.cf +++ b/tests/acceptance/01_vars/02_functions/getvalues_plain_string.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/getvalues_returns_all_values_for_given_array_index_merging_strings.cf b/tests/acceptance/01_vars/02_functions/getvalues_returns_all_values_for_given_array_index_merging_strings.cf index 9fc60cfed4..8f9f775853 100644 --- a/tests/acceptance/01_vars/02_functions/getvalues_returns_all_values_for_given_array_index_merging_strings.cf +++ b/tests/acceptance/01_vars/02_functions/getvalues_returns_all_values_for_given_array_index_merging_strings.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } 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 25822c688d..58d4c65a52 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 @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/getvalues_returns_slist_for_array_scalar.cf b/tests/acceptance/01_vars/02_functions/getvalues_returns_slist_for_array_scalar.cf index 14b82b7d16..4b59f3cc5d 100644 --- a/tests/acceptance/01_vars/02_functions/getvalues_returns_slist_for_array_scalar.cf +++ b/tests/acceptance/01_vars/02_functions/getvalues_returns_slist_for_array_scalar.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/getvalues_returns_slist_for_datacontainer_scalar.cf b/tests/acceptance/01_vars/02_functions/getvalues_returns_slist_for_datacontainer_scalar.cf index 20971c0d4a..8cab6873d6 100644 --- a/tests/acceptance/01_vars/02_functions/getvalues_returns_slist_for_datacontainer_scalar.cf +++ b/tests/acceptance/01_vars/02_functions/getvalues_returns_slist_for_datacontainer_scalar.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/hash.cf b/tests/acceptance/01_vars/02_functions/hash.cf index 24cebb60a9..364583061a 100644 --- a/tests/acceptance/01_vars/02_functions/hash.cf +++ b/tests/acceptance/01_vars/02_functions/hash.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/hash_to_int.cf b/tests/acceptance/01_vars/02_functions/hash_to_int.cf index 2568440811..bbd87d61d0 100644 --- a/tests/acceptance/01_vars/02_functions/hash_to_int.cf +++ b/tests/acceptance/01_vars/02_functions/hash_to_int.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/ifelse.cf b/tests/acceptance/01_vars/02_functions/ifelse.cf index e33851efc3..637bcc1fc4 100644 --- a/tests/acceptance/01_vars/02_functions/ifelse.cf +++ b/tests/acceptance/01_vars/02_functions/ifelse.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/ifelse_isvariable-ENT-4653.cf b/tests/acceptance/01_vars/02_functions/ifelse_isvariable-ENT-4653.cf index 294d77d8a8..d06560e5f8 100644 --- a/tests/acceptance/01_vars/02_functions/ifelse_isvariable-ENT-4653.cf +++ b/tests/acceptance/01_vars/02_functions/ifelse_isvariable-ENT-4653.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/ifelse_isvariable.cf b/tests/acceptance/01_vars/02_functions/ifelse_isvariable.cf index f1eddae20f..af1afa6e09 100644 --- a/tests/acceptance/01_vars/02_functions/ifelse_isvariable.cf +++ b/tests/acceptance/01_vars/02_functions/ifelse_isvariable.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/ifelse_undefined.cf b/tests/acceptance/01_vars/02_functions/ifelse_undefined.cf index 96126464ec..2fccbd859f 100644 --- a/tests/acceptance/01_vars/02_functions/ifelse_undefined.cf +++ b/tests/acceptance/01_vars/02_functions/ifelse_undefined.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/inline_json.cf b/tests/acceptance/01_vars/02_functions/inline_json.cf index 0d27f9e642..a7a5f1c47a 100644 --- a/tests/acceptance/01_vars/02_functions/inline_json.cf +++ b/tests/acceptance/01_vars/02_functions/inline_json.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/int.cf b/tests/acceptance/01_vars/02_functions/int.cf index 887060ef22..de12264af2 100644 --- a/tests/acceptance/01_vars/02_functions/int.cf +++ b/tests/acceptance/01_vars/02_functions/int.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/02_functions/isconnectable.cf b/tests/acceptance/01_vars/02_functions/isconnectable.cf index 3916f3f6bc..362bd984f3 100644 --- a/tests/acceptance/01_vars/02_functions/isconnectable.cf +++ b/tests/acceptance/01_vars/02_functions/isconnectable.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/isreadable.cf b/tests/acceptance/01_vars/02_functions/isreadable.cf index a26260413e..b0df65508e 100644 --- a/tests/acceptance/01_vars/02_functions/isreadable.cf +++ b/tests/acceptance/01_vars/02_functions/isreadable.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/iterating_variablesmatching_results.cf b/tests/acceptance/01_vars/02_functions/iterating_variablesmatching_results.cf index 5f88162cfa..b2a64200dd 100644 --- a/tests/acceptance/01_vars/02_functions/iterating_variablesmatching_results.cf +++ b/tests/acceptance/01_vars/02_functions/iterating_variablesmatching_results.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/02_functions/join.cf b/tests/acceptance/01_vars/02_functions/join.cf index 964fcee246..eaefdb0cfb 100644 --- a/tests/acceptance/01_vars/02_functions/join.cf +++ b/tests/acceptance/01_vars/02_functions/join.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/join_mapped_list.cf b/tests/acceptance/01_vars/02_functions/join_mapped_list.cf index b362f8cccc..cbc7d9a3d2 100644 --- a/tests/acceptance/01_vars/02_functions/join_mapped_list.cf +++ b/tests/acceptance/01_vars/02_functions/join_mapped_list.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/length.cf b/tests/acceptance/01_vars/02_functions/length.cf index 7c50f21627..3a16ca4235 100644 --- a/tests/acceptance/01_vars/02_functions/length.cf +++ b/tests/acceptance/01_vars/02_functions/length.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/long_string_from_module.cf b/tests/acceptance/01_vars/02_functions/long_string_from_module.cf index 66b1f6d72a..de21f630e6 100644 --- a/tests/acceptance/01_vars/02_functions/long_string_from_module.cf +++ b/tests/acceptance/01_vars/02_functions/long_string_from_module.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/long_string_from_text_file.cf b/tests/acceptance/01_vars/02_functions/long_string_from_text_file.cf index 1d68b99942..8f5d8f98b7 100644 --- a/tests/acceptance/01_vars/02_functions/long_string_from_text_file.cf +++ b/tests/acceptance/01_vars/02_functions/long_string_from_text_file.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/lsdir.cf b/tests/acceptance/01_vars/02_functions/lsdir.cf index 90ddc7436b..625c40f8c7 100644 --- a/tests/acceptance/01_vars/02_functions/lsdir.cf +++ b/tests/acceptance/01_vars/02_functions/lsdir.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/maparray.cf b/tests/acceptance/01_vars/02_functions/maparray.cf index 0a8e99a5b6..5e69ad8415 100644 --- a/tests/acceptance/01_vars/02_functions/maparray.cf +++ b/tests/acceptance/01_vars/02_functions/maparray.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/maparray_mixed.cf b/tests/acceptance/01_vars/02_functions/maparray_mixed.cf index 56b62152bd..73c11a4986 100644 --- a/tests/acceptance/01_vars/02_functions/maparray_mixed.cf +++ b/tests/acceptance/01_vars/02_functions/maparray_mixed.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } 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 a0feb0165d..482c712127 100644 --- a/tests/acceptance/01_vars/02_functions/maparray_multi_index.cf +++ b/tests/acceptance/01_vars/02_functions/maparray_multi_index.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/mapdata.cf b/tests/acceptance/01_vars/02_functions/mapdata.cf index d3ffa334d4..9a54b94ba7 100644 --- a/tests/acceptance/01_vars/02_functions/mapdata.cf +++ b/tests/acceptance/01_vars/02_functions/mapdata.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/mapdata_json_pipe.cf b/tests/acceptance/01_vars/02_functions/mapdata_json_pipe.cf index 75bc258f51..95fd914e4e 100644 --- a/tests/acceptance/01_vars/02_functions/mapdata_json_pipe.cf +++ b/tests/acceptance/01_vars/02_functions/mapdata_json_pipe.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/maplist.cf b/tests/acceptance/01_vars/02_functions/maplist.cf index 202f94f2d8..3959806df4 100644 --- a/tests/acceptance/01_vars/02_functions/maplist.cf +++ b/tests/acceptance/01_vars/02_functions/maplist.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/mergedata-CFE-2551-0.cf b/tests/acceptance/01_vars/02_functions/mergedata-CFE-2551-0.cf index 1a99d9c4b6..ed5c5b7f04 100644 --- a/tests/acceptance/01_vars/02_functions/mergedata-CFE-2551-0.cf +++ b/tests/acceptance/01_vars/02_functions/mergedata-CFE-2551-0.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/02_functions/mergedata-CFE-2551-1.cf b/tests/acceptance/01_vars/02_functions/mergedata-CFE-2551-1.cf index c30701a2e9..44e7516bdc 100644 --- a/tests/acceptance/01_vars/02_functions/mergedata-CFE-2551-1.cf +++ b/tests/acceptance/01_vars/02_functions/mergedata-CFE-2551-1.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/02_functions/mergedata-CFE-2551-2.cf b/tests/acceptance/01_vars/02_functions/mergedata-CFE-2551-2.cf index dc0401a278..3a98932832 100644 --- a/tests/acceptance/01_vars/02_functions/mergedata-CFE-2551-2.cf +++ b/tests/acceptance/01_vars/02_functions/mergedata-CFE-2551-2.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } 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 1cedd35a62..8d0a41e398 100644 --- a/tests/acceptance/01_vars/02_functions/mergedata-json-strings.cf +++ b/tests/acceptance/01_vars/02_functions/mergedata-json-strings.cf @@ -2,7 +2,7 @@ body common control { inputs => { - "../../default.cf.sub" + "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } @@ -32,4 +32,3 @@ bundle agent check "$(this.promise_filename).expected", "$(this.promise_filename)"); } - diff --git a/tests/acceptance/01_vars/02_functions/mergedata.cf b/tests/acceptance/01_vars/02_functions/mergedata.cf index 9be538c7f3..a80d8e197f 100644 --- a/tests/acceptance/01_vars/02_functions/mergedata.cf +++ b/tests/acceptance/01_vars/02_functions/mergedata.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/mergedata_CFE-2551-0.cf b/tests/acceptance/01_vars/02_functions/mergedata_CFE-2551-0.cf index 5fca303518..932b763f45 100644 --- a/tests/acceptance/01_vars/02_functions/mergedata_CFE-2551-0.cf +++ b/tests/acceptance/01_vars/02_functions/mergedata_CFE-2551-0.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } bundle agent main diff --git a/tests/acceptance/01_vars/02_functions/mergedata_CFE-2551-1.cf b/tests/acceptance/01_vars/02_functions/mergedata_CFE-2551-1.cf index 82a17cbc3d..9a6be0260a 100644 --- a/tests/acceptance/01_vars/02_functions/mergedata_CFE-2551-1.cf +++ b/tests/acceptance/01_vars/02_functions/mergedata_CFE-2551-1.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } bundle agent main diff --git a/tests/acceptance/01_vars/02_functions/mergedata_CFE-2551-2.cf b/tests/acceptance/01_vars/02_functions/mergedata_CFE-2551-2.cf index 8590341dce..2feab0b746 100644 --- a/tests/acceptance/01_vars/02_functions/mergedata_CFE-2551-2.cf +++ b/tests/acceptance/01_vars/02_functions/mergedata_CFE-2551-2.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } bundle agent main diff --git a/tests/acceptance/01_vars/02_functions/mergedata_multilevel_array.cf b/tests/acceptance/01_vars/02_functions/mergedata_multilevel_array.cf index 5161b1141d..29db37cf52 100644 --- a/tests/acceptance/01_vars/02_functions/mergedata_multilevel_array.cf +++ b/tests/acceptance/01_vars/02_functions/mergedata_multilevel_array.cf @@ -2,7 +2,7 @@ # Ref: https://dev.cfengine.com/issues/4566 body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/02_functions/mergedata_with_list_iteration.cf b/tests/acceptance/01_vars/02_functions/mergedata_with_list_iteration.cf index 8b3f7a31f7..f09366fb3d 100644 --- a/tests/acceptance/01_vars/02_functions/mergedata_with_list_iteration.cf +++ b/tests/acceptance/01_vars/02_functions/mergedata_with_list_iteration.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { test_1, test_2, default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/missing_functions.cf b/tests/acceptance/01_vars/02_functions/missing_functions.cf index 17045d1d04..01e4ec57e1 100644 --- a/tests/acceptance/01_vars/02_functions/missing_functions.cf +++ b/tests/acceptance/01_vars/02_functions/missing_functions.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/mustach_doesnt_render_null.cf b/tests/acceptance/01_vars/02_functions/mustach_doesnt_render_null.cf index 381a6e9f2d..6483aa4ada 100644 --- a/tests/acceptance/01_vars/02_functions/mustach_doesnt_render_null.cf +++ b/tests/acceptance/01_vars/02_functions/mustach_doesnt_render_null.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/mustache_iterating_object_should_use_context_for_single_block_render.cf b/tests/acceptance/01_vars/02_functions/mustache_iterating_object_should_use_context_for_single_block_render.cf index d10321d0e2..19d992d380 100644 --- a/tests/acceptance/01_vars/02_functions/mustache_iterating_object_should_use_context_for_single_block_render.cf +++ b/tests/acceptance/01_vars/02_functions/mustache_iterating_object_should_use_context_for_single_block_render.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/mustache_iterating_object_workaround.cf b/tests/acceptance/01_vars/02_functions/mustache_iterating_object_workaround.cf index 632dd21056..55490a1869 100644 --- a/tests/acceptance/01_vars/02_functions/mustache_iterating_object_workaround.cf +++ b/tests/acceptance/01_vars/02_functions/mustache_iterating_object_workaround.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/mustache_iteration_with_nonfalse_values.cf b/tests/acceptance/01_vars/02_functions/mustache_iteration_with_nonfalse_values.cf index db591f7298..2d6ed37cd8 100644 --- a/tests/acceptance/01_vars/02_functions/mustache_iteration_with_nonfalse_values.cf +++ b/tests/acceptance/01_vars/02_functions/mustache_iteration_with_nonfalse_values.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } bundle agent test diff --git a/tests/acceptance/01_vars/02_functions/mustache_section_nonfalse_inverted.cf b/tests/acceptance/01_vars/02_functions/mustache_section_nonfalse_inverted.cf index 32ea261644..5654df447f 100644 --- a/tests/acceptance/01_vars/02_functions/mustache_section_nonfalse_inverted.cf +++ b/tests/acceptance/01_vars/02_functions/mustache_section_nonfalse_inverted.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/namespaces/001.cf b/tests/acceptance/01_vars/02_functions/namespaces/001.cf index 87e00eb838..5508bceebc 100644 --- a/tests/acceptance/01_vars/02_functions/namespaces/001.cf +++ b/tests/acceptance/01_vars/02_functions/namespaces/001.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../../../default.cf.sub", "001_namespaced_getindices.cf.sub" }; + inputs => { "../../../default.sub.cf", "001_namespaced_getindices.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/namespaces/002.cf b/tests/acceptance/01_vars/02_functions/namespaces/002.cf index 87059c5d9d..c724ef6e52 100644 --- a/tests/acceptance/01_vars/02_functions/namespaces/002.cf +++ b/tests/acceptance/01_vars/02_functions/namespaces/002.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../../../default.cf.sub", "002_namespaced_getindices.cf.sub" }; + inputs => { "../../../default.sub.cf", "002_namespaced_getindices.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/namespaces/003.cf b/tests/acceptance/01_vars/02_functions/namespaces/003.cf index 7b73bbf334..96d39d037c 100644 --- a/tests/acceptance/01_vars/02_functions/namespaces/003.cf +++ b/tests/acceptance/01_vars/02_functions/namespaces/003.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../../../default.cf.sub", "003_namespaced_getindices.cf.sub" }; + inputs => { "../../../default.sub.cf", "003_namespaced_getindices.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/namespaces/004.cf b/tests/acceptance/01_vars/02_functions/namespaces/004.cf index 2b4611f531..bd7b27d054 100644 --- a/tests/acceptance/01_vars/02_functions/namespaces/004.cf +++ b/tests/acceptance/01_vars/02_functions/namespaces/004.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../../../default.cf.sub", "004_namespaced_getindices.cf.sub" }; + inputs => { "../../../default.sub.cf", "004_namespaced_getindices.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/namespaces/005.cf b/tests/acceptance/01_vars/02_functions/namespaces/005.cf index 3700bc6104..bd743afdfd 100644 --- a/tests/acceptance/01_vars/02_functions/namespaces/005.cf +++ b/tests/acceptance/01_vars/02_functions/namespaces/005.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/namespaces/006.cf b/tests/acceptance/01_vars/02_functions/namespaces/006.cf index 9038d94c70..8c8ea7ad4b 100644 --- a/tests/acceptance/01_vars/02_functions/namespaces/006.cf +++ b/tests/acceptance/01_vars/02_functions/namespaces/006.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/namespaces/101.cf b/tests/acceptance/01_vars/02_functions/namespaces/101.cf index 04d8674f56..a1e9dbf7fc 100644 --- a/tests/acceptance/01_vars/02_functions/namespaces/101.cf +++ b/tests/acceptance/01_vars/02_functions/namespaces/101.cf @@ -5,7 +5,7 @@ body common control { - inputs => { "../../../default.cf.sub", "101_namespaced_getindices.cf.sub" }; + inputs => { "../../../default.sub.cf", "101_namespaced_getindices.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/namespaces/103.cf b/tests/acceptance/01_vars/02_functions/namespaces/103.cf index 4101eefe5e..e686009c13 100644 --- a/tests/acceptance/01_vars/02_functions/namespaces/103.cf +++ b/tests/acceptance/01_vars/02_functions/namespaces/103.cf @@ -5,7 +5,7 @@ body common control { - inputs => { "../../../default.cf.sub", "103_namespaced_getindices.cf.sub" }; + inputs => { "../../../default.sub.cf", "103_namespaced_getindices.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/namespaces/201.cf b/tests/acceptance/01_vars/02_functions/namespaces/201.cf index 1d2e69f49e..ef571ba3e9 100644 --- a/tests/acceptance/01_vars/02_functions/namespaces/201.cf +++ b/tests/acceptance/01_vars/02_functions/namespaces/201.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../../../default.cf.sub", "201_namespaced_getindices.cf.sub" }; + inputs => { "../../../default.sub.cf", "201_namespaced_getindices.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/namespaces/203.cf b/tests/acceptance/01_vars/02_functions/namespaces/203.cf index b0cbc5c418..6be474b918 100644 --- a/tests/acceptance/01_vars/02_functions/namespaces/203.cf +++ b/tests/acceptance/01_vars/02_functions/namespaces/203.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../../../default.cf.sub", "203_namespaced_getindices.cf.sub" }; + inputs => { "../../../default.sub.cf", "203_namespaced_getindices.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/network/008.cf b/tests/acceptance/01_vars/02_functions/network/008.cf index 72138e9a51..aec0b6fea6 100644 --- a/tests/acceptance/01_vars/02_functions/network/008.cf +++ b/tests/acceptance/01_vars/02_functions/network/008.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -63,4 +63,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/network/selectservers.cf b/tests/acceptance/01_vars/02_functions/network/selectservers.cf index 236b38e0a6..91367888d3 100644 --- a/tests/acceptance/01_vars/02_functions/network/selectservers.cf +++ b/tests/acceptance/01_vars/02_functions/network/selectservers.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -49,4 +49,3 @@ bundle agent check "retval: $(test.retval)"; "alive_servers: $(test.alive_servers[0]) $(test.alive_servers[1]) $(test.alive_servers[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 35f6535f98..dd8d1e5040 100644 --- a/tests/acceptance/01_vars/02_functions/network/url_get.cf +++ b/tests/acceptance/01_vars/02_functions/network/url_get.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/not.cf b/tests/acceptance/01_vars/02_functions/not.cf index e297d8ad85..aecbee6421 100644 --- a/tests/acceptance/01_vars/02_functions/not.cf +++ b/tests/acceptance/01_vars/02_functions/not.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/nth.cf b/tests/acceptance/01_vars/02_functions/nth.cf index a58fe3e31f..79e26c932d 100644 --- a/tests/acceptance/01_vars/02_functions/nth.cf +++ b/tests/acceptance/01_vars/02_functions/nth.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/nth_datacontainer.cf b/tests/acceptance/01_vars/02_functions/nth_datacontainer.cf index cdcc1fe67a..1d2c4c5f54 100644 --- a/tests/acceptance/01_vars/02_functions/nth_datacontainer.cf +++ b/tests/acceptance/01_vars/02_functions/nth_datacontainer.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/on.cf b/tests/acceptance/01_vars/02_functions/on.cf index 4bf10d90b1..f491592de2 100644 --- a/tests/acceptance/01_vars/02_functions/on.cf +++ b/tests/acceptance/01_vars/02_functions/on.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -34,4 +34,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/or.cf b/tests/acceptance/01_vars/02_functions/or.cf index 953ca1f485..2c50f4a291 100644 --- a/tests/acceptance/01_vars/02_functions/or.cf +++ b/tests/acceptance/01_vars/02_functions/or.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/packagesmatching.cf b/tests/acceptance/01_vars/02_functions/packagesmatching.cf index 6071e68b76..773164b994 100644 --- a/tests/acceptance/01_vars/02_functions/packagesmatching.cf +++ b/tests/acceptance/01_vars/02_functions/packagesmatching.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/parsearray_maxlen.cf b/tests/acceptance/01_vars/02_functions/parsearray_maxlen.cf index 8932006583..aa9994dc8c 100644 --- a/tests/acceptance/01_vars/02_functions/parsearray_maxlen.cf +++ b/tests/acceptance/01_vars/02_functions/parsearray_maxlen.cf @@ -1,7 +1,7 @@ # Test the parse\w+array(idx)? functions honour their maxlen parameter. body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/02_functions/parsestringarray_dontread_comment_duplicate_lastline2.cf b/tests/acceptance/01_vars/02_functions/parsestringarray_dontread_comment_duplicate_lastline2.cf index 3bdae7409d..9beb8f8a29 100644 --- a/tests/acceptance/01_vars/02_functions/parsestringarray_dontread_comment_duplicate_lastline2.cf +++ b/tests/acceptance/01_vars/02_functions/parsestringarray_dontread_comment_duplicate_lastline2.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/parsestringarray_weird_indices_real_comments_noemptyfields2.cf b/tests/acceptance/01_vars/02_functions/parsestringarray_weird_indices_real_comments_noemptyfields2.cf index 601c735b1b..8a30d7de7d 100644 --- a/tests/acceptance/01_vars/02_functions/parsestringarray_weird_indices_real_comments_noemptyfields2.cf +++ b/tests/acceptance/01_vars/02_functions/parsestringarray_weird_indices_real_comments_noemptyfields2.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/parseyaml_with_unquoted_values_starting_with_digits.cf b/tests/acceptance/01_vars/02_functions/parseyaml_with_unquoted_values_starting_with_digits.cf index 799822e041..8c352e0c3b 100644 --- a/tests/acceptance/01_vars/02_functions/parseyaml_with_unquoted_values_starting_with_digits.cf +++ b/tests/acceptance/01_vars/02_functions/parseyaml_with_unquoted_values_starting_with_digits.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/02_functions/peers.cf b/tests/acceptance/01_vars/02_functions/peers.cf index 9f40a56f7c..5a8cf7a377 100644 --- a/tests/acceptance/01_vars/02_functions/peers.cf +++ b/tests/acceptance/01_vars/02_functions/peers.cf @@ -13,7 +13,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/randomint.cf b/tests/acceptance/01_vars/02_functions/randomint.cf index d31a413b6d..9e5d5fa2de 100644 --- a/tests/acceptance/01_vars/02_functions/randomint.cf +++ b/tests/acceptance/01_vars/02_functions/randomint.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/read-file-endless-loop.cf b/tests/acceptance/01_vars/02_functions/read-file-endless-loop.cf index bcb8c86212..fd7967eefd 100644 --- a/tests/acceptance/01_vars/02_functions/read-file-endless-loop.cf +++ b/tests/acceptance/01_vars/02_functions/read-file-endless-loop.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/02_functions/read_empty_file.cf b/tests/acceptance/01_vars/02_functions/read_empty_file.cf index 97a1d6d621..13e439e1a8 100644 --- a/tests/acceptance/01_vars/02_functions/read_empty_file.cf +++ b/tests/acceptance/01_vars/02_functions/read_empty_file.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/read_long_file.cf b/tests/acceptance/01_vars/02_functions/read_long_file.cf index 3004032dee..157c7e0d7c 100644 --- a/tests/acceptance/01_vars/02_functions/read_long_file.cf +++ b/tests/acceptance/01_vars/02_functions/read_long_file.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/read_sys_file.cf b/tests/acceptance/01_vars/02_functions/read_sys_file.cf index 3763be585c..bbab52d44e 100644 --- a/tests/acceptance/01_vars/02_functions/read_sys_file.cf +++ b/tests/acceptance/01_vars/02_functions/read_sys_file.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/readcsv.cf b/tests/acceptance/01_vars/02_functions/readcsv.cf index a62d79b68a..54751df2a9 100644 --- a/tests/acceptance/01_vars/02_functions/readcsv.cf +++ b/tests/acceptance/01_vars/02_functions/readcsv.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -17,7 +17,7 @@ bundle agent test bundle agent check { vars: - "expected" string => '[["emptydata","99","xyz","/default/default/methods/\'any\'[0]","p","[]","[]","default","ny","default.cf.sub"],["emptydata","99","def","/default/default/methods/\'any\'/default/test_run/methods/\'any\'[0]","q","[]","[]","default","ny","default.cf.sub"],["emptydata","99","abc","/default/default/methods/\'any\'/default/test_run/methods/\'any\'[0]","r","[]","[]","default","ny","default.cf.sub"],["emptydata","99","pqr","/default/default/methods/\'any\'/default/test_run/methods/\'any\'[0]","s","[]","[]","default","ny","default.cf.sub"],["emptydata","110","???","[\\"Proposed executable file \'/TEST.cfengine.willfail\' doesn\'t exist\\",\\"\'/TEST.cfengine.willfail\' promises to be executable but isn\'t\\"]","default"]]'; + "expected" string => '[["emptydata","99","xyz","/default/default/methods/\'any\'[0]","p","[]","[]","default","ny","default.sub.cf"],["emptydata","99","def","/default/default/methods/\'any\'/default/test_run/methods/\'any\'[0]","q","[]","[]","default","ny","default.sub.cf"],["emptydata","99","abc","/default/default/methods/\'any\'/default/test_run/methods/\'any\'[0]","r","[]","[]","default","ny","default.sub.cf"],["emptydata","99","pqr","/default/default/methods/\'any\'/default/test_run/methods/\'any\'[0]","s","[]","[]","default","ny","default.sub.cf"],["emptydata","110","???","[\\"Proposed executable file \'/TEST.cfengine.willfail\' doesn\'t exist\\",\\"\'/TEST.cfengine.willfail\' promises to be executable but isn\'t\\"]","default"]]'; methods: "check" usebundle => dcs_check_strcmp("$(test.cs)", diff --git a/tests/acceptance/01_vars/02_functions/readcsv.cf.csv b/tests/acceptance/01_vars/02_functions/readcsv.cf.csv index 0f3f391176..ac38870576 100644 --- a/tests/acceptance/01_vars/02_functions/readcsv.cf.csv +++ b/tests/acceptance/01_vars/02_functions/readcsv.cf.csv @@ -1,5 +1,5 @@ -emptydata,99,xyz,/default/default/methods/'any'[0],p,[],[],default,ny,default.cf.sub -emptydata,99,def,/default/default/methods/'any'/default/test_run/methods/'any'[0],q,[],[],default,ny,default.cf.sub -emptydata,99,abc,/default/default/methods/'any'/default/test_run/methods/'any'[0],r,[],[],default,ny,default.cf.sub -emptydata,99,pqr,/default/default/methods/'any'/default/test_run/methods/'any'[0],s,[],[],default,ny,default.cf.sub +emptydata,99,xyz,/default/default/methods/'any'[0],p,[],[],default,ny,default.sub.cf +emptydata,99,def,/default/default/methods/'any'/default/test_run/methods/'any'[0],q,[],[],default,ny,default.sub.cf +emptydata,99,abc,/default/default/methods/'any'/default/test_run/methods/'any'[0],r,[],[],default,ny,default.sub.cf +emptydata,99,pqr,/default/default/methods/'any'/default/test_run/methods/'any'[0],s,[],[],default,ny,default.sub.cf emptydata,110,???,"[""Proposed executable file '/TEST.cfengine.willfail' doesn't exist"",""'/TEST.cfengine.willfail' promises to be executable but isn't""]",default diff --git a/tests/acceptance/01_vars/02_functions/readdata.cf b/tests/acceptance/01_vars/02_functions/readdata.cf index 0485a19ea7..113f2d2a5d 100644 --- a/tests/acceptance/01_vars/02_functions/readdata.cf +++ b/tests/acceptance/01_vars/02_functions/readdata.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/readdata_yaml.cf b/tests/acceptance/01_vars/02_functions/readdata_yaml.cf index 25c1e5df00..eb13c850ec 100644 --- a/tests/acceptance/01_vars/02_functions/readdata_yaml.cf +++ b/tests/acceptance/01_vars/02_functions/readdata_yaml.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/readfile.cf b/tests/acceptance/01_vars/02_functions/readfile.cf index c8b2c086de..648c315c1e 100644 --- a/tests/acceptance/01_vars/02_functions/readfile.cf +++ b/tests/acceptance/01_vars/02_functions/readfile.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/readfile_absent_does_not_error_in_pre_eval.cf b/tests/acceptance/01_vars/02_functions/readfile_absent_does_not_error_in_pre_eval.cf index c3780e5894..df4081fea6 100644 --- a/tests/acceptance/01_vars/02_functions/readfile_absent_does_not_error_in_pre_eval.cf +++ b/tests/acceptance/01_vars/02_functions/readfile_absent_does_not_error_in_pre_eval.cf @@ -3,12 +3,12 @@ body common control # If you want to see this work on 3.6.x comment out # inputs and bundlesequence, and inline the following - # bundles from dcs.cf.sub + # bundles from dcs.sub.cf # - dcs_passif_output # - dcs_passif_expected # - dcs_passif - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; # bundlesequence => { "test", "check" }; version => "1.0"; @@ -36,4 +36,3 @@ bundle agent check "$(sys.cf_agent) -Kf $(this.promise_filename).sub", $(this.promise_filename)); } - diff --git a/tests/acceptance/01_vars/02_functions/readstringarray_dontread_comment_duplicatekey_lastline.cf b/tests/acceptance/01_vars/02_functions/readstringarray_dontread_comment_duplicatekey_lastline.cf index 724e06e182..9b37fc2d3b 100644 --- a/tests/acceptance/01_vars/02_functions/readstringarray_dontread_comment_duplicatekey_lastline.cf +++ b/tests/acceptance/01_vars/02_functions/readstringarray_dontread_comment_duplicatekey_lastline.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/readstringarrayidx.cf b/tests/acceptance/01_vars/02_functions/readstringarrayidx.cf index 1073441beb..04d3221b42 100644 --- a/tests/acceptance/01_vars/02_functions/readstringarrayidx.cf +++ b/tests/acceptance/01_vars/02_functions/readstringarrayidx.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/readstringarrayidx_order.cf b/tests/acceptance/01_vars/02_functions/readstringarrayidx_order.cf index 4acc70cfda..36ddda66a6 100644 --- a/tests/acceptance/01_vars/02_functions/readstringarrayidx_order.cf +++ b/tests/acceptance/01_vars/02_functions/readstringarrayidx_order.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/readstringlist-many-comments.cf b/tests/acceptance/01_vars/02_functions/readstringlist-many-comments.cf index 5533a3d044..49d5c4f770 100755 --- a/tests/acceptance/01_vars/02_functions/readstringlist-many-comments.cf +++ b/tests/acceptance/01_vars/02_functions/readstringlist-many-comments.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/readtcp_connection_fail.cf b/tests/acceptance/01_vars/02_functions/readtcp_connection_fail.cf index b2feaf430b..922edf990e 100644 --- a/tests/acceptance/01_vars/02_functions/readtcp_connection_fail.cf +++ b/tests/acceptance/01_vars/02_functions/readtcp_connection_fail.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -35,4 +35,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/regarray.cf b/tests/acceptance/01_vars/02_functions/regarray.cf index ef09add86d..66d1876026 100644 --- a/tests/acceptance/01_vars/02_functions/regarray.cf +++ b/tests/acceptance/01_vars/02_functions/regarray.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/regex_replace.cf b/tests/acceptance/01_vars/02_functions/regex_replace.cf index aacfc4bd7d..3329524064 100644 --- a/tests/acceptance/01_vars/02_functions/regex_replace.cf +++ b/tests/acceptance/01_vars/02_functions/regex_replace.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/regextract.cf b/tests/acceptance/01_vars/02_functions/regextract.cf index c69fc07a99..d8e331a882 100644 --- a/tests/acceptance/01_vars/02_functions/regextract.cf +++ b/tests/acceptance/01_vars/02_functions/regextract.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/regextract2.cf b/tests/acceptance/01_vars/02_functions/regextract2.cf index 347f13b808..74abc414a2 100644 --- a/tests/acceptance/01_vars/02_functions/regextract2.cf +++ b/tests/acceptance/01_vars/02_functions/regextract2.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/regline.cf b/tests/acceptance/01_vars/02_functions/regline.cf index 0130edc0a6..b9728ffd1f 100644 --- a/tests/acceptance/01_vars/02_functions/regline.cf +++ b/tests/acceptance/01_vars/02_functions/regline.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/reverse.cf b/tests/acceptance/01_vars/02_functions/reverse.cf index 88fb5fe040..c96fece0da 100644 --- a/tests/acceptance/01_vars/02_functions/reverse.cf +++ b/tests/acceptance/01_vars/02_functions/reverse.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } 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 815ac9e40d..50036fc8aa 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 @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/shuffle-exact.cf b/tests/acceptance/01_vars/02_functions/shuffle-exact.cf index bc54c104f2..40099bf002 100644 --- a/tests/acceptance/01_vars/02_functions/shuffle-exact.cf +++ b/tests/acceptance/01_vars/02_functions/shuffle-exact.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/shuffle.cf b/tests/acceptance/01_vars/02_functions/shuffle.cf index 2cb24ee19e..254b2bc5f3 100644 --- a/tests/acceptance/01_vars/02_functions/shuffle.cf +++ b/tests/acceptance/01_vars/02_functions/shuffle.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/sort.cf b/tests/acceptance/01_vars/02_functions/sort.cf index ae10bb3c4b..5158a244d4 100644 --- a/tests/acceptance/01_vars/02_functions/sort.cf +++ b/tests/acceptance/01_vars/02_functions/sort.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/split.cf b/tests/acceptance/01_vars/02_functions/split.cf index 2871bbd3be..0cd3bc68aa 100644 --- a/tests/acceptance/01_vars/02_functions/split.cf +++ b/tests/acceptance/01_vars/02_functions/split.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/accumulated.cf b/tests/acceptance/01_vars/02_functions/staging/accumulated.cf index 03e7b7e437..0226bfbab2 100644 --- a/tests/acceptance/01_vars/02_functions/staging/accumulated.cf +++ b/tests/acceptance/01_vars/02_functions/staging/accumulated.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -46,4 +46,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/staging/accumulated2.cf b/tests/acceptance/01_vars/02_functions/staging/accumulated2.cf index ca070113cf..307af546a7 100644 --- a/tests/acceptance/01_vars/02_functions/staging/accumulated2.cf +++ b/tests/acceptance/01_vars/02_functions/staging/accumulated2.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -46,4 +46,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/02_functions/staging/bundlesmatching_dynamicbundlesequence.cf b/tests/acceptance/01_vars/02_functions/staging/bundlesmatching_dynamicbundlesequence.cf index e963b0cb56..db12236831 100644 --- a/tests/acceptance/01_vars/02_functions/staging/bundlesmatching_dynamicbundlesequence.cf +++ b/tests/acceptance/01_vars/02_functions/staging/bundlesmatching_dynamicbundlesequence.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)"), @(init.runs) }; } diff --git a/tests/acceptance/01_vars/02_functions/staging/datatype.cf b/tests/acceptance/01_vars/02_functions/staging/datatype.cf index 782d8dfaec..e2a663eda6 100644 --- a/tests/acceptance/01_vars/02_functions/staging/datatype.cf +++ b/tests/acceptance/01_vars/02_functions/staging/datatype.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -267,4 +267,3 @@ bundle agent check "$(G.testfile).expected", "$(this.promise_filename)"); } - diff --git a/tests/acceptance/01_vars/02_functions/staging/execresult_large.cf b/tests/acceptance/01_vars/02_functions/staging/execresult_large.cf index 63bc73ebf4..500870524e 100644 --- a/tests/acceptance/01_vars/02_functions/staging/execresult_large.cf +++ b/tests/acceptance/01_vars/02_functions/staging/execresult_large.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/format_empty_lists.cf b/tests/acceptance/01_vars/02_functions/staging/format_empty_lists.cf index 0e5e1b37de..2daa877f5d 100644 --- a/tests/acceptance/01_vars/02_functions/staging/format_empty_lists.cf +++ b/tests/acceptance/01_vars/02_functions/staging/format_empty_lists.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/functions_and_nulls.cf b/tests/acceptance/01_vars/02_functions/staging/functions_and_nulls.cf index b75c6d4c88..18d12f78f2 100644 --- a/tests/acceptance/01_vars/02_functions/staging/functions_and_nulls.cf +++ b/tests/acceptance/01_vars/02_functions/staging/functions_and_nulls.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/getindices_size5_namespaces.cf b/tests/acceptance/01_vars/02_functions/staging/getindices_size5_namespaces.cf index f0210f0f4a..74b3f1da09 100644 --- a/tests/acceptance/01_vars/02_functions/staging/getindices_size5_namespaces.cf +++ b/tests/acceptance/01_vars/02_functions/staging/getindices_size5_namespaces.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../../default.cf.sub", "206-namespaced.cf.sub" }; + inputs => { "../../../default.sub.cf", "206-namespaced.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/getvalues_size2.cf b/tests/acceptance/01_vars/02_functions/staging/getvalues_size2.cf index e3ec892983..07e2b11499 100644 --- a/tests/acceptance/01_vars/02_functions/staging/getvalues_size2.cf +++ b/tests/acceptance/01_vars/02_functions/staging/getvalues_size2.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/getvalues_size2_with_expansion.cf b/tests/acceptance/01_vars/02_functions/staging/getvalues_size2_with_expansion.cf index 7b8730f8c4..2ac26bcf98 100644 --- a/tests/acceptance/01_vars/02_functions/staging/getvalues_size2_with_expansion.cf +++ b/tests/acceptance/01_vars/02_functions/staging/getvalues_size2_with_expansion.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/getvalues_size5.cf b/tests/acceptance/01_vars/02_functions/staging/getvalues_size5.cf index d8ea13c633..dd25ff47bb 100644 --- a/tests/acceptance/01_vars/02_functions/staging/getvalues_size5.cf +++ b/tests/acceptance/01_vars/02_functions/staging/getvalues_size5.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/getvalues_size5_with_duplicate_triplicate.cf b/tests/acceptance/01_vars/02_functions/staging/getvalues_size5_with_duplicate_triplicate.cf index 11da0049cd..e0047dc868 100644 --- a/tests/acceptance/01_vars/02_functions/staging/getvalues_size5_with_duplicate_triplicate.cf +++ b/tests/acceptance/01_vars/02_functions/staging/getvalues_size5_with_duplicate_triplicate.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/host2ip.cf b/tests/acceptance/01_vars/02_functions/staging/host2ip.cf index 18e03245d9..183a6c478c 100644 --- a/tests/acceptance/01_vars/02_functions/staging/host2ip.cf +++ b/tests/acceptance/01_vars/02_functions/staging/host2ip.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parserealarray_duplicate_key.cf b/tests/acceptance/01_vars/02_functions/staging/parserealarray_duplicate_key.cf index 96a5f23e77..ddb1931018 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parserealarray_duplicate_key.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parserealarray_duplicate_key.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_change_separator_to_s.cf b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_change_separator_to_s.cf index 1161c99dcc..3f451d8745 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_change_separator_to_s.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_change_separator_to_s.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_dontread_comment_duplicate_lastline.cf b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_dontread_comment_duplicate_lastline.cf index 059f157e53..4338f97387 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_dontread_comment_duplicate_lastline.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_dontread_comment_duplicate_lastline.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_dontread_comment_duplicate_lastline3.cf b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_dontread_comment_duplicate_lastline3.cf index b5c2cc2ef1..ca64d6075c 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_dontread_comment_duplicate_lastline3.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_dontread_comment_duplicate_lastline3.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_introduce_duplicate_key.cf b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_introduce_duplicate_key.cf index bbc1aa408e..23ef513a92 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_introduce_duplicate_key.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_introduce_duplicate_key.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_introduce_nonparsed_comment.cf b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_introduce_nonparsed_comment.cf index 9e945e423f..52efa28504 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_introduce_nonparsed_comment.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_introduce_nonparsed_comment.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "g", default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_change_comment_parsing.cf b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_change_comment_parsing.cf index fced203b69..5f2cb78dd8 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_change_comment_parsing.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_change_comment_parsing.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_change_comment_parsing2.cf b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_change_comment_parsing2.cf index 2e0b2892c2..fbafc98052 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_change_comment_parsing2.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_change_comment_parsing2.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_duplicates_trailing_newlines.cf b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_duplicates_trailing_newlines.cf index 5e98697316..d0c7d12dbe 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_duplicates_trailing_newlines.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_duplicates_trailing_newlines.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_duplicates_trailing_newlines2.cf b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_duplicates_trailing_newlines2.cf index 431879e648..ea5702a600 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_duplicates_trailing_newlines2.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_duplicates_trailing_newlines2.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments.cf b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments.cf index 32343af143..8e0bc6520b 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments2.cf b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments2.cf index 99694c8dd6..d4870274cc 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments2.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments2.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments3.cf b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments3.cf index ea627e5e2d..c53b101b08 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments3.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments3.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments_noemptyfields.cf b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments_noemptyfields.cf index 3f57afa06c..38d7acb822 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments_noemptyfields.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments_noemptyfields.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments_noemptyfields3.cf b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments_noemptyfields3.cf index 81524a49c1..997fbdbda5 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments_noemptyfields3.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments_noemptyfields3.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments_noemptyfields4.cf b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments_noemptyfields4.cf index fd27791836..7e456b288f 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments_noemptyfields4.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_real_comments_noemptyfields4.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_with_duplicate.cf b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_with_duplicate.cf index d227b74410..669d077540 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_with_duplicate.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parsestringarray_weird_indices_with_duplicate.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parsestringarrayidx_change_separator_to_s.cf b/tests/acceptance/01_vars/02_functions/staging/parsestringarrayidx_change_separator_to_s.cf index 01d2a8e4bb..f345cbae2f 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parsestringarrayidx_change_separator_to_s.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parsestringarrayidx_change_separator_to_s.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parsestringarrayidx_duplicate_key.cf b/tests/acceptance/01_vars/02_functions/staging/parsestringarrayidx_duplicate_key.cf index 49e0864f70..59fa0efe18 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parsestringarrayidx_duplicate_key.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parsestringarrayidx_duplicate_key.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parsestringarrayidx_nonparsed_comment.cf b/tests/acceptance/01_vars/02_functions/staging/parsestringarrayidx_nonparsed_comment.cf index cd931ed7bb..6d959b9c8b 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parsestringarrayidx_nonparsed_comment.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parsestringarrayidx_nonparsed_comment.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "g", default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parsestringarrayidx_weird_indices_duplicate.cf b/tests/acceptance/01_vars/02_functions/staging/parsestringarrayidx_weird_indices_duplicate.cf index 8a31d49a46..495974bc22 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parsestringarrayidx_weird_indices_duplicate.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parsestringarrayidx_weird_indices_duplicate.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parsestringarrayidx_weird_indices_real_comments_noemptyfields.cf b/tests/acceptance/01_vars/02_functions/staging/parsestringarrayidx_weird_indices_real_comments_noemptyfields.cf index d47c0e52a6..04514f7774 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parsestringarrayidx_weird_indices_real_comments_noemptyfields.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parsestringarrayidx_weird_indices_real_comments_noemptyfields.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parsestringarrayinx_simple.cf b/tests/acceptance/01_vars/02_functions/staging/parsestringarrayinx_simple.cf index 20178a2172..12c00a3ae8 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parsestringarrayinx_simple.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parsestringarrayinx_simple.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/parsestringarrayinx_singleton_nootherfields.cf b/tests/acceptance/01_vars/02_functions/staging/parsestringarrayinx_singleton_nootherfields.cf index a37daa5127..c0ebae1531 100644 --- a/tests/acceptance/01_vars/02_functions/staging/parsestringarrayinx_singleton_nootherfields.cf +++ b/tests/acceptance/01_vars/02_functions/staging/parsestringarrayinx_singleton_nootherfields.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/readintarray_duplicate_key.cf b/tests/acceptance/01_vars/02_functions/staging/readintarray_duplicate_key.cf index 56fd6e5eb0..090e3e5827 100644 --- a/tests/acceptance/01_vars/02_functions/staging/readintarray_duplicate_key.cf +++ b/tests/acceptance/01_vars/02_functions/staging/readintarray_duplicate_key.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/readintarray_non_integers.cf b/tests/acceptance/01_vars/02_functions/staging/readintarray_non_integers.cf index 5f51605978..22db6caf15 100644 --- a/tests/acceptance/01_vars/02_functions/staging/readintarray_non_integers.cf +++ b/tests/acceptance/01_vars/02_functions/staging/readintarray_non_integers.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/readintarray_non_integers2.cf b/tests/acceptance/01_vars/02_functions/staging/readintarray_non_integers2.cf index b3b7365aa8..5741f3528b 100644 --- a/tests/acceptance/01_vars/02_functions/staging/readintarray_non_integers2.cf +++ b/tests/acceptance/01_vars/02_functions/staging/readintarray_non_integers2.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/readintarray_non_integers3.cf b/tests/acceptance/01_vars/02_functions/staging/readintarray_non_integers3.cf index f088d78d62..dc41c52fb0 100644 --- a/tests/acceptance/01_vars/02_functions/staging/readintarray_non_integers3.cf +++ b/tests/acceptance/01_vars/02_functions/staging/readintarray_non_integers3.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/readintlist.cf b/tests/acceptance/01_vars/02_functions/staging/readintlist.cf index cd83f00be0..3042d93a60 100644 --- a/tests/acceptance/01_vars/02_functions/staging/readintlist.cf +++ b/tests/acceptance/01_vars/02_functions/staging/readintlist.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/readintlist2.cf b/tests/acceptance/01_vars/02_functions/staging/readintlist2.cf index 52905f472a..da4ba4ae81 100644 --- a/tests/acceptance/01_vars/02_functions/staging/readintlist2.cf +++ b/tests/acceptance/01_vars/02_functions/staging/readintlist2.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/readrealarray_duplicate_key.cf b/tests/acceptance/01_vars/02_functions/staging/readrealarray_duplicate_key.cf index 825f6ffcce..735598e10e 100644 --- a/tests/acceptance/01_vars/02_functions/staging/readrealarray_duplicate_key.cf +++ b/tests/acceptance/01_vars/02_functions/staging/readrealarray_duplicate_key.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/readrealarray_non_integers.cf b/tests/acceptance/01_vars/02_functions/staging/readrealarray_non_integers.cf index e3e33be47a..f43ef214e1 100644 --- a/tests/acceptance/01_vars/02_functions/staging/readrealarray_non_integers.cf +++ b/tests/acceptance/01_vars/02_functions/staging/readrealarray_non_integers.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/readrealarray_non_integers2.cf b/tests/acceptance/01_vars/02_functions/staging/readrealarray_non_integers2.cf index 67b6bddd62..0ef64204bb 100644 --- a/tests/acceptance/01_vars/02_functions/staging/readrealarray_non_integers2.cf +++ b/tests/acceptance/01_vars/02_functions/staging/readrealarray_non_integers2.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/readreallist.cf b/tests/acceptance/01_vars/02_functions/staging/readreallist.cf index 1275320aff..a593f9d1d1 100644 --- a/tests/acceptance/01_vars/02_functions/staging/readreallist.cf +++ b/tests/acceptance/01_vars/02_functions/staging/readreallist.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/readreallist2.cf b/tests/acceptance/01_vars/02_functions/staging/readreallist2.cf index 7fa2986a4b..b152591f79 100644 --- a/tests/acceptance/01_vars/02_functions/staging/readreallist2.cf +++ b/tests/acceptance/01_vars/02_functions/staging/readreallist2.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/readstringarray_change_separator_to_s.cf b/tests/acceptance/01_vars/02_functions/staging/readstringarray_change_separator_to_s.cf index 1428d57cf0..35db96d5e3 100644 --- a/tests/acceptance/01_vars/02_functions/staging/readstringarray_change_separator_to_s.cf +++ b/tests/acceptance/01_vars/02_functions/staging/readstringarray_change_separator_to_s.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/readstringarray_introduce_duplicate.cf b/tests/acceptance/01_vars/02_functions/staging/readstringarray_introduce_duplicate.cf index a03fffcb14..d4d7e6fc01 100644 --- a/tests/acceptance/01_vars/02_functions/staging/readstringarray_introduce_duplicate.cf +++ b/tests/acceptance/01_vars/02_functions/staging/readstringarray_introduce_duplicate.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/readstringarray_introduce_nonparsed_comment.cf b/tests/acceptance/01_vars/02_functions/staging/readstringarray_introduce_nonparsed_comment.cf index 1f82c29551..70f20decea 100644 --- a/tests/acceptance/01_vars/02_functions/staging/readstringarray_introduce_nonparsed_comment.cf +++ b/tests/acceptance/01_vars/02_functions/staging/readstringarray_introduce_nonparsed_comment.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "g", default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/readstringarray_weird_indices.cf b/tests/acceptance/01_vars/02_functions/staging/readstringarray_weird_indices.cf index 44ca873498..325053a707 100644 --- a/tests/acceptance/01_vars/02_functions/staging/readstringarray_weird_indices.cf +++ b/tests/acceptance/01_vars/02_functions/staging/readstringarray_weird_indices.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/readstringarray_weird_indices_change_comment_parsing.cf b/tests/acceptance/01_vars/02_functions/staging/readstringarray_weird_indices_change_comment_parsing.cf index bc84e52a96..d5bd76980a 100644 --- a/tests/acceptance/01_vars/02_functions/staging/readstringarray_weird_indices_change_comment_parsing.cf +++ b/tests/acceptance/01_vars/02_functions/staging/readstringarray_weird_indices_change_comment_parsing.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/readstringarray_weird_indices_real_comments.cf b/tests/acceptance/01_vars/02_functions/staging/readstringarray_weird_indices_real_comments.cf index c63af1e92d..9be0baf3e0 100644 --- a/tests/acceptance/01_vars/02_functions/staging/readstringarray_weird_indices_real_comments.cf +++ b/tests/acceptance/01_vars/02_functions/staging/readstringarray_weird_indices_real_comments.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/readstringarray_weird_indices_real_comments_noemptyfields.cf b/tests/acceptance/01_vars/02_functions/staging/readstringarray_weird_indices_real_comments_noemptyfields.cf index e913d39964..9f6809a86d 100644 --- a/tests/acceptance/01_vars/02_functions/staging/readstringarray_weird_indices_real_comments_noemptyfields.cf +++ b/tests/acceptance/01_vars/02_functions/staging/readstringarray_weird_indices_real_comments_noemptyfields.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/readstringarray_weird_indices_trailing_newlines.cf b/tests/acceptance/01_vars/02_functions/staging/readstringarray_weird_indices_trailing_newlines.cf index fd471656eb..25491b1665 100644 --- a/tests/acceptance/01_vars/02_functions/staging/readstringarray_weird_indices_trailing_newlines.cf +++ b/tests/acceptance/01_vars/02_functions/staging/readstringarray_weird_indices_trailing_newlines.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/readstringarrayidx_change_separator_to_s.cf b/tests/acceptance/01_vars/02_functions/staging/readstringarrayidx_change_separator_to_s.cf index a8ba98be31..2da6c1a4a7 100644 --- a/tests/acceptance/01_vars/02_functions/staging/readstringarrayidx_change_separator_to_s.cf +++ b/tests/acceptance/01_vars/02_functions/staging/readstringarrayidx_change_separator_to_s.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/readstringlist.cf b/tests/acceptance/01_vars/02_functions/staging/readstringlist.cf index 50d291c2fe..2fdc59dcf3 100644 --- a/tests/acceptance/01_vars/02_functions/staging/readstringlist.cf +++ b/tests/acceptance/01_vars/02_functions/staging/readstringlist.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/staging/readstringlist2.cf b/tests/acceptance/01_vars/02_functions/staging/readstringlist2.cf index afc1f17d1f..390ddb8aea 100644 --- a/tests/acceptance/01_vars/02_functions/staging/readstringlist2.cf +++ b/tests/acceptance/01_vars/02_functions/staging/readstringlist2.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/storejson.cf b/tests/acceptance/01_vars/02_functions/storejson.cf index 70375aee4d..913a566822 100644 --- a/tests/acceptance/01_vars/02_functions/storejson.cf +++ b/tests/acceptance/01_vars/02_functions/storejson.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } 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 ef12c462b0..ca3acdb701 100644 --- a/tests/acceptance/01_vars/02_functions/storejson_edge_case.cf +++ b/tests/acceptance/01_vars/02_functions/storejson_edge_case.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/strftime.cf b/tests/acceptance/01_vars/02_functions/strftime.cf index 0beb211a2e..1d7c61a0df 100644 --- a/tests/acceptance/01_vars/02_functions/strftime.cf +++ b/tests/acceptance/01_vars/02_functions/strftime.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/strftime_GMT.cf b/tests/acceptance/01_vars/02_functions/strftime_GMT.cf index a218afbcdc..0369b19d56 100644 --- a/tests/acceptance/01_vars/02_functions/strftime_GMT.cf +++ b/tests/acceptance/01_vars/02_functions/strftime_GMT.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/string.cf b/tests/acceptance/01_vars/02_functions/string.cf index e7df0853b7..bbbbd61c8e 100644 --- a/tests/acceptance/01_vars/02_functions/string.cf +++ b/tests/acceptance/01_vars/02_functions/string.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default( "$(this.promise_filename)" ) }; } diff --git a/tests/acceptance/01_vars/02_functions/string_mustache.cf b/tests/acceptance/01_vars/02_functions/string_mustache.cf index 0ac07f76a5..e52c6dbff0 100644 --- a/tests/acceptance/01_vars/02_functions/string_mustache.cf +++ b/tests/acceptance/01_vars/02_functions/string_mustache.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/string_replace.cf b/tests/acceptance/01_vars/02_functions/string_replace.cf index c3caf164ca..03b7009bcf 100644 --- a/tests/acceptance/01_vars/02_functions/string_replace.cf +++ b/tests/acceptance/01_vars/02_functions/string_replace.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/string_trim.cf b/tests/acceptance/01_vars/02_functions/string_trim.cf index 13b46a3a2d..4cd4e3c4a0 100644 --- a/tests/acceptance/01_vars/02_functions/string_trim.cf +++ b/tests/acceptance/01_vars/02_functions/string_trim.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/sublist.cf b/tests/acceptance/01_vars/02_functions/sublist.cf index af137477c7..e59a5fe6a8 100644 --- a/tests/acceptance/01_vars/02_functions/sublist.cf +++ b/tests/acceptance/01_vars/02_functions/sublist.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } 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 86ccbc32b4..62cbfe88bd 100644 --- a/tests/acceptance/01_vars/02_functions/sum_and_product.cf +++ b/tests/acceptance/01_vars/02_functions/sum_and_product.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/sysctl.cf b/tests/acceptance/01_vars/02_functions/sysctl.cf index dba5dda097..affe8aabaa 100644 --- a/tests/acceptance/01_vars/02_functions/sysctl.cf +++ b/tests/acceptance/01_vars/02_functions/sysctl.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/sysctl.cf.sub b/tests/acceptance/01_vars/02_functions/sysctl.cf.sub index 71cdccd0cb..7483e935fa 100644 --- a/tests/acceptance/01_vars/02_functions/sysctl.cf.sub +++ b/tests/acceptance/01_vars/02_functions/sysctl.cf.sub @@ -4,7 +4,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/text_xform.cf b/tests/acceptance/01_vars/02_functions/text_xform.cf index 191dfb166b..cabd791a5c 100644 --- a/tests/acceptance/01_vars/02_functions/text_xform.cf +++ b/tests/acceptance/01_vars/02_functions/text_xform.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/type.cf b/tests/acceptance/01_vars/02_functions/type.cf index 4326d3cfa1..a6eda3c969 100644 --- a/tests/acceptance/01_vars/02_functions/type.cf +++ b/tests/acceptance/01_vars/02_functions/type.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/unsafe/findlocalusers_unsafe.cf b/tests/acceptance/01_vars/02_functions/unsafe/findlocalusers_unsafe.cf index 087e36f05c..2787114af3 100644 --- a/tests/acceptance/01_vars/02_functions/unsafe/findlocalusers_unsafe.cf +++ b/tests/acceptance/01_vars/02_functions/unsafe/findlocalusers_unsafe.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/url_get_local.cf b/tests/acceptance/01_vars/02_functions/url_get_local.cf index 907c00bffe..066b9e79d1 100644 --- a/tests/acceptance/01_vars/02_functions/url_get_local.cf +++ b/tests/acceptance/01_vars/02_functions/url_get_local.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/validdata.cf b/tests/acceptance/01_vars/02_functions/validdata.cf index 931ebe816b..e12fa0c631 100644 --- a/tests/acceptance/01_vars/02_functions/validdata.cf +++ b/tests/acceptance/01_vars/02_functions/validdata.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/validjson_strict.cf b/tests/acceptance/01_vars/02_functions/validjson_strict.cf index e63b7745ef..419729aca3 100644 --- a/tests/acceptance/01_vars/02_functions/validjson_strict.cf +++ b/tests/acceptance/01_vars/02_functions/validjson_strict.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { test, check }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/variable_references_from_function_that_never_succeeds.cf b/tests/acceptance/01_vars/02_functions/variable_references_from_function_that_never_succeeds.cf index dcf7f87fd6..6acdaac767 100644 --- a/tests/acceptance/01_vars/02_functions/variable_references_from_function_that_never_succeeds.cf +++ b/tests/acceptance/01_vars/02_functions/variable_references_from_function_that_never_succeeds.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/variablesmatching.cf b/tests/acceptance/01_vars/02_functions/variablesmatching.cf index 074513b4ab..4f6d3b5814 100644 --- a/tests/acceptance/01_vars/02_functions/variablesmatching.cf +++ b/tests/acceptance/01_vars/02_functions/variablesmatching.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/01_vars/02_functions/version_compare.cf b/tests/acceptance/01_vars/02_functions/version_compare.cf index d874a33765..1424b587f5 100644 --- a/tests/acceptance/01_vars/02_functions/version_compare.cf +++ b/tests/acceptance/01_vars/02_functions/version_compare.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } 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 5d1c24392e..07fab81aab 100644 --- a/tests/acceptance/01_vars/02_functions/wrap_container_fncalls.cf +++ b/tests/acceptance/01_vars/02_functions/wrap_container_fncalls.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/02_functions/wrap_invalid_container_fncalls.x.cf b/tests/acceptance/01_vars/02_functions/wrap_invalid_container_fncalls.x.cf index effbf6914c..3f031a2506 100644 --- a/tests/acceptance/01_vars/02_functions/wrap_invalid_container_fncalls.x.cf +++ b/tests/acceptance/01_vars/02_functions/wrap_invalid_container_fncalls.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/03_lists/001.cf b/tests/acceptance/01_vars/03_lists/001.cf index 845b5c10ba..c257e07c76 100644 --- a/tests/acceptance/01_vars/03_lists/001.cf +++ b/tests/acceptance/01_vars/03_lists/001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -107,4 +107,3 @@ body contain check_in_shell { useshell => "true"; } - diff --git a/tests/acceptance/01_vars/03_lists/002.cf b/tests/acceptance/01_vars/03_lists/002.cf index 2561009e71..97cb6c111f 100644 --- a/tests/acceptance/01_vars/03_lists/002.cf +++ b/tests/acceptance/01_vars/03_lists/002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -79,4 +79,3 @@ body contain check_in_shell { useshell => "true"; } - diff --git a/tests/acceptance/01_vars/03_lists/003.cf b/tests/acceptance/01_vars/03_lists/003.cf index 9e220069da..d2077a86d5 100644 --- a/tests/acceptance/01_vars/03_lists/003.cf +++ b/tests/acceptance/01_vars/03_lists/003.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -77,4 +77,3 @@ body contain check_in_shell { useshell => "true"; } - diff --git a/tests/acceptance/01_vars/03_lists/004.cf b/tests/acceptance/01_vars/03_lists/004.cf index bbe361040a..cb027a0ddf 100644 --- a/tests/acceptance/01_vars/03_lists/004.cf +++ b/tests/acceptance/01_vars/03_lists/004.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -85,4 +85,3 @@ body contain check_in_shell { useshell => "true"; } - diff --git a/tests/acceptance/01_vars/03_lists/005.cf b/tests/acceptance/01_vars/03_lists/005.cf index 775d5063b6..b5a3a657b4 100644 --- a/tests/acceptance/01_vars/03_lists/005.cf +++ b/tests/acceptance/01_vars/03_lists/005.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -88,4 +88,3 @@ body contain check_in_shell { useshell => "true"; } - diff --git a/tests/acceptance/01_vars/03_lists/006.cf b/tests/acceptance/01_vars/03_lists/006.cf index 2c6784a2e9..c11cd0ea43 100644 --- a/tests/acceptance/01_vars/03_lists/006.cf +++ b/tests/acceptance/01_vars/03_lists/006.cf @@ -5,7 +5,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -36,4 +36,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/01_vars/03_lists/007.cf b/tests/acceptance/01_vars/03_lists/007.cf index a6c00ee3bb..80be1b27e0 100644 --- a/tests/acceptance/01_vars/03_lists/007.cf +++ b/tests/acceptance/01_vars/03_lists/007.cf @@ -5,7 +5,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/03_lists/008.cf b/tests/acceptance/01_vars/03_lists/008.cf index da9f6fae6b..a1f0f3cfea 100644 --- a/tests/acceptance/01_vars/03_lists/008.cf +++ b/tests/acceptance/01_vars/03_lists/008.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -76,4 +76,3 @@ bundle agent check "$(G.testfile).expected", "$(this.promise_filename)"); } - diff --git a/tests/acceptance/01_vars/03_lists/009.cf b/tests/acceptance/01_vars/03_lists/009.cf index 93f7e3280e..0ef63d9591 100644 --- a/tests/acceptance/01_vars/03_lists/009.cf +++ b/tests/acceptance/01_vars/03_lists/009.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -76,4 +76,3 @@ bundle agent check "$(G.testfile).expected", "$(this.promise_filename)"); } - diff --git a/tests/acceptance/01_vars/03_lists/010.cf b/tests/acceptance/01_vars/03_lists/010.cf index a9ed24221f..63153e5f80 100644 --- a/tests/acceptance/01_vars/03_lists/010.cf +++ b/tests/acceptance/01_vars/03_lists/010.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -76,4 +76,3 @@ bundle agent check "$(G.testfile).expected", "$(this.promise_filename)"); } - diff --git a/tests/acceptance/01_vars/03_lists/011.cf b/tests/acceptance/01_vars/03_lists/011.cf index ee25c57443..53a44e2e7e 100644 --- a/tests/acceptance/01_vars/03_lists/011.cf +++ b/tests/acceptance/01_vars/03_lists/011.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -69,4 +69,3 @@ bundle agent check "$(G.testfile).expected", "$(this.promise_filename)"); } - diff --git a/tests/acceptance/01_vars/03_lists/012.cf b/tests/acceptance/01_vars/03_lists/012.cf index 07a2cebc43..31f93b30bf 100644 --- a/tests/acceptance/01_vars/03_lists/012.cf +++ b/tests/acceptance/01_vars/03_lists/012.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -85,4 +85,3 @@ body contain check_in_shell { useshell => "true"; } - diff --git a/tests/acceptance/01_vars/03_lists/013.cf b/tests/acceptance/01_vars/03_lists/013.cf index 6b56a53f26..bb93d5fcaf 100644 --- a/tests/acceptance/01_vars/03_lists/013.cf +++ b/tests/acceptance/01_vars/03_lists/013.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; nova_edition:: diff --git a/tests/acceptance/01_vars/03_lists/014.cf b/tests/acceptance/01_vars/03_lists/014.cf index 763fc2bd13..66e6217b81 100644 --- a/tests/acceptance/01_vars/03_lists/014.cf +++ b/tests/acceptance/01_vars/03_lists/014.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -81,4 +81,3 @@ body contain check_in_shell { useshell => "true"; } - diff --git a/tests/acceptance/01_vars/03_lists/015.cf b/tests/acceptance/01_vars/03_lists/015.cf index ad0bf08f7c..ce28fc30ac 100644 --- a/tests/acceptance/01_vars/03_lists/015.cf +++ b/tests/acceptance/01_vars/03_lists/015.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -75,4 +75,3 @@ body contain check_in_shell { useshell => "true"; } - diff --git a/tests/acceptance/01_vars/03_lists/016.cf b/tests/acceptance/01_vars/03_lists/016.cf index 239e68b81a..6c3e776126 100644 --- a/tests/acceptance/01_vars/03_lists/016.cf +++ b/tests/acceptance/01_vars/03_lists/016.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/03_lists/double_expand_remote_list.cf b/tests/acceptance/01_vars/03_lists/double_expand_remote_list.cf index 3832c5fc95..d78807717a 100644 --- a/tests/acceptance/01_vars/03_lists/double_expand_remote_list.cf +++ b/tests/acceptance/01_vars/03_lists/double_expand_remote_list.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/03_lists/interpolation_order.cf b/tests/acceptance/01_vars/03_lists/interpolation_order.cf index 785d5d1ce6..3c955f4ee3 100644 --- a/tests/acceptance/01_vars/03_lists/interpolation_order.cf +++ b/tests/acceptance/01_vars/03_lists/interpolation_order.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/03_lists/namespaced_list_including_list_expanded.cf b/tests/acceptance/01_vars/03_lists/namespaced_list_including_list_expanded.cf index 81d5b368ac..7519228d8a 100644 --- a/tests/acceptance/01_vars/03_lists/namespaced_list_including_list_expanded.cf +++ b/tests/acceptance/01_vars/03_lists/namespaced_list_including_list_expanded.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/03_lists/namespaces/passing_slists.cf b/tests/acceptance/01_vars/03_lists/namespaces/passing_slists.cf index a60e758edc..ef8fa7101f 100644 --- a/tests/acceptance/01_vars/03_lists/namespaces/passing_slists.cf +++ b/tests/acceptance/01_vars/03_lists/namespaces/passing_slists.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../../default.cf.sub", "passing_slists.cf.sub" }; + inputs => { "../../../default.sub.cf", "passing_slists.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/03_lists/namespaces/passing_slists2.cf b/tests/acceptance/01_vars/03_lists/namespaces/passing_slists2.cf index e41439d036..0af7dc4f01 100644 --- a/tests/acceptance/01_vars/03_lists/namespaces/passing_slists2.cf +++ b/tests/acceptance/01_vars/03_lists/namespaces/passing_slists2.cf @@ -5,7 +5,7 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/03_lists/namespaces/passing_slists3.cf b/tests/acceptance/01_vars/03_lists/namespaces/passing_slists3.cf index e355ebf9ab..976511e3f4 100644 --- a/tests/acceptance/01_vars/03_lists/namespaces/passing_slists3.cf +++ b/tests/acceptance/01_vars/03_lists/namespaces/passing_slists3.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/03_lists/nested_lists.cf b/tests/acceptance/01_vars/03_lists/nested_lists.cf index 44e397e349..980232cc45 100644 --- a/tests/acceptance/01_vars/03_lists/nested_lists.cf +++ b/tests/acceptance/01_vars/03_lists/nested_lists.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -123,4 +123,3 @@ body contain check_in_shell { useshell => "true"; } - diff --git a/tests/acceptance/01_vars/03_lists/usebundle_naked.cf b/tests/acceptance/01_vars/03_lists/usebundle_naked.cf index c8e71a7669..f27ebcd81d 100644 --- a/tests/acceptance/01_vars/03_lists/usebundle_naked.cf +++ b/tests/acceptance/01_vars/03_lists/usebundle_naked.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/canonical_json.cf b/tests/acceptance/01_vars/04_containers/canonical_json.cf index b186235722..cdb0451633 100644 --- a/tests/acceptance/01_vars/04_containers/canonical_json.cf +++ b/tests/acceptance/01_vars/04_containers/canonical_json.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/execresult_and_as_data.cf b/tests/acceptance/01_vars/04_containers/execresult_and_as_data.cf index 8404a26236..b2ed136f54 100644 --- a/tests/acceptance/01_vars/04_containers/execresult_and_as_data.cf +++ b/tests/acceptance/01_vars/04_containers/execresult_and_as_data.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/extraction.cf b/tests/acceptance/01_vars/04_containers/extraction.cf index 891c1b2573..76de98c3e2 100644 --- a/tests/acceptance/01_vars/04_containers/extraction.cf +++ b/tests/acceptance/01_vars/04_containers/extraction.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/inline_json.cf b/tests/acceptance/01_vars/04_containers/inline_json.cf index 40287b0188..3a25e3ec3a 100644 --- a/tests/acceptance/01_vars/04_containers/inline_json.cf +++ b/tests/acceptance/01_vars/04_containers/inline_json.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/inline_json_parse.cf b/tests/acceptance/01_vars/04_containers/inline_json_parse.cf index 8dd306336a..e8b59ca66b 100644 --- a/tests/acceptance/01_vars/04_containers/inline_json_parse.cf +++ b/tests/acceptance/01_vars/04_containers/inline_json_parse.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/inline_yaml.cf b/tests/acceptance/01_vars/04_containers/inline_yaml.cf index 7d518a5db3..e74bf97426 100644 --- a/tests/acceptance/01_vars/04_containers/inline_yaml.cf +++ b/tests/acceptance/01_vars/04_containers/inline_yaml.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } 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 dde9ecac55..de74a7ad95 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 @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -35,4 +35,3 @@ bundle agent check methods: "Check" usebundle => dcs_check_diff( $(G.testfile), "$(this.promise_filename).expected", $(this.promise_filename) ); } - 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 795bd02e1e..e228d9f2ac 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 @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/mergecontainer.cf b/tests/acceptance/01_vars/04_containers/mergecontainer.cf index fde02e2605..1dbe38d995 100644 --- a/tests/acceptance/01_vars/04_containers/mergecontainer.cf +++ b/tests/acceptance/01_vars/04_containers/mergecontainer.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/mergecontainer_arrays.cf b/tests/acceptance/01_vars/04_containers/mergecontainer_arrays.cf index 00f4382884..c263527efe 100644 --- a/tests/acceptance/01_vars/04_containers/mergecontainer_arrays.cf +++ b/tests/acceptance/01_vars/04_containers/mergecontainer_arrays.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/mergecontainer_conflict.cf b/tests/acceptance/01_vars/04_containers/mergecontainer_conflict.cf index d951260965..d559e54630 100644 --- a/tests/acceptance/01_vars/04_containers/mergecontainer_conflict.cf +++ b/tests/acceptance/01_vars/04_containers/mergecontainer_conflict.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/mergedata_with_unresolved_variables_does_not_define_datacontainer.cf b/tests/acceptance/01_vars/04_containers/mergedata_with_unresolved_variables_does_not_define_datacontainer.cf index a39627aff2..6291609f1b 100644 --- a/tests/acceptance/01_vars/04_containers/mergedata_with_unresolved_variables_does_not_define_datacontainer.cf +++ b/tests/acceptance/01_vars/04_containers/mergedata_with_unresolved_variables_does_not_define_datacontainer.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } 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 f910fa561f..0a0d44dd84 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 @@ -21,7 +21,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } 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 b60b96afbb..81d8954d83 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 @@ -2,7 +2,7 @@ # published from multiple bundles and then merged before use. body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/parsejson.cf b/tests/acceptance/01_vars/04_containers/parsejson.cf index 84258303c2..9d4ee528da 100644 --- a/tests/acceptance/01_vars/04_containers/parsejson.cf +++ b/tests/acceptance/01_vars/04_containers/parsejson.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/parsejson_indexed.cf b/tests/acceptance/01_vars/04_containers/parsejson_indexed.cf index 6b1c2e48ac..75f089c26b 100644 --- a/tests/acceptance/01_vars/04_containers/parsejson_indexed.cf +++ b/tests/acceptance/01_vars/04_containers/parsejson_indexed.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/parsejson_storejson_with_missing_container_does_not_create_new_container.cf b/tests/acceptance/01_vars/04_containers/parsejson_storejson_with_missing_container_does_not_create_new_container.cf index c27cdf3101..254d121211 100644 --- a/tests/acceptance/01_vars/04_containers/parsejson_storejson_with_missing_container_does_not_create_new_container.cf +++ b/tests/acceptance/01_vars/04_containers/parsejson_storejson_with_missing_container_does_not_create_new_container.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/parsejson_unicode.cf b/tests/acceptance/01_vars/04_containers/parsejson_unicode.cf index cb05625e8e..7e68c1544a 100644 --- a/tests/acceptance/01_vars/04_containers/parsejson_unicode.cf +++ b/tests/acceptance/01_vars/04_containers/parsejson_unicode.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/parsejson_with_unresolved_varibales_does_not_define_datacontainer.cf b/tests/acceptance/01_vars/04_containers/parsejson_with_unresolved_varibales_does_not_define_datacontainer.cf index ecd0e201d9..22e51a9650 100644 --- a/tests/acceptance/01_vars/04_containers/parsejson_with_unresolved_varibales_does_not_define_datacontainer.cf +++ b/tests/acceptance/01_vars/04_containers/parsejson_with_unresolved_varibales_does_not_define_datacontainer.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/parseyaml.cf b/tests/acceptance/01_vars/04_containers/parseyaml.cf index 5da5d56c2c..a5f4bbcf16 100644 --- a/tests/acceptance/01_vars/04_containers/parseyaml.cf +++ b/tests/acceptance/01_vars/04_containers/parseyaml.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/parseyaml_abuse.cf b/tests/acceptance/01_vars/04_containers/parseyaml_abuse.cf index 2062abea48..8e5bd8e7f5 100644 --- a/tests/acceptance/01_vars/04_containers/parseyaml_abuse.cf +++ b/tests/acceptance/01_vars/04_containers/parseyaml_abuse.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } 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 40727d8a3f..7a5947470a 100644 --- a/tests/acceptance/01_vars/04_containers/pass_variable_container.cf +++ b/tests/acceptance/01_vars/04_containers/pass_variable_container.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } 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 35bfe052ca..6b1befd1ae 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 @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/passing_containers.cf b/tests/acceptance/01_vars/04_containers/passing_containers.cf index 8083f9902a..5bf954fc1b 100644 --- a/tests/acceptance/01_vars/04_containers/passing_containers.cf +++ b/tests/acceptance/01_vars/04_containers/passing_containers.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/readjson.cf b/tests/acceptance/01_vars/04_containers/readjson.cf index e3a60d5194..7716dd4bf9 100644 --- a/tests/acceptance/01_vars/04_containers/readjson.cf +++ b/tests/acceptance/01_vars/04_containers/readjson.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/readjson_arrays.cf b/tests/acceptance/01_vars/04_containers/readjson_arrays.cf index d7e639560a..dedda67110 100644 --- a/tests/acceptance/01_vars/04_containers/readjson_arrays.cf +++ b/tests/acceptance/01_vars/04_containers/readjson_arrays.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/readjson_new.cf b/tests/acceptance/01_vars/04_containers/readjson_new.cf index e21ad53c8e..3e92b0f048 100644 --- a/tests/acceptance/01_vars/04_containers/readjson_new.cf +++ b/tests/acceptance/01_vars/04_containers/readjson_new.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/readjson_null.cf b/tests/acceptance/01_vars/04_containers/readjson_null.cf index 75e840fd78..18af1645bb 100644 --- a/tests/acceptance/01_vars/04_containers/readjson_null.cf +++ b/tests/acceptance/01_vars/04_containers/readjson_null.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/readjson_objects.cf b/tests/acceptance/01_vars/04_containers/readjson_objects.cf index 37e08189f0..26a67733dc 100644 --- a/tests/acceptance/01_vars/04_containers/readjson_objects.cf +++ b/tests/acceptance/01_vars/04_containers/readjson_objects.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/readjson_scalar.cf b/tests/acceptance/01_vars/04_containers/readjson_scalar.cf index 0eddfe5b30..94270374cd 100644 --- a/tests/acceptance/01_vars/04_containers/readjson_scalar.cf +++ b/tests/acceptance/01_vars/04_containers/readjson_scalar.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/readjson_subindex.cf b/tests/acceptance/01_vars/04_containers/readjson_subindex.cf index 58496a5d61..8060187cc4 100644 --- a/tests/acceptance/01_vars/04_containers/readjson_subindex.cf +++ b/tests/acceptance/01_vars/04_containers/readjson_subindex.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/readjson_subindex_quoted.cf b/tests/acceptance/01_vars/04_containers/readjson_subindex_quoted.cf index 3d05ef7bc0..9eb569bc96 100644 --- a/tests/acceptance/01_vars/04_containers/readjson_subindex_quoted.cf +++ b/tests/acceptance/01_vars/04_containers/readjson_subindex_quoted.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/readyaml.cf b/tests/acceptance/01_vars/04_containers/readyaml.cf index 4946fceb20..a63e5d8cc3 100644 --- a/tests/acceptance/01_vars/04_containers/readyaml.cf +++ b/tests/acceptance/01_vars/04_containers/readyaml.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/readyaml_new.cf b/tests/acceptance/01_vars/04_containers/readyaml_new.cf index b3daab226c..6d5746b94d 100644 --- a/tests/acceptance/01_vars/04_containers/readyaml_new.cf +++ b/tests/acceptance/01_vars/04_containers/readyaml_new.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/04_containers/test_json_with_and_without_nulls.cf b/tests/acceptance/01_vars/04_containers/test_json_with_and_without_nulls.cf index 09ac24123f..e41abaee5b 100644 --- a/tests/acceptance/01_vars/04_containers/test_json_with_and_without_nulls.cf +++ b/tests/acceptance/01_vars/04_containers/test_json_with_and_without_nulls.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/01_vars/deep_delayed_expansion/main.cf b/tests/acceptance/01_vars/deep_delayed_expansion/main.cf index 86f99bcbe2..94d945d470 100644 --- a/tests/acceptance/01_vars/deep_delayed_expansion/main.cf +++ b/tests/acceptance/01_vars/deep_delayed_expansion/main.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub", @(def.augments_inputs) }; + inputs => { "../../default.sub.cf", @(def.augments_inputs) }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/02_classes/01_basic/001.cf b/tests/acceptance/02_classes/01_basic/001.cf index 286c979b55..e0d9dcbd7a 100644 --- a/tests/acceptance/02_classes/01_basic/001.cf +++ b/tests/acceptance/02_classes/01_basic/001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -40,4 +40,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/002.cf b/tests/acceptance/02_classes/01_basic/002.cf index 11bb1bf3c5..4e81750e8d 100644 --- a/tests/acceptance/02_classes/01_basic/002.cf +++ b/tests/acceptance/02_classes/01_basic/002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -41,4 +41,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/003.cf b/tests/acceptance/02_classes/01_basic/003.cf index ca43913307..647ea6f929 100644 --- a/tests/acceptance/02_classes/01_basic/003.cf +++ b/tests/acceptance/02_classes/01_basic/003.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -42,4 +42,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/004.cf b/tests/acceptance/02_classes/01_basic/004.cf index 87d8f434bd..7797aee8c8 100644 --- a/tests/acceptance/02_classes/01_basic/004.cf +++ b/tests/acceptance/02_classes/01_basic/004.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -43,4 +43,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/005.cf b/tests/acceptance/02_classes/01_basic/005.cf index 09fefaae6c..b8a8f6404c 100644 --- a/tests/acceptance/02_classes/01_basic/005.cf +++ b/tests/acceptance/02_classes/01_basic/005.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -45,4 +45,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/006.cf b/tests/acceptance/02_classes/01_basic/006.cf index 9cf7b96d64..db3d51ec56 100644 --- a/tests/acceptance/02_classes/01_basic/006.cf +++ b/tests/acceptance/02_classes/01_basic/006.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -43,4 +43,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/007.cf b/tests/acceptance/02_classes/01_basic/007.cf index a509c16aa0..05b4a378bb 100644 --- a/tests/acceptance/02_classes/01_basic/007.cf +++ b/tests/acceptance/02_classes/01_basic/007.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -43,4 +43,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/008.cf b/tests/acceptance/02_classes/01_basic/008.cf index 54a6a72bfd..da1fd77986 100644 --- a/tests/acceptance/02_classes/01_basic/008.cf +++ b/tests/acceptance/02_classes/01_basic/008.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -44,4 +44,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/009.cf b/tests/acceptance/02_classes/01_basic/009.cf index 03824586af..6fa27637d3 100644 --- a/tests/acceptance/02_classes/01_basic/009.cf +++ b/tests/acceptance/02_classes/01_basic/009.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -44,4 +44,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/010.cf b/tests/acceptance/02_classes/01_basic/010.cf index 23b6fd6acd..a949c98ea4 100644 --- a/tests/acceptance/02_classes/01_basic/010.cf +++ b/tests/acceptance/02_classes/01_basic/010.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -43,4 +43,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/011.cf b/tests/acceptance/02_classes/01_basic/011.cf index cdce2b5f16..01c7a2d7ce 100644 --- a/tests/acceptance/02_classes/01_basic/011.cf +++ b/tests/acceptance/02_classes/01_basic/011.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -44,4 +44,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/012.cf b/tests/acceptance/02_classes/01_basic/012.cf index 810ad1e2b8..089cf7f1a2 100644 --- a/tests/acceptance/02_classes/01_basic/012.cf +++ b/tests/acceptance/02_classes/01_basic/012.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -44,4 +44,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/013.cf b/tests/acceptance/02_classes/01_basic/013.cf index 0d66d56fb0..48ecd7ba7e 100644 --- a/tests/acceptance/02_classes/01_basic/013.cf +++ b/tests/acceptance/02_classes/01_basic/013.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -43,4 +43,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/014.cf b/tests/acceptance/02_classes/01_basic/014.cf index 891dd43a3b..69a242f0e6 100644 --- a/tests/acceptance/02_classes/01_basic/014.cf +++ b/tests/acceptance/02_classes/01_basic/014.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -43,4 +43,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/015.cf b/tests/acceptance/02_classes/01_basic/015.cf index cd4b618e8e..acf5a57247 100644 --- a/tests/acceptance/02_classes/01_basic/015.cf +++ b/tests/acceptance/02_classes/01_basic/015.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -44,4 +44,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/016.cf b/tests/acceptance/02_classes/01_basic/016.cf index acc92be338..67b26604d4 100644 --- a/tests/acceptance/02_classes/01_basic/016.cf +++ b/tests/acceptance/02_classes/01_basic/016.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -44,4 +44,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/017.cf b/tests/acceptance/02_classes/01_basic/017.cf index df15be73dc..a390fa991a 100644 --- a/tests/acceptance/02_classes/01_basic/017.cf +++ b/tests/acceptance/02_classes/01_basic/017.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -44,4 +44,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/018.cf b/tests/acceptance/02_classes/01_basic/018.cf index 81e33e26e6..a00e4d599e 100644 --- a/tests/acceptance/02_classes/01_basic/018.cf +++ b/tests/acceptance/02_classes/01_basic/018.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -44,4 +44,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/019.cf b/tests/acceptance/02_classes/01_basic/019.cf index a02a92a393..3ec93bc520 100644 --- a/tests/acceptance/02_classes/01_basic/019.cf +++ b/tests/acceptance/02_classes/01_basic/019.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -43,4 +43,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/020.x.cf b/tests/acceptance/02_classes/01_basic/020.x.cf index a7e8549203..b638096273 100644 --- a/tests/acceptance/02_classes/01_basic/020.x.cf +++ b/tests/acceptance/02_classes/01_basic/020.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/021.x.cf b/tests/acceptance/02_classes/01_basic/021.x.cf index 113b1c2e60..dd85447684 100644 --- a/tests/acceptance/02_classes/01_basic/021.x.cf +++ b/tests/acceptance/02_classes/01_basic/021.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/022.x.cf b/tests/acceptance/02_classes/01_basic/022.x.cf index 424102490b..442fe84b82 100644 --- a/tests/acceptance/02_classes/01_basic/022.x.cf +++ b/tests/acceptance/02_classes/01_basic/022.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -41,4 +41,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/023.cf b/tests/acceptance/02_classes/01_basic/023.cf index 6e8f32004b..570b6c5edc 100644 --- a/tests/acceptance/02_classes/01_basic/023.cf +++ b/tests/acceptance/02_classes/01_basic/023.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -46,4 +46,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/024.cf b/tests/acceptance/02_classes/01_basic/024.cf index 3ef42ca0e6..096b81e560 100644 --- a/tests/acceptance/02_classes/01_basic/024.cf +++ b/tests/acceptance/02_classes/01_basic/024.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -46,4 +46,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/025.cf b/tests/acceptance/02_classes/01_basic/025.cf index f0e9091550..b1a7b5569d 100644 --- a/tests/acceptance/02_classes/01_basic/025.cf +++ b/tests/acceptance/02_classes/01_basic/025.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -50,4 +50,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/026.cf b/tests/acceptance/02_classes/01_basic/026.cf index 4bd0269ee3..1c062f64f6 100644 --- a/tests/acceptance/02_classes/01_basic/026.cf +++ b/tests/acceptance/02_classes/01_basic/026.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -47,4 +47,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/027.cf b/tests/acceptance/02_classes/01_basic/027.cf index 21489ff600..279eb96ce9 100644 --- a/tests/acceptance/02_classes/01_basic/027.cf +++ b/tests/acceptance/02_classes/01_basic/027.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -41,4 +41,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/028.cf b/tests/acceptance/02_classes/01_basic/028.cf index a91b03cedd..dc05c0f826 100644 --- a/tests/acceptance/02_classes/01_basic/028.cf +++ b/tests/acceptance/02_classes/01_basic/028.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -51,4 +51,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/030.cf b/tests/acceptance/02_classes/01_basic/030.cf index 6ebef23e10..814adfe97b 100644 --- a/tests/acceptance/02_classes/01_basic/030.cf +++ b/tests/acceptance/02_classes/01_basic/030.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub", "030.cf.namespaced.sub" }; + inputs => { "../../default.sub.cf", "030.cf.namespaced.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/031.cf b/tests/acceptance/02_classes/01_basic/031.cf index 30b3c4dd0a..258a75c37e 100644 --- a/tests/acceptance/02_classes/01_basic/031.cf +++ b/tests/acceptance/02_classes/01_basic/031.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub", "031.cf.namespaced.sub" }; + inputs => { "../../default.sub.cf", "031.cf.namespaced.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/032.cf b/tests/acceptance/02_classes/01_basic/032.cf index c8f4ce2b73..27b007a30a 100644 --- a/tests/acceptance/02_classes/01_basic/032.cf +++ b/tests/acceptance/02_classes/01_basic/032.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../../default.cf.sub", "031.cf.namespaced.sub", "032.cf.sub" }; + inputs => { "../../default.sub.cf", "031.cf.namespaced.sub", "032.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/040.cf b/tests/acceptance/02_classes/01_basic/040.cf index 1bcef8aa42..0a6111623c 100644 --- a/tests/acceptance/02_classes/01_basic/040.cf +++ b/tests/acceptance/02_classes/01_basic/040.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -47,4 +47,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/041.cf b/tests/acceptance/02_classes/01_basic/041.cf index 0fdf7aea16..b99e738c17 100644 --- a/tests/acceptance/02_classes/01_basic/041.cf +++ b/tests/acceptance/02_classes/01_basic/041.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -53,4 +53,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/042.cf b/tests/acceptance/02_classes/01_basic/042.cf index d9975f3987..5bd7a55e89 100644 --- a/tests/acceptance/02_classes/01_basic/042.cf +++ b/tests/acceptance/02_classes/01_basic/042.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -52,4 +52,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/109.cf b/tests/acceptance/02_classes/01_basic/109.cf index e4393c73d7..fd1dea0a44 100644 --- a/tests/acceptance/02_classes/01_basic/109.cf +++ b/tests/acceptance/02_classes/01_basic/109.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub", "109.cf.sub" }; + inputs => { "../../default.sub.cf", "109.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/117.x.cf b/tests/acceptance/02_classes/01_basic/117.x.cf index bf200006a0..0b2cff7b37 100644 --- a/tests/acceptance/02_classes/01_basic/117.x.cf +++ b/tests/acceptance/02_classes/01_basic/117.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -42,4 +42,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/118.x.cf b/tests/acceptance/02_classes/01_basic/118.x.cf index 47ed25f7a0..5b59668008 100644 --- a/tests/acceptance/02_classes/01_basic/118.x.cf +++ b/tests/acceptance/02_classes/01_basic/118.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -42,4 +42,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/119.x.cf b/tests/acceptance/02_classes/01_basic/119.x.cf index fdd92009ef..0f580e89c8 100644 --- a/tests/acceptance/02_classes/01_basic/119.x.cf +++ b/tests/acceptance/02_classes/01_basic/119.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -42,4 +42,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/action_policy_warn_sets_classes.cf b/tests/acceptance/02_classes/01_basic/action_policy_warn_sets_classes.cf index ba191f96a8..fe16ae6579 100644 --- a/tests/acceptance/02_classes/01_basic/action_policy_warn_sets_classes.cf +++ b/tests/acceptance/02_classes/01_basic/action_policy_warn_sets_classes.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -75,4 +75,3 @@ bundle agent check debug:: "$(classes)"; } - diff --git a/tests/acceptance/02_classes/01_basic/agent_class_scope.cf b/tests/acceptance/02_classes/01_basic/agent_class_scope.cf index 5ac1f7125f..d51277f425 100644 --- a/tests/acceptance/02_classes/01_basic/agent_class_scope.cf +++ b/tests/acceptance/02_classes/01_basic/agent_class_scope.cf @@ -6,7 +6,7 @@ ####################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/array_key_with_space_isvariable.cf b/tests/acceptance/02_classes/01_basic/array_key_with_space_isvariable.cf index 0b77d2b92e..ba26fd8efd 100644 --- a/tests/acceptance/02_classes/01_basic/array_key_with_space_isvariable.cf +++ b/tests/acceptance/02_classes/01_basic/array_key_with_space_isvariable.cf @@ -1,7 +1,7 @@ # isvariable should be able to check array indexes that have spaces body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/avoid_reevaluation.cf b/tests/acceptance/02_classes/01_basic/avoid_reevaluation.cf index 1d4c8bf17a..5797ea5947 100644 --- a/tests/acceptance/02_classes/01_basic/avoid_reevaluation.cf +++ b/tests/acceptance/02_classes/01_basic/avoid_reevaluation.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/avoid_reevaluation.cf.sub b/tests/acceptance/02_classes/01_basic/avoid_reevaluation.cf.sub index 1c2bbfe28a..1603963ef9 100644 --- a/tests/acceptance/02_classes/01_basic/avoid_reevaluation.cf.sub +++ b/tests/acceptance/02_classes/01_basic/avoid_reevaluation.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { run }; } diff --git a/tests/acceptance/02_classes/01_basic/classes_comments_emitted_in_show_classes.cf b/tests/acceptance/02_classes/01_basic/classes_comments_emitted_in_show_classes.cf index 379f043a49..b16e99095b 100644 --- a/tests/acceptance/02_classes/01_basic/classes_comments_emitted_in_show_classes.cf +++ b/tests/acceptance/02_classes/01_basic/classes_comments_emitted_in_show_classes.cf @@ -1,7 +1,7 @@ # Test $(sys.inputdir), $(sys.masterdir), $(sys.libdir), $(sys.bindir), $(sys.failsafe_policy_path), $(sys.update_policy_path), $(sys.local_libdir) body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/02_classes/01_basic/classes_comments_emitted_in_verbose.cf b/tests/acceptance/02_classes/01_basic/classes_comments_emitted_in_verbose.cf index 32354a5f6e..3bfcef9dc3 100644 --- a/tests/acceptance/02_classes/01_basic/classes_comments_emitted_in_verbose.cf +++ b/tests/acceptance/02_classes/01_basic/classes_comments_emitted_in_verbose.cf @@ -1,7 +1,7 @@ # Test $(sys.inputdir), $(sys.masterdir), $(sys.libdir), $(sys.bindir), $(sys.failsafe_policy_path), $(sys.update_policy_path), $(sys.local_libdir) body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/02_classes/01_basic/classes_from_modules_available_to_subsequent_bundles_in_first_pass.cf b/tests/acceptance/02_classes/01_basic/classes_from_modules_available_to_subsequent_bundles_in_first_pass.cf index 49a81fb141..677321a57e 100644 --- a/tests/acceptance/02_classes/01_basic/classes_from_modules_available_to_subsequent_bundles_in_first_pass.cf +++ b/tests/acceptance/02_classes/01_basic/classes_from_modules_available_to_subsequent_bundles_in_first_pass.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/classes_from_modules_available_to_subsequent_bundles_in_first_pass.cf.sub b/tests/acceptance/02_classes/01_basic/classes_from_modules_available_to_subsequent_bundles_in_first_pass.cf.sub index 1d1160579c..e928837cdd 100644 --- a/tests/acceptance/02_classes/01_basic/classes_from_modules_available_to_subsequent_bundles_in_first_pass.cf.sub +++ b/tests/acceptance/02_classes/01_basic/classes_from_modules_available_to_subsequent_bundles_in_first_pass.cf.sub @@ -1,7 +1,7 @@ #!/var/cfengine/bin/cf-agent -Kf body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "main"}; } diff --git a/tests/acceptance/02_classes/01_basic/classes_promises_with_classes_bodies.cf b/tests/acceptance/02_classes/01_basic/classes_promises_with_classes_bodies.cf index dc933ca9de..77371a0633 100644 --- a/tests/acceptance/02_classes/01_basic/classes_promises_with_classes_bodies.cf +++ b/tests/acceptance/02_classes/01_basic/classes_promises_with_classes_bodies.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/classes_without_expression.cf b/tests/acceptance/02_classes/01_basic/classes_without_expression.cf index a1c1af0e18..c8edaa9072 100644 --- a/tests/acceptance/02_classes/01_basic/classes_without_expression.cf +++ b/tests/acceptance/02_classes/01_basic/classes_without_expression.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/common_bundle_select_class_empty_list.cf b/tests/acceptance/02_classes/01_basic/common_bundle_select_class_empty_list.cf index baa3b4aafb..18d65b38a3 100644 --- a/tests/acceptance/02_classes/01_basic/common_bundle_select_class_empty_list.cf +++ b/tests/acceptance/02_classes/01_basic/common_bundle_select_class_empty_list.cf @@ -1,6 +1,6 @@ # Test that select_class is skipped when no classes are given body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/common_bundle_select_class_multiple_classes_as_scalar_variable.cf b/tests/acceptance/02_classes/01_basic/common_bundle_select_class_multiple_classes_as_scalar_variable.cf index 231fdf95d7..894914377c 100644 --- a/tests/acceptance/02_classes/01_basic/common_bundle_select_class_multiple_classes_as_scalar_variable.cf +++ b/tests/acceptance/02_classes/01_basic/common_bundle_select_class_multiple_classes_as_scalar_variable.cf @@ -1,7 +1,7 @@ # Test that select class is actuated when it has multiple classes given as a # variable body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/common_bundle_select_class_single_class.cf b/tests/acceptance/02_classes/01_basic/common_bundle_select_class_single_class.cf index 8c38c60b10..6421ac50d3 100644 --- a/tests/acceptance/02_classes/01_basic/common_bundle_select_class_single_class.cf +++ b/tests/acceptance/02_classes/01_basic/common_bundle_select_class_single_class.cf @@ -1,6 +1,6 @@ # Test that select class is actuated when it has only a single class given body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/common_bundle_select_class_single_class_as_variable.cf b/tests/acceptance/02_classes/01_basic/common_bundle_select_class_single_class_as_variable.cf index 602adce170..a4222816e5 100644 --- a/tests/acceptance/02_classes/01_basic/common_bundle_select_class_single_class_as_variable.cf +++ b/tests/acceptance/02_classes/01_basic/common_bundle_select_class_single_class_as_variable.cf @@ -1,7 +1,7 @@ # Test that select class is actuated when it has only a single class given as a # variable body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/common_bundle_select_class_variable_expands_empty_list.cf b/tests/acceptance/02_classes/01_basic/common_bundle_select_class_variable_expands_empty_list.cf index 8a492a3b23..17e6ee6c9c 100644 --- a/tests/acceptance/02_classes/01_basic/common_bundle_select_class_variable_expands_empty_list.cf +++ b/tests/acceptance/02_classes/01_basic/common_bundle_select_class_variable_expands_empty_list.cf @@ -1,6 +1,6 @@ # Test that select class is skipped when the list of classes is empty body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/common_class_scope.cf b/tests/acceptance/02_classes/01_basic/common_class_scope.cf index f5ad700922..04949a7bb6 100644 --- a/tests/acceptance/02_classes/01_basic/common_class_scope.cf +++ b/tests/acceptance/02_classes/01_basic/common_class_scope.cf @@ -6,7 +6,7 @@ ####################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/depends_on_proper_ordering.cf b/tests/acceptance/02_classes/01_basic/depends_on_proper_ordering.cf index 24d2b8fee6..37ee6d1d0e 100644 --- a/tests/acceptance/02_classes/01_basic/depends_on_proper_ordering.cf +++ b/tests/acceptance/02_classes/01_basic/depends_on_proper_ordering.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -46,5 +46,3 @@ bundle agent check "$(G.testfile).expected", "$(this.promise_filename)"); } - - diff --git a/tests/acceptance/02_classes/01_basic/depends_on_respected.cf b/tests/acceptance/02_classes/01_basic/depends_on_respected.cf index e6cdc286eb..d65a4e9a83 100644 --- a/tests/acceptance/02_classes/01_basic/depends_on_respected.cf +++ b/tests/acceptance/02_classes/01_basic/depends_on_respected.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } 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 c9db5ed37f..e5c43b86e4 100644 --- a/tests/acceptance/02_classes/01_basic/from_json_booleans.cf +++ b/tests/acceptance/02_classes/01_basic/from_json_booleans.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/if_resolving_classexpression_from_datacontainer.cf b/tests/acceptance/02_classes/01_basic/if_resolving_classexpression_from_datacontainer.cf index 7366bdc18d..bdaf17203e 100644 --- a/tests/acceptance/02_classes/01_basic/if_resolving_classexpression_from_datacontainer.cf +++ b/tests/acceptance/02_classes/01_basic/if_resolving_classexpression_from_datacontainer.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -64,4 +64,3 @@ bundle agent check $(this.promise_filename), "no"); } - diff --git a/tests/acceptance/02_classes/01_basic/ifvarclass_common_bundles.cf b/tests/acceptance/02_classes/01_basic/ifvarclass_common_bundles.cf index ed27b9629e..566b45e790 100644 --- a/tests/acceptance/02_classes/01_basic/ifvarclass_common_bundles.cf +++ b/tests/acceptance/02_classes/01_basic/ifvarclass_common_bundles.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/invalid_function_in_list.cf b/tests/acceptance/02_classes/01_basic/invalid_function_in_list.cf index ec463b2e3b..ffc43de2bf 100644 --- a/tests/acceptance/02_classes/01_basic/invalid_function_in_list.cf +++ b/tests/acceptance/02_classes/01_basic/invalid_function_in_list.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -18,4 +18,3 @@ bundle agent check !PASS:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/01_basic/ipaddr_classes.cf b/tests/acceptance/02_classes/01_basic/ipaddr_classes.cf index 7cfaa7fa4e..d3c6402e75 100644 --- a/tests/acceptance/02_classes/01_basic/ipaddr_classes.cf +++ b/tests/acceptance/02_classes/01_basic/ipaddr_classes.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/log_mode_debug.cf b/tests/acceptance/02_classes/01_basic/log_mode_debug.cf index 7313cbe431..3a77ff03e6 100644 --- a/tests/acceptance/02_classes/01_basic/log_mode_debug.cf +++ b/tests/acceptance/02_classes/01_basic/log_mode_debug.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/log_mode_error.cf b/tests/acceptance/02_classes/01_basic/log_mode_error.cf index 3f7f704335..359083ac68 100644 --- a/tests/acceptance/02_classes/01_basic/log_mode_error.cf +++ b/tests/acceptance/02_classes/01_basic/log_mode_error.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/log_mode_inform.cf b/tests/acceptance/02_classes/01_basic/log_mode_inform.cf index 12c755eed0..6eea13b60c 100644 --- a/tests/acceptance/02_classes/01_basic/log_mode_inform.cf +++ b/tests/acceptance/02_classes/01_basic/log_mode_inform.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/log_mode_notice.cf b/tests/acceptance/02_classes/01_basic/log_mode_notice.cf index 54d5c28517..ce0b1b34b8 100644 --- a/tests/acceptance/02_classes/01_basic/log_mode_notice.cf +++ b/tests/acceptance/02_classes/01_basic/log_mode_notice.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/log_mode_verbose.cf b/tests/acceptance/02_classes/01_basic/log_mode_verbose.cf index b657a69eaf..e3bee325dc 100644 --- a/tests/acceptance/02_classes/01_basic/log_mode_verbose.cf +++ b/tests/acceptance/02_classes/01_basic/log_mode_verbose.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/log_mode_warning.cf b/tests/acceptance/02_classes/01_basic/log_mode_warning.cf index f1b68a0f36..4129a41489 100644 --- a/tests/acceptance/02_classes/01_basic/log_mode_warning.cf +++ b/tests/acceptance/02_classes/01_basic/log_mode_warning.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/n_cpusockets.cf b/tests/acceptance/02_classes/01_basic/n_cpusockets.cf index 2fc8ed0a33..f03a220c70 100644 --- a/tests/acceptance/02_classes/01_basic/n_cpusockets.cf +++ b/tests/acceptance/02_classes/01_basic/n_cpusockets.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/persistent_negate.cf b/tests/acceptance/02_classes/01_basic/persistent_negate.cf index 5dc9e54a48..67ba900e9f 100644 --- a/tests/acceptance/02_classes/01_basic/persistent_negate.cf +++ b/tests/acceptance/02_classes/01_basic/persistent_negate.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/persistent_tags.cf b/tests/acceptance/02_classes/01_basic/persistent_tags.cf index acc392872a..e62bb75e5b 100644 --- a/tests/acceptance/02_classes/01_basic/persistent_tags.cf +++ b/tests/acceptance/02_classes/01_basic/persistent_tags.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/rbtree_collisions-redmine7912.cf b/tests/acceptance/02_classes/01_basic/rbtree_collisions-redmine7912.cf index 971b2096a4..4050a5ff4e 100644 --- a/tests/acceptance/02_classes/01_basic/rbtree_collisions-redmine7912.cf +++ b/tests/acceptance/02_classes/01_basic/rbtree_collisions-redmine7912.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/staging/028.cf b/tests/acceptance/02_classes/01_basic/staging/028.cf index 09461743f7..caff713f96 100644 --- a/tests/acceptance/02_classes/01_basic/staging/028.cf +++ b/tests/acceptance/02_classes/01_basic/staging/028.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/01_basic/variable_class_expressions_with_if.cf b/tests/acceptance/02_classes/01_basic/variable_class_expressions_with_if.cf index d22cc90389..e1d5b3714d 100644 --- a/tests/acceptance/02_classes/01_basic/variable_class_expressions_with_if.cf +++ b/tests/acceptance/02_classes/01_basic/variable_class_expressions_with_if.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/02_functions/001.cf b/tests/acceptance/02_classes/02_functions/001.cf index 8c0c1a2b0d..4351d3a63b 100644 --- a/tests/acceptance/02_classes/02_functions/001.cf +++ b/tests/acceptance/02_classes/02_functions/001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -50,4 +50,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/02_functions/002.cf b/tests/acceptance/02_classes/02_functions/002.cf index 9bcdf62a71..9ff0436585 100644 --- a/tests/acceptance/02_classes/02_functions/002.cf +++ b/tests/acceptance/02_classes/02_functions/002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -59,4 +59,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/02_functions/003.cf b/tests/acceptance/02_classes/02_functions/003.cf index a719fbc467..b977d01a20 100644 --- a/tests/acceptance/02_classes/02_functions/003.cf +++ b/tests/acceptance/02_classes/02_functions/003.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -52,4 +52,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/02_functions/004.cf b/tests/acceptance/02_classes/02_functions/004.cf index 946c3fd07d..e4364a53f8 100644 --- a/tests/acceptance/02_classes/02_functions/004.cf +++ b/tests/acceptance/02_classes/02_functions/004.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -55,4 +55,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/02_functions/005.cf b/tests/acceptance/02_classes/02_functions/005.cf index e30359b74b..6db7c70990 100644 --- a/tests/acceptance/02_classes/02_functions/005.cf +++ b/tests/acceptance/02_classes/02_functions/005.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -84,4 +84,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/02_functions/006.cf b/tests/acceptance/02_classes/02_functions/006.cf index dfef8dd5ac..58546f9825 100644 --- a/tests/acceptance/02_classes/02_functions/006.cf +++ b/tests/acceptance/02_classes/02_functions/006.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/02_functions/008.cf b/tests/acceptance/02_classes/02_functions/008.cf index 0b673db355..9574d043a9 100644 --- a/tests/acceptance/02_classes/02_functions/008.cf +++ b/tests/acceptance/02_classes/02_functions/008.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -46,4 +46,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/02_functions/009.cf b/tests/acceptance/02_classes/02_functions/009.cf index 327bb1f50b..116ffb4bce 100644 --- a/tests/acceptance/02_classes/02_functions/009.cf +++ b/tests/acceptance/02_classes/02_functions/009.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -46,4 +46,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/02_functions/010.cf b/tests/acceptance/02_classes/02_functions/010.cf index beae8b98b8..f110cf1688 100644 --- a/tests/acceptance/02_classes/02_functions/010.cf +++ b/tests/acceptance/02_classes/02_functions/010.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -43,4 +43,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/02_functions/011.cf b/tests/acceptance/02_classes/02_functions/011.cf index e2227447f0..51e9d3c688 100644 --- a/tests/acceptance/02_classes/02_functions/011.cf +++ b/tests/acceptance/02_classes/02_functions/011.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -43,4 +43,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/02_functions/012.cf b/tests/acceptance/02_classes/02_functions/012.cf index 474a733f55..215a96f385 100644 --- a/tests/acceptance/02_classes/02_functions/012.cf +++ b/tests/acceptance/02_classes/02_functions/012.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -40,4 +40,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/02_functions/013.cf b/tests/acceptance/02_classes/02_functions/013.cf index ef8939eb44..a1e443d3b7 100644 --- a/tests/acceptance/02_classes/02_functions/013.cf +++ b/tests/acceptance/02_classes/02_functions/013.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -40,4 +40,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/02_functions/014.cf b/tests/acceptance/02_classes/02_functions/014.cf index a3c7b0a2f2..c213d6aaba 100644 --- a/tests/acceptance/02_classes/02_functions/014.cf +++ b/tests/acceptance/02_classes/02_functions/014.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -40,4 +40,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/02_functions/015.cf b/tests/acceptance/02_classes/02_functions/015.cf index a0ff132da2..402f8683d1 100644 --- a/tests/acceptance/02_classes/02_functions/015.cf +++ b/tests/acceptance/02_classes/02_functions/015.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/02_functions/016.cf b/tests/acceptance/02_classes/02_functions/016.cf index 65c4241a4a..4eae139daa 100644 --- a/tests/acceptance/02_classes/02_functions/016.cf +++ b/tests/acceptance/02_classes/02_functions/016.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/02_functions/017.cf b/tests/acceptance/02_classes/02_functions/017.cf index e929982de9..4474039324 100644 --- a/tests/acceptance/02_classes/02_functions/017.cf +++ b/tests/acceptance/02_classes/02_functions/017.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -47,4 +47,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/02_functions/020.cf b/tests/acceptance/02_classes/02_functions/020.cf index fbd527f33e..d71d52f47b 100644 --- a/tests/acceptance/02_classes/02_functions/020.cf +++ b/tests/acceptance/02_classes/02_functions/020.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/02_functions/021.cf b/tests/acceptance/02_classes/02_functions/021.cf index ad5ddf3cf4..99b7d6951a 100644 --- a/tests/acceptance/02_classes/02_functions/021.cf +++ b/tests/acceptance/02_classes/02_functions/021.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/02_functions/029.cf b/tests/acceptance/02_classes/02_functions/029.cf index 4b1959a9ba..41ac157c5f 100644 --- a/tests/acceptance/02_classes/02_functions/029.cf +++ b/tests/acceptance/02_classes/02_functions/029.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -118,4 +118,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/02_functions/030.cf b/tests/acceptance/02_classes/02_functions/030.cf index 907becf6db..842fd885a0 100644 --- a/tests/acceptance/02_classes/02_functions/030.cf +++ b/tests/acceptance/02_classes/02_functions/030.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -54,4 +54,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/02_functions/classes_body_function_param.cf b/tests/acceptance/02_classes/02_functions/classes_body_function_param.cf index 7e305e39af..887de7cbd4 100644 --- a/tests/acceptance/02_classes/02_functions/classes_body_function_param.cf +++ b/tests/acceptance/02_classes/02_functions/classes_body_function_param.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/02_functions/classesmatching.cf b/tests/acceptance/02_classes/02_functions/classesmatching.cf index abd05ea142..9f7e3ab461 100644 --- a/tests/acceptance/02_classes/02_functions/classesmatching.cf +++ b/tests/acceptance/02_classes/02_functions/classesmatching.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/02_functions/empty_list_or_data_doesnt_return_true_for_filesexist.cf b/tests/acceptance/02_classes/02_functions/empty_list_or_data_doesnt_return_true_for_filesexist.cf index 8eba63d6dd..a409105393 100644 --- a/tests/acceptance/02_classes/02_functions/empty_list_or_data_doesnt_return_true_for_filesexist.cf +++ b/tests/acceptance/02_classes/02_functions/empty_list_or_data_doesnt_return_true_for_filesexist.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/02_classes/02_functions/function_args_flattening.cf b/tests/acceptance/02_classes/02_functions/function_args_flattening.cf index f9f36c0140..baec5b98a5 100644 --- a/tests/acceptance/02_classes/02_functions/function_args_flattening.cf +++ b/tests/acceptance/02_classes/02_functions/function_args_flattening.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/02_functions/getindices_containers.cf b/tests/acceptance/02_classes/02_functions/getindices_containers.cf index 9ec292c6f6..21443ccd15 100644 --- a/tests/acceptance/02_classes/02_functions/getindices_containers.cf +++ b/tests/acceptance/02_classes/02_functions/getindices_containers.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -44,4 +44,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/02_functions/getindices_returns_correct_indices_from_list.cf b/tests/acceptance/02_classes/02_functions/getindices_returns_correct_indices_from_list.cf index 718e98a2ff..4eaacd2492 100644 --- a/tests/acceptance/02_classes/02_functions/getindices_returns_correct_indices_from_list.cf +++ b/tests/acceptance/02_classes/02_functions/getindices_returns_correct_indices_from_list.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/02_functions/getindices_returns_positonal_indices_from_list.cf b/tests/acceptance/02_classes/02_functions/getindices_returns_positonal_indices_from_list.cf index b352e5a6f0..37d099d4cb 100644 --- a/tests/acceptance/02_classes/02_functions/getindices_returns_positonal_indices_from_list.cf +++ b/tests/acceptance/02_classes/02_functions/getindices_returns_positonal_indices_from_list.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/02_functions/iprange.cf b/tests/acceptance/02_classes/02_functions/iprange.cf index fdc991f68c..1bf133dba2 100644 --- a/tests/acceptance/02_classes/02_functions/iprange.cf +++ b/tests/acceptance/02_classes/02_functions/iprange.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/02_functions/isipinsubnet-valid-ip.cf b/tests/acceptance/02_classes/02_functions/isipinsubnet-valid-ip.cf index 1033e133ca..bdb265f8e9 100644 --- a/tests/acceptance/02_classes/02_functions/isipinsubnet-valid-ip.cf +++ b/tests/acceptance/02_classes/02_functions/isipinsubnet-valid-ip.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/02_functions/isipinsubnet.cf b/tests/acceptance/02_classes/02_functions/isipinsubnet.cf index 6cff4f4db0..3e0afdd30d 100644 --- a/tests/acceptance/02_classes/02_functions/isipinsubnet.cf +++ b/tests/acceptance/02_classes/02_functions/isipinsubnet.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/02_functions/isnewerthantime.cf b/tests/acceptance/02_classes/02_functions/isnewerthantime.cf index cf7ea5fccb..7185fae32c 100644 --- a/tests/acceptance/02_classes/02_functions/isnewerthantime.cf +++ b/tests/acceptance/02_classes/02_functions/isnewerthantime.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/02_functions/laterthan.cf b/tests/acceptance/02_classes/02_functions/laterthan.cf index c6485b19a7..77b376707b 100644 --- a/tests/acceptance/02_classes/02_functions/laterthan.cf +++ b/tests/acceptance/02_classes/02_functions/laterthan.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/02_functions/makerule.cf b/tests/acceptance/02_classes/02_functions/makerule.cf index 3a211efd11..23cd05b05c 100644 --- a/tests/acceptance/02_classes/02_functions/makerule.cf +++ b/tests/acceptance/02_classes/02_functions/makerule.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/02_functions/returnszero.cf b/tests/acceptance/02_classes/02_functions/returnszero.cf index 13283a0d93..bf1ec0a333 100644 --- a/tests/acceptance/02_classes/02_functions/returnszero.cf +++ b/tests/acceptance/02_classes/02_functions/returnszero.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/02_functions/silent_returnszero.cf b/tests/acceptance/02_classes/02_functions/silent_returnszero.cf index 047c7c0021..e340f9f1db 100644 --- a/tests/acceptance/02_classes/02_functions/silent_returnszero.cf +++ b/tests/acceptance/02_classes/02_functions/silent_returnszero.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/02_functions/silent_returnszero.cf.sub b/tests/acceptance/02_classes/02_functions/silent_returnszero.cf.sub index 21e4de20ad..d51e06a431 100644 --- a/tests/acceptance/02_classes/02_functions/silent_returnszero.cf.sub +++ b/tests/acceptance/02_classes/02_functions/silent_returnszero.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "main" }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/02_functions/splayclass_hourly.cf b/tests/acceptance/02_classes/02_functions/splayclass_hourly.cf index 49ff896538..cf264e6f4c 100644 --- a/tests/acceptance/02_classes/02_functions/splayclass_hourly.cf +++ b/tests/acceptance/02_classes/02_functions/splayclass_hourly.cf @@ -1,7 +1,7 @@ # Test that hourly splay class works as expected body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/02_functions/staging/017.cf b/tests/acceptance/02_classes/02_functions/staging/017.cf index 99fd071c17..334782f54e 100644 --- a/tests/acceptance/02_classes/02_functions/staging/017.cf +++ b/tests/acceptance/02_classes/02_functions/staging/017.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/02_functions/staging/usemodule.cf b/tests/acceptance/02_classes/02_functions/staging/usemodule.cf index 3a4319518d..202d89d691 100644 --- a/tests/acceptance/02_classes/02_functions/staging/usemodule.cf +++ b/tests/acceptance/02_classes/02_functions/staging/usemodule.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -125,4 +125,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/02_functions/usemodule-returns-nonzero.cf b/tests/acceptance/02_classes/02_functions/usemodule-returns-nonzero.cf index cadddca34b..1cb3f59381 100644 --- a/tests/acceptance/02_classes/02_functions/usemodule-returns-nonzero.cf +++ b/tests/acceptance/02_classes/02_functions/usemodule-returns-nonzero.cf @@ -1,7 +1,7 @@ #!/var/cfengine/bin/cf-agent -f- body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/02_classes/02_functions/usemodule.cf b/tests/acceptance/02_classes/02_functions/usemodule.cf index 8d22d876a1..dfc2f3b5f9 100644 --- a/tests/acceptance/02_classes/02_functions/usemodule.cf +++ b/tests/acceptance/02_classes/02_functions/usemodule.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -101,4 +101,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/03_os/powershell.cf b/tests/acceptance/02_classes/03_os/powershell.cf index 9599a3b818..fe196a72bb 100644 --- a/tests/acceptance/02_classes/03_os/powershell.cf +++ b/tests/acceptance/02_classes/03_os/powershell.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -57,4 +57,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/02_classes/03_os/ubuntu.cf b/tests/acceptance/02_classes/03_os/ubuntu.cf index 55c4cf1f1b..7d76a6c747 100644 --- a/tests/acceptance/02_classes/03_os/ubuntu.cf +++ b/tests/acceptance/02_classes/03_os/ubuntu.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/04_examples/outputs/check_outputs.cf b/tests/acceptance/04_examples/outputs/check_outputs.cf index 09516ef2b6..7f4c108319 100644 --- a/tests/acceptance/04_examples/outputs/check_outputs.cf +++ b/tests/acceptance/04_examples/outputs/check_outputs.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/04_examples/syntax/check_syntax.cf b/tests/acceptance/04_examples/syntax/check_syntax.cf index e52914c1ba..88e87faf07 100644 --- a/tests/acceptance/04_examples/syntax/check_syntax.cf +++ b/tests/acceptance/04_examples/syntax/check_syntax.cf @@ -11,7 +11,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/05_processes/00_hpux_ps_setup_serial.cf b/tests/acceptance/05_processes/00_hpux_ps_setup_serial.cf index 03daf9296b..5b17bc5297 100644 --- a/tests/acceptance/05_processes/00_hpux_ps_setup_serial.cf +++ b/tests/acceptance/05_processes/00_hpux_ps_setup_serial.cf @@ -5,7 +5,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/05_processes/01_matching/inverse_ttime_classes_body_params.cf b/tests/acceptance/05_processes/01_matching/inverse_ttime_classes_body_params.cf index beeea65a14..bc90bacd6c 100644 --- a/tests/acceptance/05_processes/01_matching/inverse_ttime_classes_body_params.cf +++ b/tests/acceptance/05_processes/01_matching/inverse_ttime_classes_body_params.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/05_processes/01_matching/inverse_ttime_inverse_found.cf b/tests/acceptance/05_processes/01_matching/inverse_ttime_inverse_found.cf index 49a79b08c0..be4d240471 100644 --- a/tests/acceptance/05_processes/01_matching/inverse_ttime_inverse_found.cf +++ b/tests/acceptance/05_processes/01_matching/inverse_ttime_inverse_found.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/05_processes/01_matching/negative_restart_class.cf b/tests/acceptance/05_processes/01_matching/negative_restart_class.cf index 212ee9c6a6..f484453778 100644 --- a/tests/acceptance/05_processes/01_matching/negative_restart_class.cf +++ b/tests/acceptance/05_processes/01_matching/negative_restart_class.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/05_processes/01_matching/owner.cf b/tests/acceptance/05_processes/01_matching/owner.cf index c0b842c747..96fcc8b764 100644 --- a/tests/acceptance/05_processes/01_matching/owner.cf +++ b/tests/acceptance/05_processes/01_matching/owner.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/05_processes/01_matching/partial_name_inverse_found.cf b/tests/acceptance/05_processes/01_matching/partial_name_inverse_found.cf index 6a03552583..971c5d10e6 100644 --- a/tests/acceptance/05_processes/01_matching/partial_name_inverse_found.cf +++ b/tests/acceptance/05_processes/01_matching/partial_name_inverse_found.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/05_processes/01_matching/partial_name_inverse_not_found.cf b/tests/acceptance/05_processes/01_matching/partial_name_inverse_not_found.cf index 6bbd62d7fb..f9465d26de 100644 --- a/tests/acceptance/05_processes/01_matching/partial_name_inverse_not_found.cf +++ b/tests/acceptance/05_processes/01_matching/partial_name_inverse_not_found.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/05_processes/01_matching/process_count_found.cf b/tests/acceptance/05_processes/01_matching/process_count_found.cf index 4a9aa5f9c7..5f1211e21c 100644 --- a/tests/acceptance/05_processes/01_matching/process_count_found.cf +++ b/tests/acceptance/05_processes/01_matching/process_count_found.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/05_processes/01_matching/process_count_inverse_found.cf b/tests/acceptance/05_processes/01_matching/process_count_inverse_found.cf index 0b4cbf05f4..6db3540cf9 100644 --- a/tests/acceptance/05_processes/01_matching/process_count_inverse_found.cf +++ b/tests/acceptance/05_processes/01_matching/process_count_inverse_found.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/05_processes/01_matching/process_count_inverse_not_found.cf b/tests/acceptance/05_processes/01_matching/process_count_inverse_not_found.cf index 02d1e43ae7..75218abbf7 100644 --- a/tests/acceptance/05_processes/01_matching/process_count_inverse_not_found.cf +++ b/tests/acceptance/05_processes/01_matching/process_count_inverse_not_found.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/05_processes/01_matching/process_count_not_found.cf b/tests/acceptance/05_processes/01_matching/process_count_not_found.cf index ec2eeb0002..aae5b702d4 100644 --- a/tests/acceptance/05_processes/01_matching/process_count_not_found.cf +++ b/tests/acceptance/05_processes/01_matching/process_count_not_found.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/05_processes/01_matching/process_select_fncalls.cf b/tests/acceptance/05_processes/01_matching/process_select_fncalls.cf index 6815f2028c..8a9d96abea 100644 --- a/tests/acceptance/05_processes/01_matching/process_select_fncalls.cf +++ b/tests/acceptance/05_processes/01_matching/process_select_fncalls.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/05_processes/01_matching/promiser_match_is_correct.cf b/tests/acceptance/05_processes/01_matching/promiser_match_is_correct.cf index 73ec725cb6..6839e0fe7b 100644 --- a/tests/acceptance/05_processes/01_matching/promiser_match_is_correct.cf +++ b/tests/acceptance/05_processes/01_matching/promiser_match_is_correct.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "debug_info", default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/05_processes/01_matching/promiser_match_is_correct.cf.sub b/tests/acceptance/05_processes/01_matching/promiser_match_is_correct.cf.sub index dd1fa7831a..e563079263 100644 --- a/tests/acceptance/05_processes/01_matching/promiser_match_is_correct.cf.sub +++ b/tests/acceptance/05_processes/01_matching/promiser_match_is_correct.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/05_processes/01_matching/restart_class.cf b/tests/acceptance/05_processes/01_matching/restart_class.cf index 3ab8f9ddaa..74b4dfdec7 100644 --- a/tests/acceptance/05_processes/01_matching/restart_class.cf +++ b/tests/acceptance/05_processes/01_matching/restart_class.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/05_processes/01_matching/select_without_result.cf b/tests/acceptance/05_processes/01_matching/select_without_result.cf index b78fb4b4ef..51d1f190e5 100644 --- a/tests/acceptance/05_processes/01_matching/select_without_result.cf +++ b/tests/acceptance/05_processes/01_matching/select_without_result.cf @@ -16,7 +16,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/05_processes/01_matching/stime_range.cf b/tests/acceptance/05_processes/01_matching/stime_range.cf index 02dfa16ec2..06d5135509 100644 --- a/tests/acceptance/05_processes/01_matching/stime_range.cf +++ b/tests/acceptance/05_processes/01_matching/stime_range.cf @@ -27,7 +27,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/05_processes/01_matching/timed/stime.cf b/tests/acceptance/05_processes/01_matching/timed/stime.cf index e1d0af8854..fc07eff444 100644 --- a/tests/acceptance/05_processes/01_matching/timed/stime.cf +++ b/tests/acceptance/05_processes/01_matching/timed/stime.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/05_processes/01_matching/ttime_classes_body_params.cf b/tests/acceptance/05_processes/01_matching/ttime_classes_body_params.cf index d5a72761ec..1bb60c822a 100644 --- a/tests/acceptance/05_processes/01_matching/ttime_classes_body_params.cf +++ b/tests/acceptance/05_processes/01_matching/ttime_classes_body_params.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/05_processes/01_matching/ttime_inverse_found.cf b/tests/acceptance/05_processes/01_matching/ttime_inverse_found.cf index 8329dcecff..4d70f0dd46 100644 --- a/tests/acceptance/05_processes/01_matching/ttime_inverse_found.cf +++ b/tests/acceptance/05_processes/01_matching/ttime_inverse_found.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/05_processes/01_matching/tty.cf b/tests/acceptance/05_processes/01_matching/tty.cf index c363f76fbd..d5a5522ee1 100644 --- a/tests/acceptance/05_processes/01_matching/tty.cf +++ b/tests/acceptance/05_processes/01_matching/tty.cf @@ -28,7 +28,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/05_processes/02_functions/findprocesses.cf b/tests/acceptance/05_processes/02_functions/findprocesses.cf index 97647414a9..8edab159a5 100644 --- a/tests/acceptance/05_processes/02_functions/findprocesses.cf +++ b/tests/acceptance/05_processes/02_functions/findprocesses.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/05_processes/02_functions/processexists.cf b/tests/acceptance/05_processes/02_functions/processexists.cf index 77a48b60c0..d67c430721 100644 --- a/tests/acceptance/05_processes/02_functions/processexists.cf +++ b/tests/acceptance/05_processes/02_functions/processexists.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; version => "1.0"; } diff --git a/tests/acceptance/05_processes/process_stop.cf b/tests/acceptance/05_processes/process_stop.cf index b4935cbd01..3d0476cf1f 100644 --- a/tests/acceptance/05_processes/process_stop.cf +++ b/tests/acceptance/05_processes/process_stop.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } @@ -147,4 +147,3 @@ body classes explicit_results(scope, class_prefix) repair_timeout => { "$(class_prefix)_timeout" }; } - diff --git a/tests/acceptance/06_storage/01_local/001.cf b/tests/acceptance/06_storage/01_local/001.cf index e3bc8bca5a..636e22fe9a 100644 --- a/tests/acceptance/06_storage/01_local/001.cf +++ b/tests/acceptance/06_storage/01_local/001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/06_storage/01_local/staging/002.cf b/tests/acceptance/06_storage/01_local/staging/002.cf index 38047d6e53..5e121e8f29 100644 --- a/tests/acceptance/06_storage/01_local/staging/002.cf +++ b/tests/acceptance/06_storage/01_local/staging/002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/001.cf b/tests/acceptance/07_packages/001.cf index a0a1e55c04..90036368c9 100644 --- a/tests/acceptance/07_packages/001.cf +++ b/tests/acceptance/07_packages/001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { "G", "g", default("$(this.promise_filename)") }; version => "1.0"; cache_system_functions => "false"; diff --git a/tests/acceptance/07_packages/002.cf b/tests/acceptance/07_packages/002.cf index 983f5eb156..bd81814e92 100644 --- a/tests/acceptance/07_packages/002.cf +++ b/tests/acceptance/07_packages/002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { "G", "g", default("$(this.promise_filename)") }; version => "1.0"; cache_system_functions => "false"; diff --git a/tests/acceptance/07_packages/003.cf b/tests/acceptance/07_packages/003.cf index 1497178bdb..89fda9cfed 100644 --- a/tests/acceptance/07_packages/003.cf +++ b/tests/acceptance/07_packages/003.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { "G", "g", default("$(this.promise_filename)") }; version => "1.0"; cache_system_functions => "false"; diff --git a/tests/acceptance/07_packages/004.cf b/tests/acceptance/07_packages/004.cf index 4baf261f30..faf34322d9 100644 --- a/tests/acceptance/07_packages/004.cf +++ b/tests/acceptance/07_packages/004.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { "G", "g", default("$(this.promise_filename)") }; version => "1.0"; cache_system_functions => "false"; diff --git a/tests/acceptance/07_packages/005.cf b/tests/acceptance/07_packages/005.cf index 9147b167d2..c6c810897a 100644 --- a/tests/acceptance/07_packages/005.cf +++ b/tests/acceptance/07_packages/005.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { "G", "g", default("$(this.promise_filename)") }; version => "1.0"; cache_system_functions => "false"; diff --git a/tests/acceptance/07_packages/006.cf b/tests/acceptance/07_packages/006.cf index 8d171f03fc..bd7d463404 100644 --- a/tests/acceptance/07_packages/006.cf +++ b/tests/acceptance/07_packages/006.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { "G", "g", default("$(this.promise_filename)") }; version => "1.0"; cache_system_functions => "false"; diff --git a/tests/acceptance/07_packages/800.cf b/tests/acceptance/07_packages/800.cf index a3e29e608a..91b4dc030e 100644 --- a/tests/acceptance/07_packages/800.cf +++ b/tests/acceptance/07_packages/800.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/900.cf b/tests/acceptance/07_packages/900.cf index ad7ea787c8..a7c6cc19db 100644 --- a/tests/acceptance/07_packages/900.cf +++ b/tests/acceptance/07_packages/900.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/901.cf b/tests/acceptance/07_packages/901.cf index ab364ad562..34e195ceb8 100644 --- a/tests/acceptance/07_packages/901.cf +++ b/tests/acceptance/07_packages/901.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/902.cf b/tests/acceptance/07_packages/902.cf index d64550fd1a..ef9e7a500d 100644 --- a/tests/acceptance/07_packages/902.cf +++ b/tests/acceptance/07_packages/902.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/903.cf b/tests/acceptance/07_packages/903.cf index 058203b1ef..4bd3b945d3 100644 --- a/tests/acceptance/07_packages/903.cf +++ b/tests/acceptance/07_packages/903.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/904.cf b/tests/acceptance/07_packages/904.cf index 7509106bf8..750ca68716 100644 --- a/tests/acceptance/07_packages/904.cf +++ b/tests/acceptance/07_packages/904.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/905.cf b/tests/acceptance/07_packages/905.cf index c537e9de79..fd2863a7e7 100644 --- a/tests/acceptance/07_packages/905.cf +++ b/tests/acceptance/07_packages/905.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/906.cf b/tests/acceptance/07_packages/906.cf index 1a54b37abc..ad5c5d1768 100644 --- a/tests/acceptance/07_packages/906.cf +++ b/tests/acceptance/07_packages/906.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/907.cf b/tests/acceptance/07_packages/907.cf index 8d83361ced..c471d7ee82 100644 --- a/tests/acceptance/07_packages/907.cf +++ b/tests/acceptance/07_packages/907.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/908.cf b/tests/acceptance/07_packages/908.cf index 93fc806120..96682dc93c 100644 --- a/tests/acceptance/07_packages/908.cf +++ b/tests/acceptance/07_packages/908.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/contradicting-bodies-and-promises.cf b/tests/acceptance/07_packages/contradicting-bodies-and-promises.cf index 39b11d839d..8c55b709b2 100644 --- a/tests/acceptance/07_packages/contradicting-bodies-and-promises.cf +++ b/tests/acceptance/07_packages/contradicting-bodies-and-promises.cf @@ -5,7 +5,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/custom-version-compare.cf b/tests/acceptance/07_packages/custom-version-compare.cf index ef717b50bc..eac74b342f 100644 --- a/tests/acceptance/07_packages/custom-version-compare.cf +++ b/tests/acceptance/07_packages/custom-version-compare.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/default-list-architectures-different.cf b/tests/acceptance/07_packages/default-list-architectures-different.cf index dd42c96b26..50229b5873 100644 --- a/tests/acceptance/07_packages/default-list-architectures-different.cf +++ b/tests/acceptance/07_packages/default-list-architectures-different.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/default-list-architectures-same.cf b/tests/acceptance/07_packages/default-list-architectures-same.cf index af6a5c6092..f71fd771ca 100644 --- a/tests/acceptance/07_packages/default-list-architectures-same.cf +++ b/tests/acceptance/07_packages/default-list-architectures-same.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/default_package_module.cf b/tests/acceptance/07_packages/default_package_module.cf index d06e1382ce..187ffb06e9 100644 --- a/tests/acceptance/07_packages/default_package_module.cf +++ b/tests/acceptance/07_packages/default_package_module.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; package_module => test_module; # important! part of this specific test } diff --git a/tests/acceptance/07_packages/dependency-checks-package_delete_command.cf b/tests/acceptance/07_packages/dependency-checks-package_delete_command.cf index 7f2f077fae..53301c2a9b 100644 --- a/tests/acceptance/07_packages/dependency-checks-package_delete_command.cf +++ b/tests/acceptance/07_packages/dependency-checks-package_delete_command.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/dependency-checks-package_list_command.cf b/tests/acceptance/07_packages/dependency-checks-package_list_command.cf index e7ab3be084..e9d61ef528 100644 --- a/tests/acceptance/07_packages/dependency-checks-package_list_command.cf +++ b/tests/acceptance/07_packages/dependency-checks-package_list_command.cf @@ -13,7 +13,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/dependency-checks-package_patch_command.cf b/tests/acceptance/07_packages/dependency-checks-package_patch_command.cf index f35025adbc..699883497e 100644 --- a/tests/acceptance/07_packages/dependency-checks-package_patch_command.cf +++ b/tests/acceptance/07_packages/dependency-checks-package_patch_command.cf @@ -11,7 +11,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/dependency-checks-package_patch_list_command.cf b/tests/acceptance/07_packages/dependency-checks-package_patch_list_command.cf index b37689cc4f..c86e4c2bcc 100644 --- a/tests/acceptance/07_packages/dependency-checks-package_patch_list_command.cf +++ b/tests/acceptance/07_packages/dependency-checks-package_patch_list_command.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/dependency-checks-package_verify_command.cf b/tests/acceptance/07_packages/dependency-checks-package_verify_command.cf index 7ce789d662..8cd768c215 100644 --- a/tests/acceptance/07_packages/dependency-checks-package_verify_command.cf +++ b/tests/acceptance/07_packages/dependency-checks-package_verify_command.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/dry-run-install.cf b/tests/acceptance/07_packages/dry-run-install.cf index 6be330f4a3..a35865bff0 100644 --- a/tests/acceptance/07_packages/dry-run-install.cf +++ b/tests/acceptance/07_packages/dry-run-install.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/dry-run-install.cf.sub b/tests/acceptance/07_packages/dry-run-install.cf.sub index 5b8adf9433..0bb1064bae 100644 --- a/tests/acceptance/07_packages/dry-run-install.cf.sub +++ b/tests/acceptance/07_packages/dry-run-install.cf.sub @@ -2,7 +2,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { "test" }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/has-default-no-list-architectures.cf b/tests/acceptance/07_packages/has-default-no-list-architectures.cf index c137eeefc2..60dbc78f86 100644 --- a/tests/acceptance/07_packages/has-default-no-list-architectures.cf +++ b/tests/acceptance/07_packages/has-default-no-list-architectures.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/list-architecture.cf b/tests/acceptance/07_packages/list-architecture.cf index 03e5cd2af9..169eff1e59 100644 --- a/tests/acceptance/07_packages/list-architecture.cf +++ b/tests/acceptance/07_packages/list-architecture.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/no-architectures.cf b/tests/acceptance/07_packages/no-architectures.cf index 222bbe8057..fa0f8e34f0 100644 --- a/tests/acceptance/07_packages/no-architectures.cf +++ b/tests/acceptance/07_packages/no-architectures.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/package_commands_useshell.cf b/tests/acceptance/07_packages/package_commands_useshell.cf index 265a1ad620..fa3f87edf3 100644 --- a/tests/acceptance/07_packages/package_commands_useshell.cf +++ b/tests/acceptance/07_packages/package_commands_useshell.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/package_module_interpreter.cf b/tests/acceptance/07_packages/package_module_interpreter.cf index 86ef4c5259..ec19aea99a 100644 --- a/tests/acceptance/07_packages/package_module_interpreter.cf +++ b/tests/acceptance/07_packages/package_module_interpreter.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/07_packages/package_module_path.cf b/tests/acceptance/07_packages/package_module_path.cf index 7590bd64fb..00b9080446 100644 --- a/tests/acceptance/07_packages/package_module_path.cf +++ b/tests/acceptance/07_packages/package_module_path.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/07_packages/packages_command.cf b/tests/acceptance/07_packages/packages_command.cf index 4bece4865f..e0303c075c 100644 --- a/tests/acceptance/07_packages/packages_command.cf +++ b/tests/acceptance/07_packages/packages_command.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { "G", "g", default("$(this.promise_filename)") }; version => "1.0"; cache_system_functions => "false"; diff --git a/tests/acceptance/07_packages/repositories.cf b/tests/acceptance/07_packages/repositories.cf index 13f6802c12..80b352bd3e 100644 --- a/tests/acceptance/07_packages/repositories.cf +++ b/tests/acceptance/07_packages/repositories.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/07_packages/repositories.cf.sub b/tests/acceptance/07_packages/repositories.cf.sub index d68e64102a..30ab077c9b 100644 --- a/tests/acceptance/07_packages/repositories.cf.sub +++ b/tests/acceptance/07_packages/repositories.cf.sub @@ -2,7 +2,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { "init", "test" }; version => "1.0"; diff --git a/tests/acceptance/07_packages/upgrade-package-version.cf b/tests/acceptance/07_packages/upgrade-package-version.cf index e9fa7c334d..4d4b0e592a 100644 --- a/tests/acceptance/07_packages/upgrade-package-version.cf +++ b/tests/acceptance/07_packages/upgrade-package-version.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/07_packages/upgrade-package.cf b/tests/acceptance/07_packages/upgrade-package.cf index 5cda789ee3..1ff89c5216 100644 --- a/tests/acceptance/07_packages/upgrade-package.cf +++ b/tests/acceptance/07_packages/upgrade-package.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/07_packages/warn-package-delete-non-existing.cf b/tests/acceptance/07_packages/warn-package-delete-non-existing.cf index 0d71f09fc0..db4424bce5 100644 --- a/tests/acceptance/07_packages/warn-package-delete-non-existing.cf +++ b/tests/acceptance/07_packages/warn-package-delete-non-existing.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/warn-package-delete.cf b/tests/acceptance/07_packages/warn-package-delete.cf index 421cd8a18b..4a375910de 100644 --- a/tests/acceptance/07_packages/warn-package-delete.cf +++ b/tests/acceptance/07_packages/warn-package-delete.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/07_packages/warn-package-delete.cf.sub b/tests/acceptance/07_packages/warn-package-delete.cf.sub index 4671f656c2..09ba55b740 100644 --- a/tests/acceptance/07_packages/warn-package-delete.cf.sub +++ b/tests/acceptance/07_packages/warn-package-delete.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { "test_warn_delete_pkg" }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/001.cf b/tests/acceptance/08_commands/01_modules/001.cf index 83f2886a75..788934d5b8 100644 --- a/tests/acceptance/08_commands/01_modules/001.cf +++ b/tests/acceptance/08_commands/01_modules/001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub", "../../plucked.sub.cf" }; + inputs => { "../../default.sub.cf", "../../plucked.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/002.cf b/tests/acceptance/08_commands/01_modules/002.cf index 0ddfa2f745..6028aa897e 100644 --- a/tests/acceptance/08_commands/01_modules/002.cf +++ b/tests/acceptance/08_commands/01_modules/002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub", "../../plucked.sub.cf" }; + inputs => { "../../default.sub.cf", "../../plucked.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/003.cf b/tests/acceptance/08_commands/01_modules/003.cf index aaf727710c..2d7e50f9ff 100644 --- a/tests/acceptance/08_commands/01_modules/003.cf +++ b/tests/acceptance/08_commands/01_modules/003.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub", "../../plucked.sub.cf" }; + inputs => { "../../default.sub.cf", "../../plucked.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/004.cf b/tests/acceptance/08_commands/01_modules/004.cf index 02878ebf20..72a18a4a5b 100644 --- a/tests/acceptance/08_commands/01_modules/004.cf +++ b/tests/acceptance/08_commands/01_modules/004.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub", "../../plucked.sub.cf" }; + inputs => { "../../default.sub.cf", "../../plucked.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/classes-automatically-canonified.cf b/tests/acceptance/08_commands/01_modules/classes-automatically-canonified.cf index e94b027d63..cfdbde8727 100644 --- a/tests/acceptance/08_commands/01_modules/classes-automatically-canonified.cf +++ b/tests/acceptance/08_commands/01_modules/classes-automatically-canonified.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/long-module-lines.cf b/tests/acceptance/08_commands/01_modules/long-module-lines.cf index b0535649a3..39784b3064 100644 --- a/tests/acceptance/08_commands/01_modules/long-module-lines.cf +++ b/tests/acceptance/08_commands/01_modules/long-module-lines.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/module-array-allows-at.cf b/tests/acceptance/08_commands/01_modules/module-array-allows-at.cf index d3fa859c39..322122d775 100644 --- a/tests/acceptance/08_commands/01_modules/module-array-allows-at.cf +++ b/tests/acceptance/08_commands/01_modules/module-array-allows-at.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/module-array-allows-slash.cf b/tests/acceptance/08_commands/01_modules/module-array-allows-slash.cf index dfe1a565ed..f561d2d12e 100644 --- a/tests/acceptance/08_commands/01_modules/module-array-allows-slash.cf +++ b/tests/acceptance/08_commands/01_modules/module-array-allows-slash.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/module-array-indexing.cf b/tests/acceptance/08_commands/01_modules/module-array-indexing.cf index 9082c2e564..5402c0b0f5 100644 --- a/tests/acceptance/08_commands/01_modules/module-array-indexing.cf +++ b/tests/acceptance/08_commands/01_modules/module-array-indexing.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/module_allows_empty_lists.cf b/tests/acceptance/08_commands/01_modules/module_allows_empty_lists.cf index 531f318e0a..4bf8b64b85 100644 --- a/tests/acceptance/08_commands/01_modules/module_allows_empty_lists.cf +++ b/tests/acceptance/08_commands/01_modules/module_allows_empty_lists.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/module_allows_trailing_comma.cf b/tests/acceptance/08_commands/01_modules/module_allows_trailing_comma.cf index e430904f31..26e70d648d 100644 --- a/tests/acceptance/08_commands/01_modules/module_allows_trailing_comma.cf +++ b/tests/acceptance/08_commands/01_modules/module_allows_trailing_comma.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/module_file_test.cf b/tests/acceptance/08_commands/01_modules/module_file_test.cf index 958dd7868e..c001a6e8e4 100644 --- a/tests/acceptance/08_commands/01_modules/module_file_test.cf +++ b/tests/acceptance/08_commands/01_modules/module_file_test.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/module_with_no_output.cf b/tests/acceptance/08_commands/01_modules/module_with_no_output.cf index 751bdb58f9..456b52f144 100644 --- a/tests/acceptance/08_commands/01_modules/module_with_no_output.cf +++ b/tests/acceptance/08_commands/01_modules/module_with_no_output.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; } diff --git a/tests/acceptance/08_commands/01_modules/module_with_no_output.cf.sub b/tests/acceptance/08_commands/01_modules/module_with_no_output.cf.sub index c7cd6ffae1..530cb24bd9 100644 --- a/tests/acceptance/08_commands/01_modules/module_with_no_output.cf.sub +++ b/tests/acceptance/08_commands/01_modules/module_with_no_output.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; } diff --git a/tests/acceptance/08_commands/01_modules/set-context.cf b/tests/acceptance/08_commands/01_modules/set-context.cf index a8ce40a305..41d3485099 100644 --- a/tests/acceptance/08_commands/01_modules/set-context.cf +++ b/tests/acceptance/08_commands/01_modules/set-context.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub", "../../plucked.sub.cf" }; + inputs => { "../../default.sub.cf", "../../plucked.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/set-persistent-class.cf b/tests/acceptance/08_commands/01_modules/set-persistent-class.cf index c28f389894..ba008cd556 100644 --- a/tests/acceptance/08_commands/01_modules/set-persistent-class.cf +++ b/tests/acceptance/08_commands/01_modules/set-persistent-class.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub", "../../plucked.sub.cf" }; + inputs => { "../../default.sub.cf", "../../plucked.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/set-persistent-class.cf.sub b/tests/acceptance/08_commands/01_modules/set-persistent-class.cf.sub index d61095c635..6e1582647f 100644 --- a/tests/acceptance/08_commands/01_modules/set-persistent-class.cf.sub +++ b/tests/acceptance/08_commands/01_modules/set-persistent-class.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } bundle agent main diff --git a/tests/acceptance/08_commands/01_modules/set-tags.cf b/tests/acceptance/08_commands/01_modules/set-tags.cf index 7bd1a78301..321728d498 100644 --- a/tests/acceptance/08_commands/01_modules/set-tags.cf +++ b/tests/acceptance/08_commands/01_modules/set-tags.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub", "../../plucked.sub.cf" }; + inputs => { "../../default.sub.cf", "../../plucked.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/vars-from-module-have-source-and-derived_from-tags.cf b/tests/acceptance/08_commands/01_modules/vars-from-module-have-source-and-derived_from-tags.cf index 8613165425..c0fdf6750a 100644 --- a/tests/acceptance/08_commands/01_modules/vars-from-module-have-source-and-derived_from-tags.cf +++ b/tests/acceptance/08_commands/01_modules/vars-from-module-have-source-and-derived_from-tags.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub", "../../plucked.sub.cf" }; + inputs => { "../../default.sub.cf", "../../plucked.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/01_modules/vars-without-explicit-tags-do-not-segfault.cf b/tests/acceptance/08_commands/01_modules/vars-without-explicit-tags-do-not-segfault.cf index 45443f2785..81addecc20 100644 --- a/tests/acceptance/08_commands/01_modules/vars-without-explicit-tags-do-not-segfault.cf +++ b/tests/acceptance/08_commands/01_modules/vars-without-explicit-tags-do-not-segfault.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub", "../../plucked.sub.cf" }; + inputs => { "../../default.sub.cf", "../../plucked.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/02_syntax/arglist.cf b/tests/acceptance/08_commands/02_syntax/arglist.cf index 7ac630f5fb..caec4c2634 100644 --- a/tests/acceptance/08_commands/02_syntax/arglist.cf +++ b/tests/acceptance/08_commands/02_syntax/arglist.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/02_syntax/staging/001.cf b/tests/acceptance/08_commands/02_syntax/staging/001.cf index b12ec95474..d86978c00e 100644 --- a/tests/acceptance/08_commands/02_syntax/staging/001.cf +++ b/tests/acceptance/08_commands/02_syntax/staging/001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/03_shells/shelltypes.cf b/tests/acceptance/08_commands/03_shells/shelltypes.cf index 2e5f28255a..d3368b5c62 100644 --- a/tests/acceptance/08_commands/03_shells/shelltypes.cf +++ b/tests/acceptance/08_commands/03_shells/shelltypes.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/03_shells/tryshell.cf.sub b/tests/acceptance/08_commands/03_shells/tryshell.cf.sub index 6edc1c9b39..1fe5041e48 100644 --- a/tests/acceptance/08_commands/03_shells/tryshell.cf.sub +++ b/tests/acceptance/08_commands/03_shells/tryshell.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "init", "test" }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/arglist.cf b/tests/acceptance/08_commands/arglist.cf index 8b344e1321..c1de8e7a7b 100644 --- a/tests/acceptance/08_commands/arglist.cf +++ b/tests/acceptance/08_commands/arglist.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/08_commands/staging/default_failed_returncodes.cf b/tests/acceptance/08_commands/staging/default_failed_returncodes.cf index 8817f01daf..ea3f389ccd 100644 --- a/tests/acceptance/08_commands/staging/default_failed_returncodes.cf +++ b/tests/acceptance/08_commands/staging/default_failed_returncodes.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } @@ -37,4 +37,3 @@ body classes scoped_classes_generic_kept_0(scope, x) #repaired_returncodes => { "2" }; #failed_returncodes => { "1" }; } - diff --git a/tests/acceptance/09_services/custom.cf b/tests/acceptance/09_services/custom.cf index 0830031e72..947b832678 100644 --- a/tests/acceptance/09_services/custom.cf +++ b/tests/acceptance/09_services/custom.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/09_services/disable.cf b/tests/acceptance/09_services/disable.cf index ad8d97aa1d..45f5403f5a 100644 --- a/tests/acceptance/09_services/disable.cf +++ b/tests/acceptance/09_services/disable.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/09_services/enable.cf b/tests/acceptance/09_services/enable.cf index 86445a1963..8af371a1dd 100644 --- a/tests/acceptance/09_services/enable.cf +++ b/tests/acceptance/09_services/enable.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/09_services/outcomes.cf b/tests/acceptance/09_services/outcomes.cf index fca336d67a..a3601c43fc 100644 --- a/tests/acceptance/09_services/outcomes.cf +++ b/tests/acceptance/09_services/outcomes.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/09_services/reload.cf b/tests/acceptance/09_services/reload.cf index 058b011fa8..796c15dc43 100644 --- a/tests/acceptance/09_services/reload.cf +++ b/tests/acceptance/09_services/reload.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/09_services/restart.cf b/tests/acceptance/09_services/restart.cf index 167557cd91..66bb308999 100644 --- a/tests/acceptance/09_services/restart.cf +++ b/tests/acceptance/09_services/restart.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/09_services/service_cannot_be_resolved.cf b/tests/acceptance/09_services/service_cannot_be_resolved.cf index 48161dd1d9..2df6bd3f9f 100644 --- a/tests/acceptance/09_services/service_cannot_be_resolved.cf +++ b/tests/acceptance/09_services/service_cannot_be_resolved.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/09_services/service_cannot_be_resolved.cf.sub b/tests/acceptance/09_services/service_cannot_be_resolved.cf.sub index a975643633..9498c3ef76 100644 --- a/tests/acceptance/09_services/service_cannot_be_resolved.cf.sub +++ b/tests/acceptance/09_services/service_cannot_be_resolved.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { test }; } diff --git a/tests/acceptance/09_services/standard_services-from-non-default-namespace.cf b/tests/acceptance/09_services/standard_services-from-non-default-namespace.cf index 015b0a2ced..2d318b03cb 100644 --- a/tests/acceptance/09_services/standard_services-from-non-default-namespace.cf +++ b/tests/acceptance/09_services/standard_services-from-non-default-namespace.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/09_services/start.cf b/tests/acceptance/09_services/start.cf index 9a9d9b7b86..f4230d03de 100644 --- a/tests/acceptance/09_services/start.cf +++ b/tests/acceptance/09_services/start.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/09_services/stop.cf b/tests/acceptance/09_services/stop.cf index 212be2b2ff..845d6deea1 100644 --- a/tests/acceptance/09_services/stop.cf +++ b/tests/acceptance/09_services/stop.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/01_create/001.cf b/tests/acceptance/10_files/01_create/001.cf index 9f7f7a0c51..2505144f9a 100644 --- a/tests/acceptance/10_files/01_create/001.cf +++ b/tests/acceptance/10_files/01_create/001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/01_create/002.cf b/tests/acceptance/10_files/01_create/002.cf index a933c790d5..32b69866c8 100644 --- a/tests/acceptance/10_files/01_create/002.cf +++ b/tests/acceptance/10_files/01_create/002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/01_create/003.cf b/tests/acceptance/10_files/01_create/003.cf index 502159a1cf..7ac3c55738 100644 --- a/tests/acceptance/10_files/01_create/003.cf +++ b/tests/acceptance/10_files/01_create/003.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/01_create/004.cf b/tests/acceptance/10_files/01_create/004.cf index 4f0015787d..125fd53b2a 100644 --- a/tests/acceptance/10_files/01_create/004.cf +++ b/tests/acceptance/10_files/01_create/004.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/01_create/005.cf b/tests/acceptance/10_files/01_create/005.cf index cadc51e1af..cd7101886a 100644 --- a/tests/acceptance/10_files/01_create/005.cf +++ b/tests/acceptance/10_files/01_create/005.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/01_create/006.cf b/tests/acceptance/10_files/01_create/006.cf index 801b1298c7..475dfd4b2d 100644 --- a/tests/acceptance/10_files/01_create/006.cf +++ b/tests/acceptance/10_files/01_create/006.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/01_create/007.cf b/tests/acceptance/10_files/01_create/007.cf index dbccba68ad..4f6df4d3c3 100644 --- a/tests/acceptance/10_files/01_create/007.cf +++ b/tests/acceptance/10_files/01_create/007.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/01_create/008.cf b/tests/acceptance/10_files/01_create/008.cf index 9a17e517fb..8410d13ae8 100644 --- a/tests/acceptance/10_files/01_create/008.cf +++ b/tests/acceptance/10_files/01_create/008.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/01_create/009.cf b/tests/acceptance/10_files/01_create/009.cf index cc45ed8152..944cce6835 100644 --- a/tests/acceptance/10_files/01_create/009.cf +++ b/tests/acceptance/10_files/01_create/009.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/01_create/010.cf b/tests/acceptance/10_files/01_create/010.cf index 3600663df7..26ad14ecf0 100644 --- a/tests/acceptance/10_files/01_create/010.cf +++ b/tests/acceptance/10_files/01_create/010.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/01_create/011.cf b/tests/acceptance/10_files/01_create/011.cf index aa20fc59e1..26fd7c1e36 100644 --- a/tests/acceptance/10_files/01_create/011.cf +++ b/tests/acceptance/10_files/01_create/011.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/01_create/012.cf b/tests/acceptance/10_files/01_create/012.cf index ec9f49d929..7ec52ffc13 100644 --- a/tests/acceptance/10_files/01_create/012.cf +++ b/tests/acceptance/10_files/01_create/012.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/01_create/013.cf b/tests/acceptance/10_files/01_create/013.cf index 3cfbc7820a..8fb5e46ee9 100644 --- a/tests/acceptance/10_files/01_create/013.cf +++ b/tests/acceptance/10_files/01_create/013.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/01_create/cfengine_create_by_default.cf b/tests/acceptance/10_files/01_create/cfengine_create_by_default.cf index 7c0ac6e174..9bd4dafc3f 100644 --- a/tests/acceptance/10_files/01_create/cfengine_create_by_default.cf +++ b/tests/acceptance/10_files/01_create/cfengine_create_by_default.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/01_create/content_create_by_default.cf b/tests/acceptance/10_files/01_create/content_create_by_default.cf index 3d9ddb3dc8..6f5d63501e 100644 --- a/tests/acceptance/10_files/01_create/content_create_by_default.cf +++ b/tests/acceptance/10_files/01_create/content_create_by_default.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/01_create/copy_and_purge.cf b/tests/acceptance/10_files/01_create/copy_and_purge.cf index d184a285b0..651c8fd379 100644 --- a/tests/acceptance/10_files/01_create/copy_and_purge.cf +++ b/tests/acceptance/10_files/01_create/copy_and_purge.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/01_create/directory_with_trailing_slash.cf b/tests/acceptance/10_files/01_create/directory_with_trailing_slash.cf index 2a6b9751d4..67acca2daf 100644 --- a/tests/acceptance/10_files/01_create/directory_with_trailing_slash.cf +++ b/tests/acceptance/10_files/01_create/directory_with_trailing_slash.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/01_create/mustache_create_by_default.cf b/tests/acceptance/10_files/01_create/mustache_create_by_default.cf index 90af9518a8..8284660292 100644 --- a/tests/acceptance/10_files/01_create/mustache_create_by_default.cf +++ b/tests/acceptance/10_files/01_create/mustache_create_by_default.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/01_create/perms-mode.cf b/tests/acceptance/10_files/01_create/perms-mode.cf index d86cdb8594..cf8c5c2b13 100644 --- a/tests/acceptance/10_files/01_create/perms-mode.cf +++ b/tests/acceptance/10_files/01_create/perms-mode.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/001.cf b/tests/acceptance/10_files/02_maintain/001.cf index ae1482af9c..405af8791b 100644 --- a/tests/acceptance/10_files/02_maintain/001.cf +++ b/tests/acceptance/10_files/02_maintain/001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/002.cf b/tests/acceptance/10_files/02_maintain/002.cf index 67a1f9ebd0..ad4993f339 100644 --- a/tests/acceptance/10_files/02_maintain/002.cf +++ b/tests/acceptance/10_files/02_maintain/002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/003.cf b/tests/acceptance/10_files/02_maintain/003.cf index ef4bbcff78..19d5bc9542 100644 --- a/tests/acceptance/10_files/02_maintain/003.cf +++ b/tests/acceptance/10_files/02_maintain/003.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/004.cf b/tests/acceptance/10_files/02_maintain/004.cf index 77523864ad..cfd97f8438 100644 --- a/tests/acceptance/10_files/02_maintain/004.cf +++ b/tests/acceptance/10_files/02_maintain/004.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/005.cf b/tests/acceptance/10_files/02_maintain/005.cf index d7854d438f..fef9c2dd8d 100644 --- a/tests/acceptance/10_files/02_maintain/005.cf +++ b/tests/acceptance/10_files/02_maintain/005.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/006.cf b/tests/acceptance/10_files/02_maintain/006.cf index 0cb520202b..8bdac10f73 100644 --- a/tests/acceptance/10_files/02_maintain/006.cf +++ b/tests/acceptance/10_files/02_maintain/006.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/007.cf b/tests/acceptance/10_files/02_maintain/007.cf index 9752a459aa..3e995a7fb3 100644 --- a/tests/acceptance/10_files/02_maintain/007.cf +++ b/tests/acceptance/10_files/02_maintain/007.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/008.cf b/tests/acceptance/10_files/02_maintain/008.cf index f23fd4d742..233268c85a 100644 --- a/tests/acceptance/10_files/02_maintain/008.cf +++ b/tests/acceptance/10_files/02_maintain/008.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/009.cf b/tests/acceptance/10_files/02_maintain/009.cf index 7985665dda..364dd11e56 100644 --- a/tests/acceptance/10_files/02_maintain/009.cf +++ b/tests/acceptance/10_files/02_maintain/009.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/010.cf b/tests/acceptance/10_files/02_maintain/010.cf index 1bac08e030..0b2225aa4e 100644 --- a/tests/acceptance/10_files/02_maintain/010.cf +++ b/tests/acceptance/10_files/02_maintain/010.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/011.cf b/tests/acceptance/10_files/02_maintain/011.cf index 4528327df2..dc651c6130 100644 --- a/tests/acceptance/10_files/02_maintain/011.cf +++ b/tests/acceptance/10_files/02_maintain/011.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/012.cf b/tests/acceptance/10_files/02_maintain/012.cf index cff3d2e61c..7ec8384ef9 100644 --- a/tests/acceptance/10_files/02_maintain/012.cf +++ b/tests/acceptance/10_files/02_maintain/012.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/013.cf b/tests/acceptance/10_files/02_maintain/013.cf index 6351ed1a16..8d2fc3543d 100644 --- a/tests/acceptance/10_files/02_maintain/013.cf +++ b/tests/acceptance/10_files/02_maintain/013.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/015.cf b/tests/acceptance/10_files/02_maintain/015.cf index c7b4c517db..eb327a409f 100644 --- a/tests/acceptance/10_files/02_maintain/015.cf +++ b/tests/acceptance/10_files/02_maintain/015.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/016.cf b/tests/acceptance/10_files/02_maintain/016.cf index 3bacebe06d..83a03f64f2 100644 --- a/tests/acceptance/10_files/02_maintain/016.cf +++ b/tests/acceptance/10_files/02_maintain/016.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/017.cf b/tests/acceptance/10_files/02_maintain/017.cf index 45646e761c..dd8c627b02 100644 --- a/tests/acceptance/10_files/02_maintain/017.cf +++ b/tests/acceptance/10_files/02_maintain/017.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/018.cf b/tests/acceptance/10_files/02_maintain/018.cf index fbfd023f95..7b58b3fb51 100644 --- a/tests/acceptance/10_files/02_maintain/018.cf +++ b/tests/acceptance/10_files/02_maintain/018.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/019.cf b/tests/acceptance/10_files/02_maintain/019.cf index 93b5865a87..5cbe1a4772 100644 --- a/tests/acceptance/10_files/02_maintain/019.cf +++ b/tests/acceptance/10_files/02_maintain/019.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/101.cf b/tests/acceptance/10_files/02_maintain/101.cf index f182e6caf4..addbc4677f 100644 --- a/tests/acceptance/10_files/02_maintain/101.cf +++ b/tests/acceptance/10_files/02_maintain/101.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/102.cf b/tests/acceptance/10_files/02_maintain/102.cf index f44438d8fc..2e07a7881a 100644 --- a/tests/acceptance/10_files/02_maintain/102.cf +++ b/tests/acceptance/10_files/02_maintain/102.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/103.cf b/tests/acceptance/10_files/02_maintain/103.cf index 4cf7b9acd6..016dcc70cf 100644 --- a/tests/acceptance/10_files/02_maintain/103.cf +++ b/tests/acceptance/10_files/02_maintain/103.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/104.cf b/tests/acceptance/10_files/02_maintain/104.cf index b8752f3661..f98fc1dbae 100644 --- a/tests/acceptance/10_files/02_maintain/104.cf +++ b/tests/acceptance/10_files/02_maintain/104.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/105.cf b/tests/acceptance/10_files/02_maintain/105.cf index e70c9957ee..0a0d5b63dd 100644 --- a/tests/acceptance/10_files/02_maintain/105.cf +++ b/tests/acceptance/10_files/02_maintain/105.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/106.x.cf b/tests/acceptance/10_files/02_maintain/106.x.cf index 4c92238e6f..6124a068e0 100644 --- a/tests/acceptance/10_files/02_maintain/106.x.cf +++ b/tests/acceptance/10_files/02_maintain/106.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/111.x.cf b/tests/acceptance/10_files/02_maintain/111.x.cf index f4192ced8d..bee12c7138 100644 --- a/tests/acceptance/10_files/02_maintain/111.x.cf +++ b/tests/acceptance/10_files/02_maintain/111.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/112.cf b/tests/acceptance/10_files/02_maintain/112.cf index 4e7bf560c3..e9dec3ec1e 100644 --- a/tests/acceptance/10_files/02_maintain/112.cf +++ b/tests/acceptance/10_files/02_maintain/112.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/113.cf b/tests/acceptance/10_files/02_maintain/113.cf index 07cef282b9..eac1549425 100644 --- a/tests/acceptance/10_files/02_maintain/113.cf +++ b/tests/acceptance/10_files/02_maintain/113.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/114.cf b/tests/acceptance/10_files/02_maintain/114.cf index a2542fbd0d..b389a0884c 100644 --- a/tests/acceptance/10_files/02_maintain/114.cf +++ b/tests/acceptance/10_files/02_maintain/114.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/201.cf b/tests/acceptance/10_files/02_maintain/201.cf index 204831cf52..673839cc5b 100644 --- a/tests/acceptance/10_files/02_maintain/201.cf +++ b/tests/acceptance/10_files/02_maintain/201.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/202.cf b/tests/acceptance/10_files/02_maintain/202.cf index 3a4744a9c3..e77de0fc9f 100644 --- a/tests/acceptance/10_files/02_maintain/202.cf +++ b/tests/acceptance/10_files/02_maintain/202.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/203.cf b/tests/acceptance/10_files/02_maintain/203.cf index e5b587d209..1af5be9879 100644 --- a/tests/acceptance/10_files/02_maintain/203.cf +++ b/tests/acceptance/10_files/02_maintain/203.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/204.cf b/tests/acceptance/10_files/02_maintain/204.cf index 50c18c986e..0927a0568a 100644 --- a/tests/acceptance/10_files/02_maintain/204.cf +++ b/tests/acceptance/10_files/02_maintain/204.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/205.cf b/tests/acceptance/10_files/02_maintain/205.cf index 91f5991a47..c0d01cbf7c 100644 --- a/tests/acceptance/10_files/02_maintain/205.cf +++ b/tests/acceptance/10_files/02_maintain/205.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; cache_system_functions => "false"; diff --git a/tests/acceptance/10_files/02_maintain/206.cf b/tests/acceptance/10_files/02_maintain/206.cf index 4faabe7e19..54c0d483c3 100644 --- a/tests/acceptance/10_files/02_maintain/206.cf +++ b/tests/acceptance/10_files/02_maintain/206.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; cache_system_functions => "false"; diff --git a/tests/acceptance/10_files/02_maintain/207.cf b/tests/acceptance/10_files/02_maintain/207.cf index e6139d1e8b..c08e51f08a 100644 --- a/tests/acceptance/10_files/02_maintain/207.cf +++ b/tests/acceptance/10_files/02_maintain/207.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; cache_system_functions => "false"; diff --git a/tests/acceptance/10_files/02_maintain/208.cf b/tests/acceptance/10_files/02_maintain/208.cf index 4c18272c3b..63bacdc9e2 100644 --- a/tests/acceptance/10_files/02_maintain/208.cf +++ b/tests/acceptance/10_files/02_maintain/208.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; cache_system_functions => "false"; diff --git a/tests/acceptance/10_files/02_maintain/209.cf b/tests/acceptance/10_files/02_maintain/209.cf index 4bbeea15ea..ace14c10e9 100644 --- a/tests/acceptance/10_files/02_maintain/209.cf +++ b/tests/acceptance/10_files/02_maintain/209.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; cache_system_functions => "false"; diff --git a/tests/acceptance/10_files/02_maintain/301.cf b/tests/acceptance/10_files/02_maintain/301.cf index 215b8af264..b233a258d1 100644 --- a/tests/acceptance/10_files/02_maintain/301.cf +++ b/tests/acceptance/10_files/02_maintain/301.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/403.x.cf b/tests/acceptance/10_files/02_maintain/403.x.cf index bbc33a385c..446911c9fc 100644 --- a/tests/acceptance/10_files/02_maintain/403.x.cf +++ b/tests/acceptance/10_files/02_maintain/403.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/404.x.cf b/tests/acceptance/10_files/02_maintain/404.x.cf index 1735f31ba7..49ae8606cb 100644 --- a/tests/acceptance/10_files/02_maintain/404.x.cf +++ b/tests/acceptance/10_files/02_maintain/404.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/406.x.cf b/tests/acceptance/10_files/02_maintain/406.x.cf index 9bf2008f20..fd7a40a86f 100644 --- a/tests/acceptance/10_files/02_maintain/406.x.cf +++ b/tests/acceptance/10_files/02_maintain/406.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/407.x.cf b/tests/acceptance/10_files/02_maintain/407.x.cf index 8f4a246287..f0c44ae5e6 100644 --- a/tests/acceptance/10_files/02_maintain/407.x.cf +++ b/tests/acceptance/10_files/02_maintain/407.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/408.cf b/tests/acceptance/10_files/02_maintain/408.cf index 0e33dc3fb5..fcba88aed3 100644 --- a/tests/acceptance/10_files/02_maintain/408.cf +++ b/tests/acceptance/10_files/02_maintain/408.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/409.cf b/tests/acceptance/10_files/02_maintain/409.cf index e2b41f1879..0633bb4692 100644 --- a/tests/acceptance/10_files/02_maintain/409.cf +++ b/tests/acceptance/10_files/02_maintain/409.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/410.cf b/tests/acceptance/10_files/02_maintain/410.cf index b2703b8601..ed178c8a4e 100644 --- a/tests/acceptance/10_files/02_maintain/410.cf +++ b/tests/acceptance/10_files/02_maintain/410.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/411.cf b/tests/acceptance/10_files/02_maintain/411.cf index af795fb9d2..7151204fe2 100644 --- a/tests/acceptance/10_files/02_maintain/411.cf +++ b/tests/acceptance/10_files/02_maintain/411.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/412.cf b/tests/acceptance/10_files/02_maintain/412.cf index f3a58cad4a..a70ee9fc35 100644 --- a/tests/acceptance/10_files/02_maintain/412.cf +++ b/tests/acceptance/10_files/02_maintain/412.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/412.cf.sub b/tests/acceptance/10_files/02_maintain/412.cf.sub index 312a5ea4b4..1f74d8c2b2 100644 --- a/tests/acceptance/10_files/02_maintain/412.cf.sub +++ b/tests/acceptance/10_files/02_maintain/412.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "test" }; } @@ -34,4 +34,3 @@ vars: insert_lines: "$(ns)"; } - diff --git a/tests/acceptance/10_files/02_maintain/413.cf b/tests/acceptance/10_files/02_maintain/413.cf index d3c5a91bc2..654475cfe7 100644 --- a/tests/acceptance/10_files/02_maintain/413.cf +++ b/tests/acceptance/10_files/02_maintain/413.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/413.cf.sub b/tests/acceptance/10_files/02_maintain/413.cf.sub index db94d6a8ad..270b90e56a 100644 --- a/tests/acceptance/10_files/02_maintain/413.cf.sub +++ b/tests/acceptance/10_files/02_maintain/413.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "test" }; } @@ -45,4 +45,3 @@ insert_lines: any:: "$(contents)"; } - diff --git a/tests/acceptance/10_files/02_maintain/414.cf b/tests/acceptance/10_files/02_maintain/414.cf index c0960b3e0b..b81012c621 100644 --- a/tests/acceptance/10_files/02_maintain/414.cf +++ b/tests/acceptance/10_files/02_maintain/414.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/414.cf.sub b/tests/acceptance/10_files/02_maintain/414.cf.sub index b0864052c6..0a9c296a19 100644 --- a/tests/acceptance/10_files/02_maintain/414.cf.sub +++ b/tests/acceptance/10_files/02_maintain/414.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "test" }; } @@ -33,4 +33,3 @@ vars: insert_lines: "$(ns)"; } - diff --git a/tests/acceptance/10_files/02_maintain/RM5411.cf b/tests/acceptance/10_files/02_maintain/RM5411.cf index 7529797949..0ab26a282e 100644 --- a/tests/acceptance/10_files/02_maintain/RM5411.cf +++ b/tests/acceptance/10_files/02_maintain/RM5411.cf @@ -1,7 +1,7 @@ # RedMine 5411: segfaults. -*- Mode: cfengine -*- body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/absolute_link_and_move_obstructions.cf b/tests/acceptance/10_files/02_maintain/absolute_link_and_move_obstructions.cf index 9827ecfae7..81339e24d0 100644 --- a/tests/acceptance/10_files/02_maintain/absolute_link_and_move_obstructions.cf +++ b/tests/acceptance/10_files/02_maintain/absolute_link_and_move_obstructions.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/absolute_link_and_no_move_obstructions.cf b/tests/acceptance/10_files/02_maintain/absolute_link_and_no_move_obstructions.cf index 9c196413db..f1107c9155 100644 --- a/tests/acceptance/10_files/02_maintain/absolute_link_and_no_move_obstructions.cf +++ b/tests/acceptance/10_files/02_maintain/absolute_link_and_no_move_obstructions.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/backup_repository.cf b/tests/acceptance/10_files/02_maintain/backup_repository.cf index 1795b22757..8b55e9a1f7 100644 --- a/tests/acceptance/10_files/02_maintain/backup_repository.cf +++ b/tests/acceptance/10_files/02_maintain/backup_repository.cf @@ -3,7 +3,7 @@ body common control { bundlesequence => { default("$(this.promise_filename)") }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } body agent control diff --git a/tests/acceptance/10_files/02_maintain/changes_depth_search.cf b/tests/acceptance/10_files/02_maintain/changes_depth_search.cf index 8844d9ef45..173538b87e 100644 --- a/tests/acceptance/10_files/02_maintain/changes_depth_search.cf +++ b/tests/acceptance/10_files/02_maintain/changes_depth_search.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../dcs.cf.sub", + inputs => { "../../dcs.sub.cf", "../../plucked.sub.cf", "check_file_changes_log.cf.sub", }; diff --git a/tests/acceptance/10_files/02_maintain/changes_depth_search.cf.sub b/tests/acceptance/10_files/02_maintain/changes_depth_search.cf.sub index 819958b798..828595e671 100644 --- a/tests/acceptance/10_files/02_maintain/changes_depth_search.cf.sub +++ b/tests/acceptance/10_files/02_maintain/changes_depth_search.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../dcs.cf.sub", + inputs => { "../../dcs.sub.cf", "../../plucked.sub.cf", }; bundlesequence => { "init", "test" }; diff --git a/tests/acceptance/10_files/02_maintain/changes_depth_search_last_file.cf b/tests/acceptance/10_files/02_maintain/changes_depth_search_last_file.cf index cd63676d96..a148ff4a91 100644 --- a/tests/acceptance/10_files/02_maintain/changes_depth_search_last_file.cf +++ b/tests/acceptance/10_files/02_maintain/changes_depth_search_last_file.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../dcs.cf.sub", + inputs => { "../../dcs.sub.cf", "../../plucked.sub.cf", "check_file_changes_log.cf.sub", }; diff --git a/tests/acceptance/10_files/02_maintain/changes_depth_search_last_file.cf.sub b/tests/acceptance/10_files/02_maintain/changes_depth_search_last_file.cf.sub index c5dfdaf34c..a014e896e7 100644 --- a/tests/acceptance/10_files/02_maintain/changes_depth_search_last_file.cf.sub +++ b/tests/acceptance/10_files/02_maintain/changes_depth_search_last_file.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../dcs.cf.sub", + inputs => { "../../dcs.sub.cf", "../../plucked.sub.cf", }; bundlesequence => { "init", "test" }; diff --git a/tests/acceptance/10_files/02_maintain/changes_promise_status.cf b/tests/acceptance/10_files/02_maintain/changes_promise_status.cf index 17a73109df..88be1d28ca 100644 --- a/tests/acceptance/10_files/02_maintain/changes_promise_status.cf +++ b/tests/acceptance/10_files/02_maintain/changes_promise_status.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/10_files/02_maintain/changes_update_hashes.cf b/tests/acceptance/10_files/02_maintain/changes_update_hashes.cf index a2f9479a79..e650f6ead3 100644 --- a/tests/acceptance/10_files/02_maintain/changes_update_hashes.cf +++ b/tests/acceptance/10_files/02_maintain/changes_update_hashes.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../default.cf.sub", "check_file_changes_log.cf.sub" }; + inputs => { "../../default.sub.cf", "check_file_changes_log.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/10_files/02_maintain/classes_on_delete.cf b/tests/acceptance/10_files/02_maintain/classes_on_delete.cf index eee8e1365c..bb2267b157 100644 --- a/tests/acceptance/10_files/02_maintain/classes_on_delete.cf +++ b/tests/acceptance/10_files/02_maintain/classes_on_delete.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/copy-relative-link-existing.cf b/tests/acceptance/10_files/02_maintain/copy-relative-link-existing.cf index 1ee5f67d40..19b5a5e31f 100644 --- a/tests/acceptance/10_files/02_maintain/copy-relative-link-existing.cf +++ b/tests/acceptance/10_files/02_maintain/copy-relative-link-existing.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/copy-relative-link.cf b/tests/acceptance/10_files/02_maintain/copy-relative-link.cf index 4736242837..5c0eebe244 100644 --- a/tests/acceptance/10_files/02_maintain/copy-relative-link.cf +++ b/tests/acceptance/10_files/02_maintain/copy-relative-link.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/copy_from_depth_search.cf b/tests/acceptance/10_files/02_maintain/copy_from_depth_search.cf index 2fc05589df..94116e9aad 100644 --- a/tests/acceptance/10_files/02_maintain/copy_from_depth_search.cf +++ b/tests/acceptance/10_files/02_maintain/copy_from_depth_search.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/copy_from_translatepath.cf b/tests/acceptance/10_files/02_maintain/copy_from_translatepath.cf index 9c072bc2e5..f97be13062 100644 --- a/tests/acceptance/10_files/02_maintain/copy_from_translatepath.cf +++ b/tests/acceptance/10_files/02_maintain/copy_from_translatepath.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/copy_linkpattern_from_contains_dots.cf b/tests/acceptance/10_files/02_maintain/copy_linkpattern_from_contains_dots.cf index 8c3643f8cc..16c3b93416 100644 --- a/tests/acceptance/10_files/02_maintain/copy_linkpattern_from_contains_dots.cf +++ b/tests/acceptance/10_files/02_maintain/copy_linkpattern_from_contains_dots.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/fifos.cf b/tests/acceptance/10_files/02_maintain/fifos.cf index 7e1fe09ab1..8996c5856d 100644 --- a/tests/acceptance/10_files/02_maintain/fifos.cf +++ b/tests/acceptance/10_files/02_maintain/fifos.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -40,5 +40,3 @@ bundle agent check "$(this.promise_filename) FAIL"; } - - diff --git a/tests/acceptance/10_files/02_maintain/line_truncation_at_4096_chars.cf b/tests/acceptance/10_files/02_maintain/line_truncation_at_4096_chars.cf index 79c4cc81cf..f72112abf8 100644 --- a/tests/acceptance/10_files/02_maintain/line_truncation_at_4096_chars.cf +++ b/tests/acceptance/10_files/02_maintain/line_truncation_at_4096_chars.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("${this.promise_filename}") }; version => "1.0"; cache_system_functions => "off"; diff --git a/tests/acceptance/10_files/02_maintain/perms_recurse.cf b/tests/acceptance/10_files/02_maintain/perms_recurse.cf index ef2dca9ba2..17b8ea91ca 100644 --- a/tests/acceptance/10_files/02_maintain/perms_recurse.cf +++ b/tests/acceptance/10_files/02_maintain/perms_recurse.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -94,5 +94,3 @@ body classes ok(classname) promise_repaired => { "$(classname)" }; promise_kept => { "$(classname)" }; } - - diff --git a/tests/acceptance/10_files/02_maintain/relative_link_and_move_obstructions.cf b/tests/acceptance/10_files/02_maintain/relative_link_and_move_obstructions.cf index 11bdce04a8..36f8ba6090 100644 --- a/tests/acceptance/10_files/02_maintain/relative_link_and_move_obstructions.cf +++ b/tests/acceptance/10_files/02_maintain/relative_link_and_move_obstructions.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/relative_link_and_no_move_obstructions.cf b/tests/acceptance/10_files/02_maintain/relative_link_and_no_move_obstructions.cf index 82e70a436a..9c4b57c639 100644 --- a/tests/acceptance/10_files/02_maintain/relative_link_and_no_move_obstructions.cf +++ b/tests/acceptance/10_files/02_maintain/relative_link_and_no_move_obstructions.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/staging/107.x.cf b/tests/acceptance/10_files/02_maintain/staging/107.x.cf index 1c771937e7..1ee0a63807 100644 --- a/tests/acceptance/10_files/02_maintain/staging/107.x.cf +++ b/tests/acceptance/10_files/02_maintain/staging/107.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/staging/108.x.cf b/tests/acceptance/10_files/02_maintain/staging/108.x.cf index 47687d333a..fc21a4be5a 100644 --- a/tests/acceptance/10_files/02_maintain/staging/108.x.cf +++ b/tests/acceptance/10_files/02_maintain/staging/108.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/staging/109.x.cf b/tests/acceptance/10_files/02_maintain/staging/109.x.cf index 111a3b20f4..18643085c1 100644 --- a/tests/acceptance/10_files/02_maintain/staging/109.x.cf +++ b/tests/acceptance/10_files/02_maintain/staging/109.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/staging/110.x.cf b/tests/acceptance/10_files/02_maintain/staging/110.x.cf index f943f0caf9..d9e6546100 100644 --- a/tests/acceptance/10_files/02_maintain/staging/110.x.cf +++ b/tests/acceptance/10_files/02_maintain/staging/110.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/staging/302.cf b/tests/acceptance/10_files/02_maintain/staging/302.cf index 235b3672a6..a97baaa9ab 100644 --- a/tests/acceptance/10_files/02_maintain/staging/302.cf +++ b/tests/acceptance/10_files/02_maintain/staging/302.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/staging/401.cf b/tests/acceptance/10_files/02_maintain/staging/401.cf index ff0272f8a8..c4d35681e3 100644 --- a/tests/acceptance/10_files/02_maintain/staging/401.cf +++ b/tests/acceptance/10_files/02_maintain/staging/401.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/staging/402.cf b/tests/acceptance/10_files/02_maintain/staging/402.cf index 4503c06b51..0fc20b4058 100644 --- a/tests/acceptance/10_files/02_maintain/staging/402.cf +++ b/tests/acceptance/10_files/02_maintain/staging/402.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/staging/405.cf b/tests/acceptance/10_files/02_maintain/staging/405.cf index 80fdf7501d..a95f641a4c 100644 --- a/tests/acceptance/10_files/02_maintain/staging/405.cf +++ b/tests/acceptance/10_files/02_maintain/staging/405.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/staging/copy-select-link-dereference.cf b/tests/acceptance/10_files/02_maintain/staging/copy-select-link-dereference.cf index c0bf4a72f0..723916e80e 100644 --- a/tests/acceptance/10_files/02_maintain/staging/copy-select-link-dereference.cf +++ b/tests/acceptance/10_files/02_maintain/staging/copy-select-link-dereference.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/staging/edit_immutable.cf b/tests/acceptance/10_files/02_maintain/staging/edit_immutable.cf index 0d8c719a56..47d863c42e 100644 --- a/tests/acceptance/10_files/02_maintain/staging/edit_immutable.cf +++ b/tests/acceptance/10_files/02_maintain/staging/edit_immutable.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/staging/line_truncation_at_4096_chars.cf b/tests/acceptance/10_files/02_maintain/staging/line_truncation_at_4096_chars.cf index 18f2a28978..70ee3742ed 100644 --- a/tests/acceptance/10_files/02_maintain/staging/line_truncation_at_4096_chars.cf +++ b/tests/acceptance/10_files/02_maintain/staging/line_truncation_at_4096_chars.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("${this.promise_filename}") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/symlink_link_and_no_move_obstructions.cf b/tests/acceptance/10_files/02_maintain/symlink_link_and_no_move_obstructions.cf index e6a1baf108..539b3dbf48 100644 --- a/tests/acceptance/10_files/02_maintain/symlink_link_and_no_move_obstructions.cf +++ b/tests/acceptance/10_files/02_maintain/symlink_link_and_no_move_obstructions.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/symlink_link_kept.cf b/tests/acceptance/10_files/02_maintain/symlink_link_kept.cf index ba112ae5ad..3d3ba346cf 100644 --- a/tests/acceptance/10_files/02_maintain/symlink_link_kept.cf +++ b/tests/acceptance/10_files/02_maintain/symlink_link_kept.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/02_maintain/touch.cf b/tests/acceptance/10_files/02_maintain/touch.cf index eb4d8fadb6..f5da1c0cb1 100644 --- a/tests/acceptance/10_files/02_maintain/touch.cf +++ b/tests/acceptance/10_files/02_maintain/touch.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/03_transform/001.cf b/tests/acceptance/10_files/03_transform/001.cf index 0adfc0681f..4feec0f1e4 100644 --- a/tests/acceptance/10_files/03_transform/001.cf +++ b/tests/acceptance/10_files/03_transform/001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/03_transform/002.cf b/tests/acceptance/10_files/03_transform/002.cf index b49e79bf33..7fb227822d 100644 --- a/tests/acceptance/10_files/03_transform/002.cf +++ b/tests/acceptance/10_files/03_transform/002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/03_transform/003.cf b/tests/acceptance/10_files/03_transform/003.cf index 589549e641..7c311b3df1 100644 --- a/tests/acceptance/10_files/03_transform/003.cf +++ b/tests/acceptance/10_files/03_transform/003.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; cache_system_functions => "off"; # for execresult in check bundle diff --git a/tests/acceptance/10_files/04_match/001.cf b/tests/acceptance/10_files/04_match/001.cf index d59b27840d..d27df4e5c3 100644 --- a/tests/acceptance/10_files/04_match/001.cf +++ b/tests/acceptance/10_files/04_match/001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/04_match/004.cf b/tests/acceptance/10_files/04_match/004.cf index 9f60b58a54..fd8eb327ff 100644 --- a/tests/acceptance/10_files/04_match/004.cf +++ b/tests/acceptance/10_files/04_match/004.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/04_match/008.cf b/tests/acceptance/10_files/04_match/008.cf index 6866a78cc3..9cb3c7139c 100644 --- a/tests/acceptance/10_files/04_match/008.cf +++ b/tests/acceptance/10_files/04_match/008.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/04_match/directory_can_not_readlink.cf b/tests/acceptance/10_files/04_match/directory_can_not_readlink.cf index 96febd5204..1a9ddbd9c9 100644 --- a/tests/acceptance/10_files/04_match/directory_can_not_readlink.cf +++ b/tests/acceptance/10_files/04_match/directory_can_not_readlink.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; cache_system_functions => "false"; diff --git a/tests/acceptance/10_files/04_match/directory_can_not_readlink.cf.sub b/tests/acceptance/10_files/04_match/directory_can_not_readlink.cf.sub index 796f0c9b38..428670c1b1 100644 --- a/tests/acceptance/10_files/04_match/directory_can_not_readlink.cf.sub +++ b/tests/acceptance/10_files/04_match/directory_can_not_readlink.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { symlinks }; version => "1.0"; } diff --git a/tests/acceptance/10_files/04_match/kept_promise.cf b/tests/acceptance/10_files/04_match/kept_promise.cf index 5f86c87bfd..f61e9b4033 100644 --- a/tests/acceptance/10_files/04_match/kept_promise.cf +++ b/tests/acceptance/10_files/04_match/kept_promise.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/10_files/04_match/match_scope.cf b/tests/acceptance/10_files/04_match/match_scope.cf index 5ce45b60fc..8793e27a10 100644 --- a/tests/acceptance/10_files/04_match/match_scope.cf +++ b/tests/acceptance/10_files/04_match/match_scope.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/04_match/not_selected_dirs_are_skipped.cf b/tests/acceptance/10_files/04_match/not_selected_dirs_are_skipped.cf index e4a6395e2d..5a30a0cc7f 100644 --- a/tests/acceptance/10_files/04_match/not_selected_dirs_are_skipped.cf +++ b/tests/acceptance/10_files/04_match/not_selected_dirs_are_skipped.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -111,4 +111,3 @@ bundle agent check "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/10_files/04_match/staging/002.cf b/tests/acceptance/10_files/04_match/staging/002.cf index 20f6ef4eb2..350dcbcafe 100644 --- a/tests/acceptance/10_files/04_match/staging/002.cf +++ b/tests/acceptance/10_files/04_match/staging/002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/04_match/staging/003.cf b/tests/acceptance/10_files/04_match/staging/003.cf index 177886e5e0..d12fb0553d 100644 --- a/tests/acceptance/10_files/04_match/staging/003.cf +++ b/tests/acceptance/10_files/04_match/staging/003.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/04_match/staging/005.cf b/tests/acceptance/10_files/04_match/staging/005.cf index 08c65d3829..34f1544d86 100644 --- a/tests/acceptance/10_files/04_match/staging/005.cf +++ b/tests/acceptance/10_files/04_match/staging/005.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/04_match/staging/006.cf b/tests/acceptance/10_files/04_match/staging/006.cf index 8a2b284297..54b42acdc9 100644 --- a/tests/acceptance/10_files/04_match/staging/006.cf +++ b/tests/acceptance/10_files/04_match/staging/006.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/04_match/staging/007.cf b/tests/acceptance/10_files/04_match/staging/007.cf index 1ec5288d09..23b996dddd 100644 --- a/tests/acceptance/10_files/04_match/staging/007.cf +++ b/tests/acceptance/10_files/04_match/staging/007.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/05_classes/001.cf b/tests/acceptance/10_files/05_classes/001.cf index b1a2c132f2..09bf0d5dd0 100644 --- a/tests/acceptance/10_files/05_classes/001.cf +++ b/tests/acceptance/10_files/05_classes/001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/05_classes/002.cf b/tests/acceptance/10_files/05_classes/002.cf index 6119f84cab..39ae45fef1 100644 --- a/tests/acceptance/10_files/05_classes/002.cf +++ b/tests/acceptance/10_files/05_classes/002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/05_classes/004.cf b/tests/acceptance/10_files/05_classes/004.cf index fb727640a3..f1538e3f81 100644 --- a/tests/acceptance/10_files/05_classes/004.cf +++ b/tests/acceptance/10_files/05_classes/004.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/05_classes/006.cf b/tests/acceptance/10_files/05_classes/006.cf index 4dfc0a20e3..77e56832a2 100644 --- a/tests/acceptance/10_files/05_classes/006.cf +++ b/tests/acceptance/10_files/05_classes/006.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/05_classes/102.cf b/tests/acceptance/10_files/05_classes/102.cf index eded9dc159..c3d9e5fa88 100644 --- a/tests/acceptance/10_files/05_classes/102.cf +++ b/tests/acceptance/10_files/05_classes/102.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/05_classes/staging/003.cf b/tests/acceptance/10_files/05_classes/staging/003.cf index 5b11b5289d..bd9b70033c 100644 --- a/tests/acceptance/10_files/05_classes/staging/003.cf +++ b/tests/acceptance/10_files/05_classes/staging/003.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/05_classes/staging/005.cf b/tests/acceptance/10_files/05_classes/staging/005.cf index cacf046b79..2a22875b47 100644 --- a/tests/acceptance/10_files/05_classes/staging/005.cf +++ b/tests/acceptance/10_files/05_classes/staging/005.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/05_classes/staging/007.cf b/tests/acceptance/10_files/05_classes/staging/007.cf index 36d1fdd0d0..6e86be0979 100644 --- a/tests/acceptance/10_files/05_classes/staging/007.cf +++ b/tests/acceptance/10_files/05_classes/staging/007.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/05_classes/staging/101.cf b/tests/acceptance/10_files/05_classes/staging/101.cf index ee58cc089e..cd3803a8d5 100644 --- a/tests/acceptance/10_files/05_classes/staging/101.cf +++ b/tests/acceptance/10_files/05_classes/staging/101.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/05_classes/staging/103.cf b/tests/acceptance/10_files/05_classes/staging/103.cf index aba20c05f4..83b34526cd 100644 --- a/tests/acceptance/10_files/05_classes/staging/103.cf +++ b/tests/acceptance/10_files/05_classes/staging/103.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/05_classes/staging/104.cf b/tests/acceptance/10_files/05_classes/staging/104.cf index 0588292759..d710b97852 100644 --- a/tests/acceptance/10_files/05_classes/staging/104.cf +++ b/tests/acceptance/10_files/05_classes/staging/104.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/05_classes/staging/105.cf b/tests/acceptance/10_files/05_classes/staging/105.cf index e9722006ec..a952a85362 100644 --- a/tests/acceptance/10_files/05_classes/staging/105.cf +++ b/tests/acceptance/10_files/05_classes/staging/105.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/05_classes/staging/106.cf b/tests/acceptance/10_files/05_classes/staging/106.cf index f087686134..9840e5d573 100644 --- a/tests/acceptance/10_files/05_classes/staging/106.cf +++ b/tests/acceptance/10_files/05_classes/staging/106.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/05_classes/staging/107.cf b/tests/acceptance/10_files/05_classes/staging/107.cf index e088aade88..ba60816d47 100644 --- a/tests/acceptance/10_files/05_classes/staging/107.cf +++ b/tests/acceptance/10_files/05_classes/staging/107.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/05_classes/staging/108.cf b/tests/acceptance/10_files/05_classes/staging/108.cf index 6b9d273f74..d980b9b8fc 100644 --- a/tests/acceptance/10_files/05_classes/staging/108.cf +++ b/tests/acceptance/10_files/05_classes/staging/108.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/05_classes/staging/109.cf b/tests/acceptance/10_files/05_classes/staging/109.cf index 122d0acc80..c33390cbbc 100644 --- a/tests/acceptance/10_files/05_classes/staging/109.cf +++ b/tests/acceptance/10_files/05_classes/staging/109.cf @@ -11,7 +11,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/05_classes/staging/110.cf b/tests/acceptance/10_files/05_classes/staging/110.cf index 0b7b9af437..115c5c1a2a 100644 --- a/tests/acceptance/10_files/05_classes/staging/110.cf +++ b/tests/acceptance/10_files/05_classes/staging/110.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/05_classes/staging/111.cf b/tests/acceptance/10_files/05_classes/staging/111.cf index 3d761ea9ab..8ff460a474 100644 --- a/tests/acceptance/10_files/05_classes/staging/111.cf +++ b/tests/acceptance/10_files/05_classes/staging/111.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/05_classes/staging/112.cf b/tests/acceptance/10_files/05_classes/staging/112.cf index c801c1118d..90e3e01003 100644 --- a/tests/acceptance/10_files/05_classes/staging/112.cf +++ b/tests/acceptance/10_files/05_classes/staging/112.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/05_classes/staging/113.cf b/tests/acceptance/10_files/05_classes/staging/113.cf index cf76c16545..d1002461cb 100644 --- a/tests/acceptance/10_files/05_classes/staging/113.cf +++ b/tests/acceptance/10_files/05_classes/staging/113.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/05_classes/staging/114.cf b/tests/acceptance/10_files/05_classes/staging/114.cf index 3ae3395f8c..7b9553095f 100644 --- a/tests/acceptance/10_files/05_classes/staging/114.cf +++ b/tests/acceptance/10_files/05_classes/staging/114.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/001.cf b/tests/acceptance/10_files/07_delete_lines/001.cf index 06c754e263..ef72d8f8c2 100644 --- a/tests/acceptance/10_files/07_delete_lines/001.cf +++ b/tests/acceptance/10_files/07_delete_lines/001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/002.cf b/tests/acceptance/10_files/07_delete_lines/002.cf index 72d526cbab..12a79b3692 100644 --- a/tests/acceptance/10_files/07_delete_lines/002.cf +++ b/tests/acceptance/10_files/07_delete_lines/002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/003.cf b/tests/acceptance/10_files/07_delete_lines/003.cf index 15808bf27c..bc9cc67ab0 100644 --- a/tests/acceptance/10_files/07_delete_lines/003.cf +++ b/tests/acceptance/10_files/07_delete_lines/003.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/004.cf b/tests/acceptance/10_files/07_delete_lines/004.cf index 19b9f5058c..cb58f8f646 100644 --- a/tests/acceptance/10_files/07_delete_lines/004.cf +++ b/tests/acceptance/10_files/07_delete_lines/004.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/005.cf b/tests/acceptance/10_files/07_delete_lines/005.cf index 77b34d87ae..9e9bac83e1 100644 --- a/tests/acceptance/10_files/07_delete_lines/005.cf +++ b/tests/acceptance/10_files/07_delete_lines/005.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/006.cf b/tests/acceptance/10_files/07_delete_lines/006.cf index bc09ada4c8..07cedcf3dc 100644 --- a/tests/acceptance/10_files/07_delete_lines/006.cf +++ b/tests/acceptance/10_files/07_delete_lines/006.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/007.cf b/tests/acceptance/10_files/07_delete_lines/007.cf index 16a3c72495..7130aa6256 100644 --- a/tests/acceptance/10_files/07_delete_lines/007.cf +++ b/tests/acceptance/10_files/07_delete_lines/007.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/008.cf b/tests/acceptance/10_files/07_delete_lines/008.cf index 53688e97db..c3dd4dde94 100644 --- a/tests/acceptance/10_files/07_delete_lines/008.cf +++ b/tests/acceptance/10_files/07_delete_lines/008.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/009.cf b/tests/acceptance/10_files/07_delete_lines/009.cf index 53688e97db..c3dd4dde94 100644 --- a/tests/acceptance/10_files/07_delete_lines/009.cf +++ b/tests/acceptance/10_files/07_delete_lines/009.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/010.cf b/tests/acceptance/10_files/07_delete_lines/010.cf index 43593ebab5..66f4351742 100644 --- a/tests/acceptance/10_files/07_delete_lines/010.cf +++ b/tests/acceptance/10_files/07_delete_lines/010.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/011.cf b/tests/acceptance/10_files/07_delete_lines/011.cf index ac3ddfe743..0fa91c8e1c 100644 --- a/tests/acceptance/10_files/07_delete_lines/011.cf +++ b/tests/acceptance/10_files/07_delete_lines/011.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/012.cf b/tests/acceptance/10_files/07_delete_lines/012.cf index a5b11d2afb..65bfe1ce59 100644 --- a/tests/acceptance/10_files/07_delete_lines/012.cf +++ b/tests/acceptance/10_files/07_delete_lines/012.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/013.cf b/tests/acceptance/10_files/07_delete_lines/013.cf index d1d98ff1e8..b087e380e7 100644 --- a/tests/acceptance/10_files/07_delete_lines/013.cf +++ b/tests/acceptance/10_files/07_delete_lines/013.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/014.cf b/tests/acceptance/10_files/07_delete_lines/014.cf index e8b1d3d2b4..95fb8b7e7b 100644 --- a/tests/acceptance/10_files/07_delete_lines/014.cf +++ b/tests/acceptance/10_files/07_delete_lines/014.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/015.cf b/tests/acceptance/10_files/07_delete_lines/015.cf index fc4f32a1a2..2a5405351e 100644 --- a/tests/acceptance/10_files/07_delete_lines/015.cf +++ b/tests/acceptance/10_files/07_delete_lines/015.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/016.cf b/tests/acceptance/10_files/07_delete_lines/016.cf index 440ca7304a..e17bf759fc 100644 --- a/tests/acceptance/10_files/07_delete_lines/016.cf +++ b/tests/acceptance/10_files/07_delete_lines/016.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/017.cf b/tests/acceptance/10_files/07_delete_lines/017.cf index 13b997eaf3..d542d51a26 100644 --- a/tests/acceptance/10_files/07_delete_lines/017.cf +++ b/tests/acceptance/10_files/07_delete_lines/017.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/018.cf b/tests/acceptance/10_files/07_delete_lines/018.cf index 8061800e34..470ce355e8 100644 --- a/tests/acceptance/10_files/07_delete_lines/018.cf +++ b/tests/acceptance/10_files/07_delete_lines/018.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/019.cf b/tests/acceptance/10_files/07_delete_lines/019.cf index 1b2e5ae887..d6e5d403d4 100644 --- a/tests/acceptance/10_files/07_delete_lines/019.cf +++ b/tests/acceptance/10_files/07_delete_lines/019.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/020.cf b/tests/acceptance/10_files/07_delete_lines/020.cf index 807d513a93..60a1e1c995 100644 --- a/tests/acceptance/10_files/07_delete_lines/020.cf +++ b/tests/acceptance/10_files/07_delete_lines/020.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/022.cf b/tests/acceptance/10_files/07_delete_lines/022.cf index f0b6744134..472c155ef2 100644 --- a/tests/acceptance/10_files/07_delete_lines/022.cf +++ b/tests/acceptance/10_files/07_delete_lines/022.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/023.cf b/tests/acceptance/10_files/07_delete_lines/023.cf index 48b1a0e2c9..ea57e4195c 100644 --- a/tests/acceptance/10_files/07_delete_lines/023.cf +++ b/tests/acceptance/10_files/07_delete_lines/023.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/024.cf b/tests/acceptance/10_files/07_delete_lines/024.cf index 49ae6ca6a5..cdfaa345c4 100644 --- a/tests/acceptance/10_files/07_delete_lines/024.cf +++ b/tests/acceptance/10_files/07_delete_lines/024.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/025.cf b/tests/acceptance/10_files/07_delete_lines/025.cf index 43d2082401..23acffadaa 100644 --- a/tests/acceptance/10_files/07_delete_lines/025.cf +++ b/tests/acceptance/10_files/07_delete_lines/025.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/026.cf b/tests/acceptance/10_files/07_delete_lines/026.cf index 3fffcd48a3..54f893a436 100644 --- a/tests/acceptance/10_files/07_delete_lines/026.cf +++ b/tests/acceptance/10_files/07_delete_lines/026.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/027.cf b/tests/acceptance/10_files/07_delete_lines/027.cf index b8b2dc0169..fcbc8f1f6e 100644 --- a/tests/acceptance/10_files/07_delete_lines/027.cf +++ b/tests/acceptance/10_files/07_delete_lines/027.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/028.cf b/tests/acceptance/10_files/07_delete_lines/028.cf index dfb2e291fd..31c6098f71 100644 --- a/tests/acceptance/10_files/07_delete_lines/028.cf +++ b/tests/acceptance/10_files/07_delete_lines/028.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/029.cf b/tests/acceptance/10_files/07_delete_lines/029.cf index ab42cd2e87..8b2a1395c5 100644 --- a/tests/acceptance/10_files/07_delete_lines/029.cf +++ b/tests/acceptance/10_files/07_delete_lines/029.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/030.cf b/tests/acceptance/10_files/07_delete_lines/030.cf index dcc7c65869..0d37ddf1a6 100644 --- a/tests/acceptance/10_files/07_delete_lines/030.cf +++ b/tests/acceptance/10_files/07_delete_lines/030.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/031.cf b/tests/acceptance/10_files/07_delete_lines/031.cf index 9a11228841..c46414700e 100644 --- a/tests/acceptance/10_files/07_delete_lines/031.cf +++ b/tests/acceptance/10_files/07_delete_lines/031.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/032.cf b/tests/acceptance/10_files/07_delete_lines/032.cf index 5fbc1718a4..fe67baf975 100644 --- a/tests/acceptance/10_files/07_delete_lines/032.cf +++ b/tests/acceptance/10_files/07_delete_lines/032.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/033.cf b/tests/acceptance/10_files/07_delete_lines/033.cf index e29477bfb1..43c9fc639d 100644 --- a/tests/acceptance/10_files/07_delete_lines/033.cf +++ b/tests/acceptance/10_files/07_delete_lines/033.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/034.cf b/tests/acceptance/10_files/07_delete_lines/034.cf index 8e2fa30207..d251a6d582 100644 --- a/tests/acceptance/10_files/07_delete_lines/034.cf +++ b/tests/acceptance/10_files/07_delete_lines/034.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/035.cf b/tests/acceptance/10_files/07_delete_lines/035.cf index b85b36d6bb..1b7baebbe0 100644 --- a/tests/acceptance/10_files/07_delete_lines/035.cf +++ b/tests/acceptance/10_files/07_delete_lines/035.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/036.cf b/tests/acceptance/10_files/07_delete_lines/036.cf index 4f8500ec23..ecc4768859 100644 --- a/tests/acceptance/10_files/07_delete_lines/036.cf +++ b/tests/acceptance/10_files/07_delete_lines/036.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/037.cf b/tests/acceptance/10_files/07_delete_lines/037.cf index d00a0e0edb..d3447110aa 100644 --- a/tests/acceptance/10_files/07_delete_lines/037.cf +++ b/tests/acceptance/10_files/07_delete_lines/037.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/038.cf b/tests/acceptance/10_files/07_delete_lines/038.cf index 0149690580..32aed05e2a 100644 --- a/tests/acceptance/10_files/07_delete_lines/038.cf +++ b/tests/acceptance/10_files/07_delete_lines/038.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/039.cf b/tests/acceptance/10_files/07_delete_lines/039.cf index b59776d31c..93771d3a97 100644 --- a/tests/acceptance/10_files/07_delete_lines/039.cf +++ b/tests/acceptance/10_files/07_delete_lines/039.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/040.cf b/tests/acceptance/10_files/07_delete_lines/040.cf index 308629e217..56605a24da 100644 --- a/tests/acceptance/10_files/07_delete_lines/040.cf +++ b/tests/acceptance/10_files/07_delete_lines/040.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/041.cf b/tests/acceptance/10_files/07_delete_lines/041.cf index 2c9b9e7f4e..5e8db08aef 100644 --- a/tests/acceptance/10_files/07_delete_lines/041.cf +++ b/tests/acceptance/10_files/07_delete_lines/041.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/042.cf b/tests/acceptance/10_files/07_delete_lines/042.cf index 1600f7be4e..ca88919539 100644 --- a/tests/acceptance/10_files/07_delete_lines/042.cf +++ b/tests/acceptance/10_files/07_delete_lines/042.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/043.cf b/tests/acceptance/10_files/07_delete_lines/043.cf index 7951c8360a..91826ab3a8 100644 --- a/tests/acceptance/10_files/07_delete_lines/043.cf +++ b/tests/acceptance/10_files/07_delete_lines/043.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/044.cf b/tests/acceptance/10_files/07_delete_lines/044.cf index e37c5edaed..4e9da1d90e 100644 --- a/tests/acceptance/10_files/07_delete_lines/044.cf +++ b/tests/acceptance/10_files/07_delete_lines/044.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/045.cf b/tests/acceptance/10_files/07_delete_lines/045.cf index e66a2ce432..c73343b993 100644 --- a/tests/acceptance/10_files/07_delete_lines/045.cf +++ b/tests/acceptance/10_files/07_delete_lines/045.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/046.cf b/tests/acceptance/10_files/07_delete_lines/046.cf index 7b8b46f0ca..512bf5f0c6 100644 --- a/tests/acceptance/10_files/07_delete_lines/046.cf +++ b/tests/acceptance/10_files/07_delete_lines/046.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/047.cf b/tests/acceptance/10_files/07_delete_lines/047.cf index 1743194307..14a31789f7 100644 --- a/tests/acceptance/10_files/07_delete_lines/047.cf +++ b/tests/acceptance/10_files/07_delete_lines/047.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/101.cf b/tests/acceptance/10_files/07_delete_lines/101.cf index f232ff8bb8..a896debb2b 100644 --- a/tests/acceptance/10_files/07_delete_lines/101.cf +++ b/tests/acceptance/10_files/07_delete_lines/101.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/102.cf b/tests/acceptance/10_files/07_delete_lines/102.cf index d5c330da5f..8c81d6c2e0 100644 --- a/tests/acceptance/10_files/07_delete_lines/102.cf +++ b/tests/acceptance/10_files/07_delete_lines/102.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/103.cf b/tests/acceptance/10_files/07_delete_lines/103.cf index 4f98c6017e..3d403b5ec0 100644 --- a/tests/acceptance/10_files/07_delete_lines/103.cf +++ b/tests/acceptance/10_files/07_delete_lines/103.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/104.cf b/tests/acceptance/10_files/07_delete_lines/104.cf index 955c0a79d9..5be303f7f4 100644 --- a/tests/acceptance/10_files/07_delete_lines/104.cf +++ b/tests/acceptance/10_files/07_delete_lines/104.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/105.cf b/tests/acceptance/10_files/07_delete_lines/105.cf index a11272dd21..63a128261d 100644 --- a/tests/acceptance/10_files/07_delete_lines/105.cf +++ b/tests/acceptance/10_files/07_delete_lines/105.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/106.cf b/tests/acceptance/10_files/07_delete_lines/106.cf index 1fc898f3cf..c172c6f43f 100644 --- a/tests/acceptance/10_files/07_delete_lines/106.cf +++ b/tests/acceptance/10_files/07_delete_lines/106.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/107.cf b/tests/acceptance/10_files/07_delete_lines/107.cf index 15ceab8b1e..c4e000a185 100644 --- a/tests/acceptance/10_files/07_delete_lines/107.cf +++ b/tests/acceptance/10_files/07_delete_lines/107.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/108.cf b/tests/acceptance/10_files/07_delete_lines/108.cf index a5d3589ba7..ed89f1e494 100644 --- a/tests/acceptance/10_files/07_delete_lines/108.cf +++ b/tests/acceptance/10_files/07_delete_lines/108.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/109.cf b/tests/acceptance/10_files/07_delete_lines/109.cf index fb16c0b866..7ff1adac4b 100644 --- a/tests/acceptance/10_files/07_delete_lines/109.cf +++ b/tests/acceptance/10_files/07_delete_lines/109.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/110.cf b/tests/acceptance/10_files/07_delete_lines/110.cf index c34849f14a..75e6b421de 100644 --- a/tests/acceptance/10_files/07_delete_lines/110.cf +++ b/tests/acceptance/10_files/07_delete_lines/110.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/111.cf b/tests/acceptance/10_files/07_delete_lines/111.cf index 453c028280..5621a1dcbf 100644 --- a/tests/acceptance/10_files/07_delete_lines/111.cf +++ b/tests/acceptance/10_files/07_delete_lines/111.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/112.cf b/tests/acceptance/10_files/07_delete_lines/112.cf index 2ec27c12a0..e2dacab017 100644 --- a/tests/acceptance/10_files/07_delete_lines/112.cf +++ b/tests/acceptance/10_files/07_delete_lines/112.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/113.cf b/tests/acceptance/10_files/07_delete_lines/113.cf index 182f92ed29..2458976b9d 100644 --- a/tests/acceptance/10_files/07_delete_lines/113.cf +++ b/tests/acceptance/10_files/07_delete_lines/113.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/114.cf b/tests/acceptance/10_files/07_delete_lines/114.cf index abdad872ca..76308c7123 100644 --- a/tests/acceptance/10_files/07_delete_lines/114.cf +++ b/tests/acceptance/10_files/07_delete_lines/114.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/115.cf b/tests/acceptance/10_files/07_delete_lines/115.cf index bbcfd537f8..1a609973fe 100644 --- a/tests/acceptance/10_files/07_delete_lines/115.cf +++ b/tests/acceptance/10_files/07_delete_lines/115.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/116.cf b/tests/acceptance/10_files/07_delete_lines/116.cf index 5383d14a32..5396f0466f 100644 --- a/tests/acceptance/10_files/07_delete_lines/116.cf +++ b/tests/acceptance/10_files/07_delete_lines/116.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/117.cf b/tests/acceptance/10_files/07_delete_lines/117.cf index 7fb9cbab3e..79beec8010 100644 --- a/tests/acceptance/10_files/07_delete_lines/117.cf +++ b/tests/acceptance/10_files/07_delete_lines/117.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/118.cf b/tests/acceptance/10_files/07_delete_lines/118.cf index 897c42a551..7ef3db17c5 100644 --- a/tests/acceptance/10_files/07_delete_lines/118.cf +++ b/tests/acceptance/10_files/07_delete_lines/118.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/119.cf b/tests/acceptance/10_files/07_delete_lines/119.cf index 6fba640034..3049337617 100644 --- a/tests/acceptance/10_files/07_delete_lines/119.cf +++ b/tests/acceptance/10_files/07_delete_lines/119.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/120.cf b/tests/acceptance/10_files/07_delete_lines/120.cf index 7b6b8e4836..f573e3a80b 100644 --- a/tests/acceptance/10_files/07_delete_lines/120.cf +++ b/tests/acceptance/10_files/07_delete_lines/120.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/122.cf b/tests/acceptance/10_files/07_delete_lines/122.cf index 892856babc..709c2e504d 100644 --- a/tests/acceptance/10_files/07_delete_lines/122.cf +++ b/tests/acceptance/10_files/07_delete_lines/122.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/123.cf b/tests/acceptance/10_files/07_delete_lines/123.cf index d447101570..dc74912b7b 100644 --- a/tests/acceptance/10_files/07_delete_lines/123.cf +++ b/tests/acceptance/10_files/07_delete_lines/123.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/124.cf b/tests/acceptance/10_files/07_delete_lines/124.cf index af3499959b..ec03f96e5b 100644 --- a/tests/acceptance/10_files/07_delete_lines/124.cf +++ b/tests/acceptance/10_files/07_delete_lines/124.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/125.cf b/tests/acceptance/10_files/07_delete_lines/125.cf index 0259ab5401..5eba55949c 100644 --- a/tests/acceptance/10_files/07_delete_lines/125.cf +++ b/tests/acceptance/10_files/07_delete_lines/125.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/126.cf b/tests/acceptance/10_files/07_delete_lines/126.cf index 48ba30045f..c73cadd2c0 100644 --- a/tests/acceptance/10_files/07_delete_lines/126.cf +++ b/tests/acceptance/10_files/07_delete_lines/126.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/127.cf b/tests/acceptance/10_files/07_delete_lines/127.cf index 5ba18a1db7..59c262fc61 100644 --- a/tests/acceptance/10_files/07_delete_lines/127.cf +++ b/tests/acceptance/10_files/07_delete_lines/127.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/128.cf b/tests/acceptance/10_files/07_delete_lines/128.cf index b273cad40f..5e85412c3a 100644 --- a/tests/acceptance/10_files/07_delete_lines/128.cf +++ b/tests/acceptance/10_files/07_delete_lines/128.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/129.cf b/tests/acceptance/10_files/07_delete_lines/129.cf index edcb304581..9b7669f5d0 100644 --- a/tests/acceptance/10_files/07_delete_lines/129.cf +++ b/tests/acceptance/10_files/07_delete_lines/129.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/130.cf b/tests/acceptance/10_files/07_delete_lines/130.cf index 4b628d781a..dd580dd485 100644 --- a/tests/acceptance/10_files/07_delete_lines/130.cf +++ b/tests/acceptance/10_files/07_delete_lines/130.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/131.cf b/tests/acceptance/10_files/07_delete_lines/131.cf index e37ca7cc01..899ccee53a 100644 --- a/tests/acceptance/10_files/07_delete_lines/131.cf +++ b/tests/acceptance/10_files/07_delete_lines/131.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/132.cf b/tests/acceptance/10_files/07_delete_lines/132.cf index 7976219937..717b837784 100644 --- a/tests/acceptance/10_files/07_delete_lines/132.cf +++ b/tests/acceptance/10_files/07_delete_lines/132.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/133.cf b/tests/acceptance/10_files/07_delete_lines/133.cf index 01295d7856..d7c1a7cc2d 100644 --- a/tests/acceptance/10_files/07_delete_lines/133.cf +++ b/tests/acceptance/10_files/07_delete_lines/133.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/134.cf b/tests/acceptance/10_files/07_delete_lines/134.cf index c0d6c91bd5..f13040584d 100644 --- a/tests/acceptance/10_files/07_delete_lines/134.cf +++ b/tests/acceptance/10_files/07_delete_lines/134.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/135.cf b/tests/acceptance/10_files/07_delete_lines/135.cf index d18cd243d7..10d59bb3c9 100644 --- a/tests/acceptance/10_files/07_delete_lines/135.cf +++ b/tests/acceptance/10_files/07_delete_lines/135.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/136.cf b/tests/acceptance/10_files/07_delete_lines/136.cf index 2b1b46ede4..74b1b7512b 100644 --- a/tests/acceptance/10_files/07_delete_lines/136.cf +++ b/tests/acceptance/10_files/07_delete_lines/136.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/137.cf b/tests/acceptance/10_files/07_delete_lines/137.cf index 631a262060..5bfd211021 100644 --- a/tests/acceptance/10_files/07_delete_lines/137.cf +++ b/tests/acceptance/10_files/07_delete_lines/137.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/138.cf b/tests/acceptance/10_files/07_delete_lines/138.cf index a0d10ce699..e9a16b7109 100644 --- a/tests/acceptance/10_files/07_delete_lines/138.cf +++ b/tests/acceptance/10_files/07_delete_lines/138.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/139.cf b/tests/acceptance/10_files/07_delete_lines/139.cf index 611a10a4db..a5ae416565 100644 --- a/tests/acceptance/10_files/07_delete_lines/139.cf +++ b/tests/acceptance/10_files/07_delete_lines/139.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/140.cf b/tests/acceptance/10_files/07_delete_lines/140.cf index efb32de533..8511d54392 100644 --- a/tests/acceptance/10_files/07_delete_lines/140.cf +++ b/tests/acceptance/10_files/07_delete_lines/140.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/141.cf b/tests/acceptance/10_files/07_delete_lines/141.cf index 2d5c4fd3c1..c973934212 100644 --- a/tests/acceptance/10_files/07_delete_lines/141.cf +++ b/tests/acceptance/10_files/07_delete_lines/141.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/142.cf b/tests/acceptance/10_files/07_delete_lines/142.cf index 00cdc6a1e7..e7c0cf4e34 100644 --- a/tests/acceptance/10_files/07_delete_lines/142.cf +++ b/tests/acceptance/10_files/07_delete_lines/142.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/143.cf b/tests/acceptance/10_files/07_delete_lines/143.cf index 7ad2e7a830..52544b8e50 100644 --- a/tests/acceptance/10_files/07_delete_lines/143.cf +++ b/tests/acceptance/10_files/07_delete_lines/143.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/144.cf b/tests/acceptance/10_files/07_delete_lines/144.cf index b5781d98c0..70af9fefa6 100644 --- a/tests/acceptance/10_files/07_delete_lines/144.cf +++ b/tests/acceptance/10_files/07_delete_lines/144.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/145.cf b/tests/acceptance/10_files/07_delete_lines/145.cf index e91ffbada2..daf2bb028a 100644 --- a/tests/acceptance/10_files/07_delete_lines/145.cf +++ b/tests/acceptance/10_files/07_delete_lines/145.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/146.cf b/tests/acceptance/10_files/07_delete_lines/146.cf index de24dc4bbc..016717c08a 100644 --- a/tests/acceptance/10_files/07_delete_lines/146.cf +++ b/tests/acceptance/10_files/07_delete_lines/146.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/147.cf b/tests/acceptance/10_files/07_delete_lines/147.cf index bcf3ef5987..e7f80ea867 100644 --- a/tests/acceptance/10_files/07_delete_lines/147.cf +++ b/tests/acceptance/10_files/07_delete_lines/147.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/201.cf b/tests/acceptance/10_files/07_delete_lines/201.cf index f3df98873e..841c7990ba 100644 --- a/tests/acceptance/10_files/07_delete_lines/201.cf +++ b/tests/acceptance/10_files/07_delete_lines/201.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/202.cf b/tests/acceptance/10_files/07_delete_lines/202.cf index 137ae5af73..cba82a4822 100644 --- a/tests/acceptance/10_files/07_delete_lines/202.cf +++ b/tests/acceptance/10_files/07_delete_lines/202.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/203.cf b/tests/acceptance/10_files/07_delete_lines/203.cf index 268bdb0d28..2cebd6ff30 100644 --- a/tests/acceptance/10_files/07_delete_lines/203.cf +++ b/tests/acceptance/10_files/07_delete_lines/203.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/204.cf b/tests/acceptance/10_files/07_delete_lines/204.cf index 892029f129..a7312115bc 100644 --- a/tests/acceptance/10_files/07_delete_lines/204.cf +++ b/tests/acceptance/10_files/07_delete_lines/204.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/205.cf b/tests/acceptance/10_files/07_delete_lines/205.cf index fb24504fb9..aac50f10e9 100644 --- a/tests/acceptance/10_files/07_delete_lines/205.cf +++ b/tests/acceptance/10_files/07_delete_lines/205.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/206.cf b/tests/acceptance/10_files/07_delete_lines/206.cf index b7e240fe0e..aa206d1f6e 100644 --- a/tests/acceptance/10_files/07_delete_lines/206.cf +++ b/tests/acceptance/10_files/07_delete_lines/206.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/207.cf b/tests/acceptance/10_files/07_delete_lines/207.cf index 568a5840b9..ed42aeb4e4 100644 --- a/tests/acceptance/10_files/07_delete_lines/207.cf +++ b/tests/acceptance/10_files/07_delete_lines/207.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/208.cf b/tests/acceptance/10_files/07_delete_lines/208.cf index 89350fd40e..7f4fd53d33 100644 --- a/tests/acceptance/10_files/07_delete_lines/208.cf +++ b/tests/acceptance/10_files/07_delete_lines/208.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/209.cf b/tests/acceptance/10_files/07_delete_lines/209.cf index 173ff8c02a..44d29b0334 100644 --- a/tests/acceptance/10_files/07_delete_lines/209.cf +++ b/tests/acceptance/10_files/07_delete_lines/209.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/210.cf b/tests/acceptance/10_files/07_delete_lines/210.cf index bd5d0c950e..9ae8cf55bd 100644 --- a/tests/acceptance/10_files/07_delete_lines/210.cf +++ b/tests/acceptance/10_files/07_delete_lines/210.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/211.cf b/tests/acceptance/10_files/07_delete_lines/211.cf index 570f78c5b1..a946f2dce8 100644 --- a/tests/acceptance/10_files/07_delete_lines/211.cf +++ b/tests/acceptance/10_files/07_delete_lines/211.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/212.cf b/tests/acceptance/10_files/07_delete_lines/212.cf index a2128de706..66994b0104 100644 --- a/tests/acceptance/10_files/07_delete_lines/212.cf +++ b/tests/acceptance/10_files/07_delete_lines/212.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/213.cf b/tests/acceptance/10_files/07_delete_lines/213.cf index de0ac15804..4cb1debc3b 100644 --- a/tests/acceptance/10_files/07_delete_lines/213.cf +++ b/tests/acceptance/10_files/07_delete_lines/213.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/214.cf b/tests/acceptance/10_files/07_delete_lines/214.cf index d1d625a2f3..deebe6d4d9 100644 --- a/tests/acceptance/10_files/07_delete_lines/214.cf +++ b/tests/acceptance/10_files/07_delete_lines/214.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/215.cf b/tests/acceptance/10_files/07_delete_lines/215.cf index 81728372f8..9b6b3972dd 100644 --- a/tests/acceptance/10_files/07_delete_lines/215.cf +++ b/tests/acceptance/10_files/07_delete_lines/215.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/216.cf b/tests/acceptance/10_files/07_delete_lines/216.cf index e782ff7ad7..c60a7f359a 100644 --- a/tests/acceptance/10_files/07_delete_lines/216.cf +++ b/tests/acceptance/10_files/07_delete_lines/216.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/217.cf b/tests/acceptance/10_files/07_delete_lines/217.cf index 53c6cc3679..affc22ade1 100644 --- a/tests/acceptance/10_files/07_delete_lines/217.cf +++ b/tests/acceptance/10_files/07_delete_lines/217.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/218.cf b/tests/acceptance/10_files/07_delete_lines/218.cf index cbb2909fb6..be7b8955b6 100644 --- a/tests/acceptance/10_files/07_delete_lines/218.cf +++ b/tests/acceptance/10_files/07_delete_lines/218.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/219.cf b/tests/acceptance/10_files/07_delete_lines/219.cf index e98a50d241..ce9a684c37 100644 --- a/tests/acceptance/10_files/07_delete_lines/219.cf +++ b/tests/acceptance/10_files/07_delete_lines/219.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/220.cf b/tests/acceptance/10_files/07_delete_lines/220.cf index f68e5742b7..dd691b454d 100644 --- a/tests/acceptance/10_files/07_delete_lines/220.cf +++ b/tests/acceptance/10_files/07_delete_lines/220.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/222.cf b/tests/acceptance/10_files/07_delete_lines/222.cf index 8c78ca9c8a..9584bd766a 100644 --- a/tests/acceptance/10_files/07_delete_lines/222.cf +++ b/tests/acceptance/10_files/07_delete_lines/222.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/223.cf b/tests/acceptance/10_files/07_delete_lines/223.cf index 9668c3216c..0f7bb215dd 100644 --- a/tests/acceptance/10_files/07_delete_lines/223.cf +++ b/tests/acceptance/10_files/07_delete_lines/223.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/224.cf b/tests/acceptance/10_files/07_delete_lines/224.cf index ab0f32ba51..405cd1949b 100644 --- a/tests/acceptance/10_files/07_delete_lines/224.cf +++ b/tests/acceptance/10_files/07_delete_lines/224.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/225.cf b/tests/acceptance/10_files/07_delete_lines/225.cf index 764ca436a1..cf7385cf34 100644 --- a/tests/acceptance/10_files/07_delete_lines/225.cf +++ b/tests/acceptance/10_files/07_delete_lines/225.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/226.cf b/tests/acceptance/10_files/07_delete_lines/226.cf index 96acdf9762..7a530e09b6 100644 --- a/tests/acceptance/10_files/07_delete_lines/226.cf +++ b/tests/acceptance/10_files/07_delete_lines/226.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/227.cf b/tests/acceptance/10_files/07_delete_lines/227.cf index a534939738..eed8969794 100644 --- a/tests/acceptance/10_files/07_delete_lines/227.cf +++ b/tests/acceptance/10_files/07_delete_lines/227.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/228.cf b/tests/acceptance/10_files/07_delete_lines/228.cf index 3f0fc11b39..91eed4e96d 100644 --- a/tests/acceptance/10_files/07_delete_lines/228.cf +++ b/tests/acceptance/10_files/07_delete_lines/228.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/229.cf b/tests/acceptance/10_files/07_delete_lines/229.cf index eae1464210..f39508dde4 100644 --- a/tests/acceptance/10_files/07_delete_lines/229.cf +++ b/tests/acceptance/10_files/07_delete_lines/229.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/230.cf b/tests/acceptance/10_files/07_delete_lines/230.cf index 1520066391..3fb0f9e4e3 100644 --- a/tests/acceptance/10_files/07_delete_lines/230.cf +++ b/tests/acceptance/10_files/07_delete_lines/230.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/231.cf b/tests/acceptance/10_files/07_delete_lines/231.cf index e48c7492ca..9e85c15802 100644 --- a/tests/acceptance/10_files/07_delete_lines/231.cf +++ b/tests/acceptance/10_files/07_delete_lines/231.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/232.cf b/tests/acceptance/10_files/07_delete_lines/232.cf index 6a9c71aa91..7b32d84047 100644 --- a/tests/acceptance/10_files/07_delete_lines/232.cf +++ b/tests/acceptance/10_files/07_delete_lines/232.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/233.cf b/tests/acceptance/10_files/07_delete_lines/233.cf index daf01c0c88..0ae937f3ef 100644 --- a/tests/acceptance/10_files/07_delete_lines/233.cf +++ b/tests/acceptance/10_files/07_delete_lines/233.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/234.cf b/tests/acceptance/10_files/07_delete_lines/234.cf index 3c8d8b42ee..10283e18e8 100644 --- a/tests/acceptance/10_files/07_delete_lines/234.cf +++ b/tests/acceptance/10_files/07_delete_lines/234.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/235.cf b/tests/acceptance/10_files/07_delete_lines/235.cf index 306ab9a40b..786d251ee9 100644 --- a/tests/acceptance/10_files/07_delete_lines/235.cf +++ b/tests/acceptance/10_files/07_delete_lines/235.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/236.cf b/tests/acceptance/10_files/07_delete_lines/236.cf index 10453ce3e4..e2fbbd4c77 100644 --- a/tests/acceptance/10_files/07_delete_lines/236.cf +++ b/tests/acceptance/10_files/07_delete_lines/236.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/237.cf b/tests/acceptance/10_files/07_delete_lines/237.cf index c73e632695..98d686985d 100644 --- a/tests/acceptance/10_files/07_delete_lines/237.cf +++ b/tests/acceptance/10_files/07_delete_lines/237.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/238.cf b/tests/acceptance/10_files/07_delete_lines/238.cf index e7fa7b1fdf..c8b7c81c05 100644 --- a/tests/acceptance/10_files/07_delete_lines/238.cf +++ b/tests/acceptance/10_files/07_delete_lines/238.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/239.cf b/tests/acceptance/10_files/07_delete_lines/239.cf index d0513b1587..013755f7aa 100644 --- a/tests/acceptance/10_files/07_delete_lines/239.cf +++ b/tests/acceptance/10_files/07_delete_lines/239.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/240.cf b/tests/acceptance/10_files/07_delete_lines/240.cf index 361d83abfc..9ef890c1d0 100644 --- a/tests/acceptance/10_files/07_delete_lines/240.cf +++ b/tests/acceptance/10_files/07_delete_lines/240.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/241.cf b/tests/acceptance/10_files/07_delete_lines/241.cf index 1c12770e95..ef396f251e 100644 --- a/tests/acceptance/10_files/07_delete_lines/241.cf +++ b/tests/acceptance/10_files/07_delete_lines/241.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/242.cf b/tests/acceptance/10_files/07_delete_lines/242.cf index 52bc033e74..439a535f74 100644 --- a/tests/acceptance/10_files/07_delete_lines/242.cf +++ b/tests/acceptance/10_files/07_delete_lines/242.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/243.cf b/tests/acceptance/10_files/07_delete_lines/243.cf index cd0bb1d5fb..073875b21c 100644 --- a/tests/acceptance/10_files/07_delete_lines/243.cf +++ b/tests/acceptance/10_files/07_delete_lines/243.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/244.cf b/tests/acceptance/10_files/07_delete_lines/244.cf index 9baf78a311..9728d35c9b 100644 --- a/tests/acceptance/10_files/07_delete_lines/244.cf +++ b/tests/acceptance/10_files/07_delete_lines/244.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/245.cf b/tests/acceptance/10_files/07_delete_lines/245.cf index 073fe3ca26..5d8c330da2 100644 --- a/tests/acceptance/10_files/07_delete_lines/245.cf +++ b/tests/acceptance/10_files/07_delete_lines/245.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/246.cf b/tests/acceptance/10_files/07_delete_lines/246.cf index 62b315bec1..d3895b9172 100644 --- a/tests/acceptance/10_files/07_delete_lines/246.cf +++ b/tests/acceptance/10_files/07_delete_lines/246.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/247.cf b/tests/acceptance/10_files/07_delete_lines/247.cf index 1c480c7f6a..72a618cae3 100644 --- a/tests/acceptance/10_files/07_delete_lines/247.cf +++ b/tests/acceptance/10_files/07_delete_lines/247.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/301.cf b/tests/acceptance/10_files/07_delete_lines/301.cf index 32f2301ee0..a4231849c5 100644 --- a/tests/acceptance/10_files/07_delete_lines/301.cf +++ b/tests/acceptance/10_files/07_delete_lines/301.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/302.cf b/tests/acceptance/10_files/07_delete_lines/302.cf index 4ba831a782..1a549e6691 100644 --- a/tests/acceptance/10_files/07_delete_lines/302.cf +++ b/tests/acceptance/10_files/07_delete_lines/302.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/303.cf b/tests/acceptance/10_files/07_delete_lines/303.cf index 2c546e0a50..190be23f9b 100644 --- a/tests/acceptance/10_files/07_delete_lines/303.cf +++ b/tests/acceptance/10_files/07_delete_lines/303.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/304.cf b/tests/acceptance/10_files/07_delete_lines/304.cf index 0ded7d3da6..38746a0cfb 100644 --- a/tests/acceptance/10_files/07_delete_lines/304.cf +++ b/tests/acceptance/10_files/07_delete_lines/304.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/305.cf b/tests/acceptance/10_files/07_delete_lines/305.cf index 852e02526c..ebf8a059ee 100644 --- a/tests/acceptance/10_files/07_delete_lines/305.cf +++ b/tests/acceptance/10_files/07_delete_lines/305.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/306.cf b/tests/acceptance/10_files/07_delete_lines/306.cf index 8112df0c05..3ea545eb3e 100644 --- a/tests/acceptance/10_files/07_delete_lines/306.cf +++ b/tests/acceptance/10_files/07_delete_lines/306.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/307.cf b/tests/acceptance/10_files/07_delete_lines/307.cf index 7723e53e84..ce3fd1a1a4 100644 --- a/tests/acceptance/10_files/07_delete_lines/307.cf +++ b/tests/acceptance/10_files/07_delete_lines/307.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/308.cf b/tests/acceptance/10_files/07_delete_lines/308.cf index 9e548215c7..9d9953a00e 100644 --- a/tests/acceptance/10_files/07_delete_lines/308.cf +++ b/tests/acceptance/10_files/07_delete_lines/308.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/309.cf b/tests/acceptance/10_files/07_delete_lines/309.cf index 8da80db63b..cf1c04584b 100644 --- a/tests/acceptance/10_files/07_delete_lines/309.cf +++ b/tests/acceptance/10_files/07_delete_lines/309.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/310.cf b/tests/acceptance/10_files/07_delete_lines/310.cf index f8b9db590f..7a7e2c25f7 100644 --- a/tests/acceptance/10_files/07_delete_lines/310.cf +++ b/tests/acceptance/10_files/07_delete_lines/310.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/311.cf b/tests/acceptance/10_files/07_delete_lines/311.cf index cb7185fd13..159a5a820a 100644 --- a/tests/acceptance/10_files/07_delete_lines/311.cf +++ b/tests/acceptance/10_files/07_delete_lines/311.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/312.cf b/tests/acceptance/10_files/07_delete_lines/312.cf index 0438ef66f2..b0d7fb040e 100644 --- a/tests/acceptance/10_files/07_delete_lines/312.cf +++ b/tests/acceptance/10_files/07_delete_lines/312.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/313.cf b/tests/acceptance/10_files/07_delete_lines/313.cf index 6a455aebb9..7206b3d3f3 100644 --- a/tests/acceptance/10_files/07_delete_lines/313.cf +++ b/tests/acceptance/10_files/07_delete_lines/313.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/314.cf b/tests/acceptance/10_files/07_delete_lines/314.cf index 6b408642a4..a47ed3cf5c 100644 --- a/tests/acceptance/10_files/07_delete_lines/314.cf +++ b/tests/acceptance/10_files/07_delete_lines/314.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/315.cf b/tests/acceptance/10_files/07_delete_lines/315.cf index 0fe9b96d95..531ba22264 100644 --- a/tests/acceptance/10_files/07_delete_lines/315.cf +++ b/tests/acceptance/10_files/07_delete_lines/315.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/316.cf b/tests/acceptance/10_files/07_delete_lines/316.cf index 601f5e28f4..6080e6986d 100644 --- a/tests/acceptance/10_files/07_delete_lines/316.cf +++ b/tests/acceptance/10_files/07_delete_lines/316.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/317.cf b/tests/acceptance/10_files/07_delete_lines/317.cf index 767ab39582..469917f53a 100644 --- a/tests/acceptance/10_files/07_delete_lines/317.cf +++ b/tests/acceptance/10_files/07_delete_lines/317.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/318.cf b/tests/acceptance/10_files/07_delete_lines/318.cf index d7f88cf03a..7b821e7998 100644 --- a/tests/acceptance/10_files/07_delete_lines/318.cf +++ b/tests/acceptance/10_files/07_delete_lines/318.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/319.cf b/tests/acceptance/10_files/07_delete_lines/319.cf index a357c452af..7feea14f9f 100644 --- a/tests/acceptance/10_files/07_delete_lines/319.cf +++ b/tests/acceptance/10_files/07_delete_lines/319.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/320.cf b/tests/acceptance/10_files/07_delete_lines/320.cf index 81788088b0..8da87d060f 100644 --- a/tests/acceptance/10_files/07_delete_lines/320.cf +++ b/tests/acceptance/10_files/07_delete_lines/320.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/322.cf b/tests/acceptance/10_files/07_delete_lines/322.cf index 42a8e15624..dc9c6df118 100644 --- a/tests/acceptance/10_files/07_delete_lines/322.cf +++ b/tests/acceptance/10_files/07_delete_lines/322.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/323.cf b/tests/acceptance/10_files/07_delete_lines/323.cf index b960741a20..80802d99bf 100644 --- a/tests/acceptance/10_files/07_delete_lines/323.cf +++ b/tests/acceptance/10_files/07_delete_lines/323.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/324.cf b/tests/acceptance/10_files/07_delete_lines/324.cf index f20bf14bb4..c0c494acaa 100644 --- a/tests/acceptance/10_files/07_delete_lines/324.cf +++ b/tests/acceptance/10_files/07_delete_lines/324.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/325.cf b/tests/acceptance/10_files/07_delete_lines/325.cf index 08e95ef6c9..8a671f9e1c 100644 --- a/tests/acceptance/10_files/07_delete_lines/325.cf +++ b/tests/acceptance/10_files/07_delete_lines/325.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/326.cf b/tests/acceptance/10_files/07_delete_lines/326.cf index a64eb1c8b2..116f5bb920 100644 --- a/tests/acceptance/10_files/07_delete_lines/326.cf +++ b/tests/acceptance/10_files/07_delete_lines/326.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/327.cf b/tests/acceptance/10_files/07_delete_lines/327.cf index 3cde3f13b3..0eefd02457 100644 --- a/tests/acceptance/10_files/07_delete_lines/327.cf +++ b/tests/acceptance/10_files/07_delete_lines/327.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/328.cf b/tests/acceptance/10_files/07_delete_lines/328.cf index ee91f3c6da..42a2920509 100644 --- a/tests/acceptance/10_files/07_delete_lines/328.cf +++ b/tests/acceptance/10_files/07_delete_lines/328.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/329.cf b/tests/acceptance/10_files/07_delete_lines/329.cf index 52faf052c8..c451a530cf 100644 --- a/tests/acceptance/10_files/07_delete_lines/329.cf +++ b/tests/acceptance/10_files/07_delete_lines/329.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/330.cf b/tests/acceptance/10_files/07_delete_lines/330.cf index 3c482ef67d..e105ed45b9 100644 --- a/tests/acceptance/10_files/07_delete_lines/330.cf +++ b/tests/acceptance/10_files/07_delete_lines/330.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/331.cf b/tests/acceptance/10_files/07_delete_lines/331.cf index 4d14ad8641..5d1924da7e 100644 --- a/tests/acceptance/10_files/07_delete_lines/331.cf +++ b/tests/acceptance/10_files/07_delete_lines/331.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/332.cf b/tests/acceptance/10_files/07_delete_lines/332.cf index d53c037d24..d64087efc1 100644 --- a/tests/acceptance/10_files/07_delete_lines/332.cf +++ b/tests/acceptance/10_files/07_delete_lines/332.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/333.cf b/tests/acceptance/10_files/07_delete_lines/333.cf index ef4641a10f..4c73483796 100644 --- a/tests/acceptance/10_files/07_delete_lines/333.cf +++ b/tests/acceptance/10_files/07_delete_lines/333.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/334.cf b/tests/acceptance/10_files/07_delete_lines/334.cf index 21b4ea8bb7..bafc5da84a 100644 --- a/tests/acceptance/10_files/07_delete_lines/334.cf +++ b/tests/acceptance/10_files/07_delete_lines/334.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/335.cf b/tests/acceptance/10_files/07_delete_lines/335.cf index 604a7c0aec..4f9ef07095 100644 --- a/tests/acceptance/10_files/07_delete_lines/335.cf +++ b/tests/acceptance/10_files/07_delete_lines/335.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/336.cf b/tests/acceptance/10_files/07_delete_lines/336.cf index 09d488c6c0..936e5426dc 100644 --- a/tests/acceptance/10_files/07_delete_lines/336.cf +++ b/tests/acceptance/10_files/07_delete_lines/336.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/337.cf b/tests/acceptance/10_files/07_delete_lines/337.cf index edfa46e644..7a6cf48a7e 100644 --- a/tests/acceptance/10_files/07_delete_lines/337.cf +++ b/tests/acceptance/10_files/07_delete_lines/337.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/338.cf b/tests/acceptance/10_files/07_delete_lines/338.cf index 840732cd16..f907a46228 100644 --- a/tests/acceptance/10_files/07_delete_lines/338.cf +++ b/tests/acceptance/10_files/07_delete_lines/338.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/339.cf b/tests/acceptance/10_files/07_delete_lines/339.cf index 94e41987d0..d7918195e7 100644 --- a/tests/acceptance/10_files/07_delete_lines/339.cf +++ b/tests/acceptance/10_files/07_delete_lines/339.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/340.cf b/tests/acceptance/10_files/07_delete_lines/340.cf index fef9e0222e..fb4ecdbe5d 100644 --- a/tests/acceptance/10_files/07_delete_lines/340.cf +++ b/tests/acceptance/10_files/07_delete_lines/340.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/341.cf b/tests/acceptance/10_files/07_delete_lines/341.cf index aac1bf4811..8afa66c0f4 100644 --- a/tests/acceptance/10_files/07_delete_lines/341.cf +++ b/tests/acceptance/10_files/07_delete_lines/341.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/342.cf b/tests/acceptance/10_files/07_delete_lines/342.cf index d88f157063..d818855383 100644 --- a/tests/acceptance/10_files/07_delete_lines/342.cf +++ b/tests/acceptance/10_files/07_delete_lines/342.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/343.cf b/tests/acceptance/10_files/07_delete_lines/343.cf index 6d8833bc12..34c05e50a5 100644 --- a/tests/acceptance/10_files/07_delete_lines/343.cf +++ b/tests/acceptance/10_files/07_delete_lines/343.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/344.cf b/tests/acceptance/10_files/07_delete_lines/344.cf index f4b748baea..804bfee7e4 100644 --- a/tests/acceptance/10_files/07_delete_lines/344.cf +++ b/tests/acceptance/10_files/07_delete_lines/344.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/345.cf b/tests/acceptance/10_files/07_delete_lines/345.cf index 9e4fa8012b..b660f07326 100644 --- a/tests/acceptance/10_files/07_delete_lines/345.cf +++ b/tests/acceptance/10_files/07_delete_lines/345.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/346.cf b/tests/acceptance/10_files/07_delete_lines/346.cf index da17fa64dc..c13eb3d834 100644 --- a/tests/acceptance/10_files/07_delete_lines/346.cf +++ b/tests/acceptance/10_files/07_delete_lines/346.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/347.cf b/tests/acceptance/10_files/07_delete_lines/347.cf index b697c07e7a..aa3b24588e 100644 --- a/tests/acceptance/10_files/07_delete_lines/347.cf +++ b/tests/acceptance/10_files/07_delete_lines/347.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/401.cf b/tests/acceptance/10_files/07_delete_lines/401.cf index 8c3a97acf3..802b92deac 100644 --- a/tests/acceptance/10_files/07_delete_lines/401.cf +++ b/tests/acceptance/10_files/07_delete_lines/401.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/402.cf b/tests/acceptance/10_files/07_delete_lines/402.cf index 730d413195..14eb4c5e4f 100644 --- a/tests/acceptance/10_files/07_delete_lines/402.cf +++ b/tests/acceptance/10_files/07_delete_lines/402.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/403.cf b/tests/acceptance/10_files/07_delete_lines/403.cf index a154c32e63..e72fc6e13e 100644 --- a/tests/acceptance/10_files/07_delete_lines/403.cf +++ b/tests/acceptance/10_files/07_delete_lines/403.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/404.cf b/tests/acceptance/10_files/07_delete_lines/404.cf index 86b4779e03..1fc48cb02c 100644 --- a/tests/acceptance/10_files/07_delete_lines/404.cf +++ b/tests/acceptance/10_files/07_delete_lines/404.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/405.cf b/tests/acceptance/10_files/07_delete_lines/405.cf index 45de8b5154..11e05f13e4 100644 --- a/tests/acceptance/10_files/07_delete_lines/405.cf +++ b/tests/acceptance/10_files/07_delete_lines/405.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/406.cf b/tests/acceptance/10_files/07_delete_lines/406.cf index 21743cf1e8..ca28c52eec 100644 --- a/tests/acceptance/10_files/07_delete_lines/406.cf +++ b/tests/acceptance/10_files/07_delete_lines/406.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/407.cf b/tests/acceptance/10_files/07_delete_lines/407.cf index 3f0742309c..2b3007648a 100644 --- a/tests/acceptance/10_files/07_delete_lines/407.cf +++ b/tests/acceptance/10_files/07_delete_lines/407.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/408.cf b/tests/acceptance/10_files/07_delete_lines/408.cf index 2791993c9e..0bc97cb0a7 100644 --- a/tests/acceptance/10_files/07_delete_lines/408.cf +++ b/tests/acceptance/10_files/07_delete_lines/408.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/409.cf b/tests/acceptance/10_files/07_delete_lines/409.cf index 46760bbced..c8a0ba1b58 100644 --- a/tests/acceptance/10_files/07_delete_lines/409.cf +++ b/tests/acceptance/10_files/07_delete_lines/409.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/410.cf b/tests/acceptance/10_files/07_delete_lines/410.cf index 7d631a770f..a859fdced3 100644 --- a/tests/acceptance/10_files/07_delete_lines/410.cf +++ b/tests/acceptance/10_files/07_delete_lines/410.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/411.cf b/tests/acceptance/10_files/07_delete_lines/411.cf index e7079c2192..7c55c440f0 100644 --- a/tests/acceptance/10_files/07_delete_lines/411.cf +++ b/tests/acceptance/10_files/07_delete_lines/411.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/412.cf b/tests/acceptance/10_files/07_delete_lines/412.cf index 53943b3479..be22d574fc 100644 --- a/tests/acceptance/10_files/07_delete_lines/412.cf +++ b/tests/acceptance/10_files/07_delete_lines/412.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/413.cf b/tests/acceptance/10_files/07_delete_lines/413.cf index 9b21c65f98..8dbe48323e 100644 --- a/tests/acceptance/10_files/07_delete_lines/413.cf +++ b/tests/acceptance/10_files/07_delete_lines/413.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/414.cf b/tests/acceptance/10_files/07_delete_lines/414.cf index 4c528972b1..4bb27bd23e 100644 --- a/tests/acceptance/10_files/07_delete_lines/414.cf +++ b/tests/acceptance/10_files/07_delete_lines/414.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/415.cf b/tests/acceptance/10_files/07_delete_lines/415.cf index 8d21706460..18cb6147da 100644 --- a/tests/acceptance/10_files/07_delete_lines/415.cf +++ b/tests/acceptance/10_files/07_delete_lines/415.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/416.cf b/tests/acceptance/10_files/07_delete_lines/416.cf index ce7ad1eead..9a6c917c23 100644 --- a/tests/acceptance/10_files/07_delete_lines/416.cf +++ b/tests/acceptance/10_files/07_delete_lines/416.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/417.cf b/tests/acceptance/10_files/07_delete_lines/417.cf index a184e72584..f18da0686c 100644 --- a/tests/acceptance/10_files/07_delete_lines/417.cf +++ b/tests/acceptance/10_files/07_delete_lines/417.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/418.cf b/tests/acceptance/10_files/07_delete_lines/418.cf index 27d37a0ed4..88525e2ea8 100644 --- a/tests/acceptance/10_files/07_delete_lines/418.cf +++ b/tests/acceptance/10_files/07_delete_lines/418.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/419.cf b/tests/acceptance/10_files/07_delete_lines/419.cf index b0f7bafff2..fa9a24812c 100644 --- a/tests/acceptance/10_files/07_delete_lines/419.cf +++ b/tests/acceptance/10_files/07_delete_lines/419.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/420.cf b/tests/acceptance/10_files/07_delete_lines/420.cf index 329b5cab3a..a08b1668e9 100644 --- a/tests/acceptance/10_files/07_delete_lines/420.cf +++ b/tests/acceptance/10_files/07_delete_lines/420.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/422.cf b/tests/acceptance/10_files/07_delete_lines/422.cf index 8661cb12f7..1ddfad15e4 100644 --- a/tests/acceptance/10_files/07_delete_lines/422.cf +++ b/tests/acceptance/10_files/07_delete_lines/422.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/423.cf b/tests/acceptance/10_files/07_delete_lines/423.cf index efb0fe6d6e..73ab5e556d 100644 --- a/tests/acceptance/10_files/07_delete_lines/423.cf +++ b/tests/acceptance/10_files/07_delete_lines/423.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/424.cf b/tests/acceptance/10_files/07_delete_lines/424.cf index 8f4c73316e..72f3aa2e14 100644 --- a/tests/acceptance/10_files/07_delete_lines/424.cf +++ b/tests/acceptance/10_files/07_delete_lines/424.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/425.cf b/tests/acceptance/10_files/07_delete_lines/425.cf index 220ff6c815..79c6c7b6df 100644 --- a/tests/acceptance/10_files/07_delete_lines/425.cf +++ b/tests/acceptance/10_files/07_delete_lines/425.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/426.cf b/tests/acceptance/10_files/07_delete_lines/426.cf index ffe7eff1bf..676eee8fdc 100644 --- a/tests/acceptance/10_files/07_delete_lines/426.cf +++ b/tests/acceptance/10_files/07_delete_lines/426.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/427.cf b/tests/acceptance/10_files/07_delete_lines/427.cf index 482bd2c011..9e4798af07 100644 --- a/tests/acceptance/10_files/07_delete_lines/427.cf +++ b/tests/acceptance/10_files/07_delete_lines/427.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/428.cf b/tests/acceptance/10_files/07_delete_lines/428.cf index 8189d07e12..eedd2c62b8 100644 --- a/tests/acceptance/10_files/07_delete_lines/428.cf +++ b/tests/acceptance/10_files/07_delete_lines/428.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/429.cf b/tests/acceptance/10_files/07_delete_lines/429.cf index d5315ce8de..3a07b5f907 100644 --- a/tests/acceptance/10_files/07_delete_lines/429.cf +++ b/tests/acceptance/10_files/07_delete_lines/429.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/430.cf b/tests/acceptance/10_files/07_delete_lines/430.cf index b6cc7f85fe..8dbe0c7a46 100644 --- a/tests/acceptance/10_files/07_delete_lines/430.cf +++ b/tests/acceptance/10_files/07_delete_lines/430.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/431.cf b/tests/acceptance/10_files/07_delete_lines/431.cf index 2922ac3a03..a1f54e2959 100644 --- a/tests/acceptance/10_files/07_delete_lines/431.cf +++ b/tests/acceptance/10_files/07_delete_lines/431.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/432.cf b/tests/acceptance/10_files/07_delete_lines/432.cf index 5f7bb01f3f..29083e55b8 100644 --- a/tests/acceptance/10_files/07_delete_lines/432.cf +++ b/tests/acceptance/10_files/07_delete_lines/432.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/433.cf b/tests/acceptance/10_files/07_delete_lines/433.cf index 6599712adc..831003d60a 100644 --- a/tests/acceptance/10_files/07_delete_lines/433.cf +++ b/tests/acceptance/10_files/07_delete_lines/433.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/434.cf b/tests/acceptance/10_files/07_delete_lines/434.cf index aabbdb55c7..d33b2437cd 100644 --- a/tests/acceptance/10_files/07_delete_lines/434.cf +++ b/tests/acceptance/10_files/07_delete_lines/434.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/435.cf b/tests/acceptance/10_files/07_delete_lines/435.cf index a0229276a0..ca91c3f9df 100644 --- a/tests/acceptance/10_files/07_delete_lines/435.cf +++ b/tests/acceptance/10_files/07_delete_lines/435.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/436.cf b/tests/acceptance/10_files/07_delete_lines/436.cf index 1f24f3454d..4b839dddf2 100644 --- a/tests/acceptance/10_files/07_delete_lines/436.cf +++ b/tests/acceptance/10_files/07_delete_lines/436.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/437.cf b/tests/acceptance/10_files/07_delete_lines/437.cf index 2e362cadbe..a9ec00b150 100644 --- a/tests/acceptance/10_files/07_delete_lines/437.cf +++ b/tests/acceptance/10_files/07_delete_lines/437.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/438.cf b/tests/acceptance/10_files/07_delete_lines/438.cf index 23e4eca281..2b7f2da9b2 100644 --- a/tests/acceptance/10_files/07_delete_lines/438.cf +++ b/tests/acceptance/10_files/07_delete_lines/438.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/439.cf b/tests/acceptance/10_files/07_delete_lines/439.cf index 9008dce3b4..8847bdf261 100644 --- a/tests/acceptance/10_files/07_delete_lines/439.cf +++ b/tests/acceptance/10_files/07_delete_lines/439.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/440.cf b/tests/acceptance/10_files/07_delete_lines/440.cf index 6889e23034..25c9c76c2b 100644 --- a/tests/acceptance/10_files/07_delete_lines/440.cf +++ b/tests/acceptance/10_files/07_delete_lines/440.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/441.cf b/tests/acceptance/10_files/07_delete_lines/441.cf index a362a36df0..f693242888 100644 --- a/tests/acceptance/10_files/07_delete_lines/441.cf +++ b/tests/acceptance/10_files/07_delete_lines/441.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/442.cf b/tests/acceptance/10_files/07_delete_lines/442.cf index 34b5671917..35a20a4ee6 100644 --- a/tests/acceptance/10_files/07_delete_lines/442.cf +++ b/tests/acceptance/10_files/07_delete_lines/442.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/443.cf b/tests/acceptance/10_files/07_delete_lines/443.cf index a03058434e..3a71857c29 100644 --- a/tests/acceptance/10_files/07_delete_lines/443.cf +++ b/tests/acceptance/10_files/07_delete_lines/443.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/444.cf b/tests/acceptance/10_files/07_delete_lines/444.cf index 4d33757b3b..456b9c9992 100644 --- a/tests/acceptance/10_files/07_delete_lines/444.cf +++ b/tests/acceptance/10_files/07_delete_lines/444.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/445.cf b/tests/acceptance/10_files/07_delete_lines/445.cf index 4054697ac3..7e10fdb7b4 100644 --- a/tests/acceptance/10_files/07_delete_lines/445.cf +++ b/tests/acceptance/10_files/07_delete_lines/445.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/446.cf b/tests/acceptance/10_files/07_delete_lines/446.cf index 91c39244b6..c65ef20a4a 100644 --- a/tests/acceptance/10_files/07_delete_lines/446.cf +++ b/tests/acceptance/10_files/07_delete_lines/446.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/447.cf b/tests/acceptance/10_files/07_delete_lines/447.cf index 74da46d73d..fb540a6aac 100644 --- a/tests/acceptance/10_files/07_delete_lines/447.cf +++ b/tests/acceptance/10_files/07_delete_lines/447.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/501.cf b/tests/acceptance/10_files/07_delete_lines/501.cf index 6b6d7f0638..5ec3f87ff2 100644 --- a/tests/acceptance/10_files/07_delete_lines/501.cf +++ b/tests/acceptance/10_files/07_delete_lines/501.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/502.cf b/tests/acceptance/10_files/07_delete_lines/502.cf index 1d6adf026e..b70ab5746d 100644 --- a/tests/acceptance/10_files/07_delete_lines/502.cf +++ b/tests/acceptance/10_files/07_delete_lines/502.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/503.cf b/tests/acceptance/10_files/07_delete_lines/503.cf index edf94ba2af..9713d6913f 100644 --- a/tests/acceptance/10_files/07_delete_lines/503.cf +++ b/tests/acceptance/10_files/07_delete_lines/503.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/504.cf b/tests/acceptance/10_files/07_delete_lines/504.cf index 007cd30b54..2658e6a956 100644 --- a/tests/acceptance/10_files/07_delete_lines/504.cf +++ b/tests/acceptance/10_files/07_delete_lines/504.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/505.cf b/tests/acceptance/10_files/07_delete_lines/505.cf index 72663cc94c..a324ce9980 100644 --- a/tests/acceptance/10_files/07_delete_lines/505.cf +++ b/tests/acceptance/10_files/07_delete_lines/505.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/506.cf b/tests/acceptance/10_files/07_delete_lines/506.cf index 08d87dd9c3..8da661c9a1 100644 --- a/tests/acceptance/10_files/07_delete_lines/506.cf +++ b/tests/acceptance/10_files/07_delete_lines/506.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/507.cf b/tests/acceptance/10_files/07_delete_lines/507.cf index f02ed5d548..1aa4a39ed1 100644 --- a/tests/acceptance/10_files/07_delete_lines/507.cf +++ b/tests/acceptance/10_files/07_delete_lines/507.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/508.cf b/tests/acceptance/10_files/07_delete_lines/508.cf index fc21653937..e16a7454aa 100644 --- a/tests/acceptance/10_files/07_delete_lines/508.cf +++ b/tests/acceptance/10_files/07_delete_lines/508.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/509.cf b/tests/acceptance/10_files/07_delete_lines/509.cf index 7c5287085f..bc53f127ee 100644 --- a/tests/acceptance/10_files/07_delete_lines/509.cf +++ b/tests/acceptance/10_files/07_delete_lines/509.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/510.cf b/tests/acceptance/10_files/07_delete_lines/510.cf index 7d28adb1df..355cfa3785 100644 --- a/tests/acceptance/10_files/07_delete_lines/510.cf +++ b/tests/acceptance/10_files/07_delete_lines/510.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/511.cf b/tests/acceptance/10_files/07_delete_lines/511.cf index d5bc06f8b3..337eca4ce6 100644 --- a/tests/acceptance/10_files/07_delete_lines/511.cf +++ b/tests/acceptance/10_files/07_delete_lines/511.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/512.cf b/tests/acceptance/10_files/07_delete_lines/512.cf index 0e46579228..9e83ef8b0a 100644 --- a/tests/acceptance/10_files/07_delete_lines/512.cf +++ b/tests/acceptance/10_files/07_delete_lines/512.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/513.cf b/tests/acceptance/10_files/07_delete_lines/513.cf index 31df3eb58c..4b5e4be4da 100644 --- a/tests/acceptance/10_files/07_delete_lines/513.cf +++ b/tests/acceptance/10_files/07_delete_lines/513.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/514.cf b/tests/acceptance/10_files/07_delete_lines/514.cf index fbabb017fb..7c72c33361 100644 --- a/tests/acceptance/10_files/07_delete_lines/514.cf +++ b/tests/acceptance/10_files/07_delete_lines/514.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/515.cf b/tests/acceptance/10_files/07_delete_lines/515.cf index 7e9c3a4c29..1b27a73c85 100644 --- a/tests/acceptance/10_files/07_delete_lines/515.cf +++ b/tests/acceptance/10_files/07_delete_lines/515.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/516.cf b/tests/acceptance/10_files/07_delete_lines/516.cf index bbdcd70d36..88440ad272 100644 --- a/tests/acceptance/10_files/07_delete_lines/516.cf +++ b/tests/acceptance/10_files/07_delete_lines/516.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/517.cf b/tests/acceptance/10_files/07_delete_lines/517.cf index 68614dc034..fbcae8eb38 100644 --- a/tests/acceptance/10_files/07_delete_lines/517.cf +++ b/tests/acceptance/10_files/07_delete_lines/517.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/518.cf b/tests/acceptance/10_files/07_delete_lines/518.cf index 546709838f..5829beb4ac 100644 --- a/tests/acceptance/10_files/07_delete_lines/518.cf +++ b/tests/acceptance/10_files/07_delete_lines/518.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/519.cf b/tests/acceptance/10_files/07_delete_lines/519.cf index 8098ea5105..2b5ce333dd 100644 --- a/tests/acceptance/10_files/07_delete_lines/519.cf +++ b/tests/acceptance/10_files/07_delete_lines/519.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/520.cf b/tests/acceptance/10_files/07_delete_lines/520.cf index f9d7313a75..97f0e4b604 100644 --- a/tests/acceptance/10_files/07_delete_lines/520.cf +++ b/tests/acceptance/10_files/07_delete_lines/520.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/522.cf b/tests/acceptance/10_files/07_delete_lines/522.cf index 78869c2b9f..51c0b7878b 100644 --- a/tests/acceptance/10_files/07_delete_lines/522.cf +++ b/tests/acceptance/10_files/07_delete_lines/522.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/523.cf b/tests/acceptance/10_files/07_delete_lines/523.cf index 32b73e5ad3..492ea2e210 100644 --- a/tests/acceptance/10_files/07_delete_lines/523.cf +++ b/tests/acceptance/10_files/07_delete_lines/523.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/524.cf b/tests/acceptance/10_files/07_delete_lines/524.cf index 9baabd73b3..e1e48f6c89 100644 --- a/tests/acceptance/10_files/07_delete_lines/524.cf +++ b/tests/acceptance/10_files/07_delete_lines/524.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/525.cf b/tests/acceptance/10_files/07_delete_lines/525.cf index ead662a40e..e8d6761cd9 100644 --- a/tests/acceptance/10_files/07_delete_lines/525.cf +++ b/tests/acceptance/10_files/07_delete_lines/525.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/526.cf b/tests/acceptance/10_files/07_delete_lines/526.cf index de6c5e2b5a..69f38d958e 100644 --- a/tests/acceptance/10_files/07_delete_lines/526.cf +++ b/tests/acceptance/10_files/07_delete_lines/526.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/527.cf b/tests/acceptance/10_files/07_delete_lines/527.cf index 85afcab0b7..fa95d671dd 100644 --- a/tests/acceptance/10_files/07_delete_lines/527.cf +++ b/tests/acceptance/10_files/07_delete_lines/527.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/528.cf b/tests/acceptance/10_files/07_delete_lines/528.cf index e94b7f5feb..91d67258f1 100644 --- a/tests/acceptance/10_files/07_delete_lines/528.cf +++ b/tests/acceptance/10_files/07_delete_lines/528.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/529.cf b/tests/acceptance/10_files/07_delete_lines/529.cf index bf3f6e929a..a045c41a47 100644 --- a/tests/acceptance/10_files/07_delete_lines/529.cf +++ b/tests/acceptance/10_files/07_delete_lines/529.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/530.cf b/tests/acceptance/10_files/07_delete_lines/530.cf index 1239a23992..4e03155ff4 100644 --- a/tests/acceptance/10_files/07_delete_lines/530.cf +++ b/tests/acceptance/10_files/07_delete_lines/530.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/531.cf b/tests/acceptance/10_files/07_delete_lines/531.cf index f18f0f3133..4f00106bbb 100644 --- a/tests/acceptance/10_files/07_delete_lines/531.cf +++ b/tests/acceptance/10_files/07_delete_lines/531.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/532.cf b/tests/acceptance/10_files/07_delete_lines/532.cf index 1cc328cb7b..b50da662f9 100644 --- a/tests/acceptance/10_files/07_delete_lines/532.cf +++ b/tests/acceptance/10_files/07_delete_lines/532.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/533.cf b/tests/acceptance/10_files/07_delete_lines/533.cf index a57f16af70..5e57a42dda 100644 --- a/tests/acceptance/10_files/07_delete_lines/533.cf +++ b/tests/acceptance/10_files/07_delete_lines/533.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/534.cf b/tests/acceptance/10_files/07_delete_lines/534.cf index 4ef55de433..aece9126bb 100644 --- a/tests/acceptance/10_files/07_delete_lines/534.cf +++ b/tests/acceptance/10_files/07_delete_lines/534.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/535.cf b/tests/acceptance/10_files/07_delete_lines/535.cf index b2b3e460e2..fdd2b4a362 100644 --- a/tests/acceptance/10_files/07_delete_lines/535.cf +++ b/tests/acceptance/10_files/07_delete_lines/535.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/536.cf b/tests/acceptance/10_files/07_delete_lines/536.cf index ee8cb5d8f8..56c49015c0 100644 --- a/tests/acceptance/10_files/07_delete_lines/536.cf +++ b/tests/acceptance/10_files/07_delete_lines/536.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/537.cf b/tests/acceptance/10_files/07_delete_lines/537.cf index 01ba9f033b..3ad2c279a2 100644 --- a/tests/acceptance/10_files/07_delete_lines/537.cf +++ b/tests/acceptance/10_files/07_delete_lines/537.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/538.cf b/tests/acceptance/10_files/07_delete_lines/538.cf index cd559adb56..ae35921d9f 100644 --- a/tests/acceptance/10_files/07_delete_lines/538.cf +++ b/tests/acceptance/10_files/07_delete_lines/538.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/539.cf b/tests/acceptance/10_files/07_delete_lines/539.cf index 5a07fbc90c..ddac118708 100644 --- a/tests/acceptance/10_files/07_delete_lines/539.cf +++ b/tests/acceptance/10_files/07_delete_lines/539.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/540.cf b/tests/acceptance/10_files/07_delete_lines/540.cf index 6ed1c3cfd7..a388424927 100644 --- a/tests/acceptance/10_files/07_delete_lines/540.cf +++ b/tests/acceptance/10_files/07_delete_lines/540.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/541.cf b/tests/acceptance/10_files/07_delete_lines/541.cf index 797b19152e..ac65b2f102 100644 --- a/tests/acceptance/10_files/07_delete_lines/541.cf +++ b/tests/acceptance/10_files/07_delete_lines/541.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/542.cf b/tests/acceptance/10_files/07_delete_lines/542.cf index b78e2ea1f6..6ae0f218b0 100644 --- a/tests/acceptance/10_files/07_delete_lines/542.cf +++ b/tests/acceptance/10_files/07_delete_lines/542.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/543.cf b/tests/acceptance/10_files/07_delete_lines/543.cf index 8603c1630f..dcd5078014 100644 --- a/tests/acceptance/10_files/07_delete_lines/543.cf +++ b/tests/acceptance/10_files/07_delete_lines/543.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/544.cf b/tests/acceptance/10_files/07_delete_lines/544.cf index ace72c50b2..1a667c50b0 100644 --- a/tests/acceptance/10_files/07_delete_lines/544.cf +++ b/tests/acceptance/10_files/07_delete_lines/544.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/545.cf b/tests/acceptance/10_files/07_delete_lines/545.cf index ecc8b67ad7..5f6d97a03d 100644 --- a/tests/acceptance/10_files/07_delete_lines/545.cf +++ b/tests/acceptance/10_files/07_delete_lines/545.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/546.cf b/tests/acceptance/10_files/07_delete_lines/546.cf index cdaf320e42..459da8021d 100644 --- a/tests/acceptance/10_files/07_delete_lines/546.cf +++ b/tests/acceptance/10_files/07_delete_lines/546.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/547.cf b/tests/acceptance/10_files/07_delete_lines/547.cf index 453f857d6f..87cd8f8240 100644 --- a/tests/acceptance/10_files/07_delete_lines/547.cf +++ b/tests/acceptance/10_files/07_delete_lines/547.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/601.cf b/tests/acceptance/10_files/07_delete_lines/601.cf index 722beacf37..5fff307618 100644 --- a/tests/acceptance/10_files/07_delete_lines/601.cf +++ b/tests/acceptance/10_files/07_delete_lines/601.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/602.cf b/tests/acceptance/10_files/07_delete_lines/602.cf index f8825a4c66..af930633dd 100644 --- a/tests/acceptance/10_files/07_delete_lines/602.cf +++ b/tests/acceptance/10_files/07_delete_lines/602.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/603.cf b/tests/acceptance/10_files/07_delete_lines/603.cf index 975696f8f2..b6d785ac77 100644 --- a/tests/acceptance/10_files/07_delete_lines/603.cf +++ b/tests/acceptance/10_files/07_delete_lines/603.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/604.cf b/tests/acceptance/10_files/07_delete_lines/604.cf index e4a7f2ac52..63a3633b27 100644 --- a/tests/acceptance/10_files/07_delete_lines/604.cf +++ b/tests/acceptance/10_files/07_delete_lines/604.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/605.cf b/tests/acceptance/10_files/07_delete_lines/605.cf index 79b0955d06..6df90f0bc9 100644 --- a/tests/acceptance/10_files/07_delete_lines/605.cf +++ b/tests/acceptance/10_files/07_delete_lines/605.cf @@ -11,7 +11,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/606.cf b/tests/acceptance/10_files/07_delete_lines/606.cf index 01c8c0354b..fbd8e61803 100644 --- a/tests/acceptance/10_files/07_delete_lines/606.cf +++ b/tests/acceptance/10_files/07_delete_lines/606.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/607.cf b/tests/acceptance/10_files/07_delete_lines/607.cf index f0f638d366..9c5dd25ed6 100644 --- a/tests/acceptance/10_files/07_delete_lines/607.cf +++ b/tests/acceptance/10_files/07_delete_lines/607.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/608.cf b/tests/acceptance/10_files/07_delete_lines/608.cf index e2d66988c7..765fd69c90 100644 --- a/tests/acceptance/10_files/07_delete_lines/608.cf +++ b/tests/acceptance/10_files/07_delete_lines/608.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/609.cf b/tests/acceptance/10_files/07_delete_lines/609.cf index ed3dbfc824..605ed5a1b3 100644 --- a/tests/acceptance/10_files/07_delete_lines/609.cf +++ b/tests/acceptance/10_files/07_delete_lines/609.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/610.cf b/tests/acceptance/10_files/07_delete_lines/610.cf index 4157f459d7..174d71eaaf 100644 --- a/tests/acceptance/10_files/07_delete_lines/610.cf +++ b/tests/acceptance/10_files/07_delete_lines/610.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/611.cf b/tests/acceptance/10_files/07_delete_lines/611.cf index a0de6043cb..141f50843e 100644 --- a/tests/acceptance/10_files/07_delete_lines/611.cf +++ b/tests/acceptance/10_files/07_delete_lines/611.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/612.cf b/tests/acceptance/10_files/07_delete_lines/612.cf index cf5153d301..110d1cc8f8 100644 --- a/tests/acceptance/10_files/07_delete_lines/612.cf +++ b/tests/acceptance/10_files/07_delete_lines/612.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/613.cf b/tests/acceptance/10_files/07_delete_lines/613.cf index ed528ad7db..103c44b6af 100644 --- a/tests/acceptance/10_files/07_delete_lines/613.cf +++ b/tests/acceptance/10_files/07_delete_lines/613.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/614.cf b/tests/acceptance/10_files/07_delete_lines/614.cf index d9380c4371..4c5a8b7164 100644 --- a/tests/acceptance/10_files/07_delete_lines/614.cf +++ b/tests/acceptance/10_files/07_delete_lines/614.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/615.cf b/tests/acceptance/10_files/07_delete_lines/615.cf index 4547db163f..401be24bf1 100644 --- a/tests/acceptance/10_files/07_delete_lines/615.cf +++ b/tests/acceptance/10_files/07_delete_lines/615.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/616.cf b/tests/acceptance/10_files/07_delete_lines/616.cf index d194f56108..a434037536 100644 --- a/tests/acceptance/10_files/07_delete_lines/616.cf +++ b/tests/acceptance/10_files/07_delete_lines/616.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/617.cf b/tests/acceptance/10_files/07_delete_lines/617.cf index a3a9242596..c0feb34d3e 100644 --- a/tests/acceptance/10_files/07_delete_lines/617.cf +++ b/tests/acceptance/10_files/07_delete_lines/617.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/618.cf b/tests/acceptance/10_files/07_delete_lines/618.cf index 336b5b8d9a..7ae7e2fa03 100644 --- a/tests/acceptance/10_files/07_delete_lines/618.cf +++ b/tests/acceptance/10_files/07_delete_lines/618.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/619.cf b/tests/acceptance/10_files/07_delete_lines/619.cf index 33644cbbbb..1fad875c6f 100644 --- a/tests/acceptance/10_files/07_delete_lines/619.cf +++ b/tests/acceptance/10_files/07_delete_lines/619.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/620.cf b/tests/acceptance/10_files/07_delete_lines/620.cf index 6ab974f617..5bf819dea9 100644 --- a/tests/acceptance/10_files/07_delete_lines/620.cf +++ b/tests/acceptance/10_files/07_delete_lines/620.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/622.cf b/tests/acceptance/10_files/07_delete_lines/622.cf index 3572ffe108..b2c557f7e6 100644 --- a/tests/acceptance/10_files/07_delete_lines/622.cf +++ b/tests/acceptance/10_files/07_delete_lines/622.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/623.cf b/tests/acceptance/10_files/07_delete_lines/623.cf index 921f260adc..4081ca42ff 100644 --- a/tests/acceptance/10_files/07_delete_lines/623.cf +++ b/tests/acceptance/10_files/07_delete_lines/623.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/624.cf b/tests/acceptance/10_files/07_delete_lines/624.cf index 8562f7ce23..e10cdccec8 100644 --- a/tests/acceptance/10_files/07_delete_lines/624.cf +++ b/tests/acceptance/10_files/07_delete_lines/624.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/625.cf b/tests/acceptance/10_files/07_delete_lines/625.cf index ce73914d07..71798f87b6 100644 --- a/tests/acceptance/10_files/07_delete_lines/625.cf +++ b/tests/acceptance/10_files/07_delete_lines/625.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/626.cf b/tests/acceptance/10_files/07_delete_lines/626.cf index bd29b9aff1..8609b8c397 100644 --- a/tests/acceptance/10_files/07_delete_lines/626.cf +++ b/tests/acceptance/10_files/07_delete_lines/626.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/627.cf b/tests/acceptance/10_files/07_delete_lines/627.cf index 1567df77e7..588042394d 100644 --- a/tests/acceptance/10_files/07_delete_lines/627.cf +++ b/tests/acceptance/10_files/07_delete_lines/627.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/628.cf b/tests/acceptance/10_files/07_delete_lines/628.cf index d8cd73ee89..0aeba304d0 100644 --- a/tests/acceptance/10_files/07_delete_lines/628.cf +++ b/tests/acceptance/10_files/07_delete_lines/628.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/629.cf b/tests/acceptance/10_files/07_delete_lines/629.cf index fb0cb54fbd..00d130b83f 100644 --- a/tests/acceptance/10_files/07_delete_lines/629.cf +++ b/tests/acceptance/10_files/07_delete_lines/629.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/630.cf b/tests/acceptance/10_files/07_delete_lines/630.cf index 09a1bd38fd..7611c4cbce 100644 --- a/tests/acceptance/10_files/07_delete_lines/630.cf +++ b/tests/acceptance/10_files/07_delete_lines/630.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/631.cf b/tests/acceptance/10_files/07_delete_lines/631.cf index e72a700d87..b58177141d 100644 --- a/tests/acceptance/10_files/07_delete_lines/631.cf +++ b/tests/acceptance/10_files/07_delete_lines/631.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/632.cf b/tests/acceptance/10_files/07_delete_lines/632.cf index 5ddae1687f..006df4170a 100644 --- a/tests/acceptance/10_files/07_delete_lines/632.cf +++ b/tests/acceptance/10_files/07_delete_lines/632.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/633.cf b/tests/acceptance/10_files/07_delete_lines/633.cf index 88e2aa3643..85656bdbf4 100644 --- a/tests/acceptance/10_files/07_delete_lines/633.cf +++ b/tests/acceptance/10_files/07_delete_lines/633.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/634.cf b/tests/acceptance/10_files/07_delete_lines/634.cf index d0c5a8dfaf..64d5f0d6c9 100644 --- a/tests/acceptance/10_files/07_delete_lines/634.cf +++ b/tests/acceptance/10_files/07_delete_lines/634.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/635.cf b/tests/acceptance/10_files/07_delete_lines/635.cf index f0dc92afdc..c8d41dbd67 100644 --- a/tests/acceptance/10_files/07_delete_lines/635.cf +++ b/tests/acceptance/10_files/07_delete_lines/635.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/636.cf b/tests/acceptance/10_files/07_delete_lines/636.cf index 41b6aa04df..9bd3d683f2 100644 --- a/tests/acceptance/10_files/07_delete_lines/636.cf +++ b/tests/acceptance/10_files/07_delete_lines/636.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/637.cf b/tests/acceptance/10_files/07_delete_lines/637.cf index 6182690f44..947a625379 100644 --- a/tests/acceptance/10_files/07_delete_lines/637.cf +++ b/tests/acceptance/10_files/07_delete_lines/637.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/638.cf b/tests/acceptance/10_files/07_delete_lines/638.cf index 458fded6d0..dc3d6eee54 100644 --- a/tests/acceptance/10_files/07_delete_lines/638.cf +++ b/tests/acceptance/10_files/07_delete_lines/638.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/639.cf b/tests/acceptance/10_files/07_delete_lines/639.cf index 05e08077eb..c8bcd772bc 100644 --- a/tests/acceptance/10_files/07_delete_lines/639.cf +++ b/tests/acceptance/10_files/07_delete_lines/639.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/640.cf b/tests/acceptance/10_files/07_delete_lines/640.cf index 432a1b5cc5..aafb51c638 100644 --- a/tests/acceptance/10_files/07_delete_lines/640.cf +++ b/tests/acceptance/10_files/07_delete_lines/640.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/641.cf b/tests/acceptance/10_files/07_delete_lines/641.cf index a6f97691f9..3557641ccb 100644 --- a/tests/acceptance/10_files/07_delete_lines/641.cf +++ b/tests/acceptance/10_files/07_delete_lines/641.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/642.cf b/tests/acceptance/10_files/07_delete_lines/642.cf index 98f98528d7..144151a57e 100644 --- a/tests/acceptance/10_files/07_delete_lines/642.cf +++ b/tests/acceptance/10_files/07_delete_lines/642.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/643.cf b/tests/acceptance/10_files/07_delete_lines/643.cf index 37a9bc9688..7c62478cd7 100644 --- a/tests/acceptance/10_files/07_delete_lines/643.cf +++ b/tests/acceptance/10_files/07_delete_lines/643.cf @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/644.cf b/tests/acceptance/10_files/07_delete_lines/644.cf index 5660df3e5f..555ddd0b25 100644 --- a/tests/acceptance/10_files/07_delete_lines/644.cf +++ b/tests/acceptance/10_files/07_delete_lines/644.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/645.cf b/tests/acceptance/10_files/07_delete_lines/645.cf index 40830061eb..bd44f56193 100644 --- a/tests/acceptance/10_files/07_delete_lines/645.cf +++ b/tests/acceptance/10_files/07_delete_lines/645.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/646.cf b/tests/acceptance/10_files/07_delete_lines/646.cf index 15fba10fd7..741118512e 100644 --- a/tests/acceptance/10_files/07_delete_lines/646.cf +++ b/tests/acceptance/10_files/07_delete_lines/646.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/647.cf b/tests/acceptance/10_files/07_delete_lines/647.cf index adbae58ecd..bf8b9af9de 100644 --- a/tests/acceptance/10_files/07_delete_lines/647.cf +++ b/tests/acceptance/10_files/07_delete_lines/647.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/700.cf b/tests/acceptance/10_files/07_delete_lines/700.cf index 807d54fa7c..2e68ce27cb 100644 --- a/tests/acceptance/10_files/07_delete_lines/700.cf +++ b/tests/acceptance/10_files/07_delete_lines/700.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/no_matching_end.cf b/tests/acceptance/10_files/07_delete_lines/no_matching_end.cf index b4e60705a0..62980f147c 100644 --- a/tests/acceptance/10_files/07_delete_lines/no_matching_end.cf +++ b/tests/acceptance/10_files/07_delete_lines/no_matching_end.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/07_delete_lines/select_end_match_eof_true.cf b/tests/acceptance/10_files/07_delete_lines/select_end_match_eof_true.cf index d3416f0afa..2c8e946fb6 100644 --- a/tests/acceptance/10_files/07_delete_lines/select_end_match_eof_true.cf +++ b/tests/acceptance/10_files/07_delete_lines/select_end_match_eof_true.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/001.cf b/tests/acceptance/10_files/08_field_edits/001.cf index 44a00922b1..6377a27cc5 100644 --- a/tests/acceptance/10_files/08_field_edits/001.cf +++ b/tests/acceptance/10_files/08_field_edits/001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/002.cf b/tests/acceptance/10_files/08_field_edits/002.cf index d7a45bf096..7f78267d87 100644 --- a/tests/acceptance/10_files/08_field_edits/002.cf +++ b/tests/acceptance/10_files/08_field_edits/002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/003.cf b/tests/acceptance/10_files/08_field_edits/003.cf index 91ef91cf6c..7c13985c5e 100644 --- a/tests/acceptance/10_files/08_field_edits/003.cf +++ b/tests/acceptance/10_files/08_field_edits/003.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/004.x.cf b/tests/acceptance/10_files/08_field_edits/004.x.cf index 6a7a544dd7..ef268404c4 100644 --- a/tests/acceptance/10_files/08_field_edits/004.x.cf +++ b/tests/acceptance/10_files/08_field_edits/004.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/005.cf b/tests/acceptance/10_files/08_field_edits/005.cf index 3cae2f25e2..529a7e704d 100644 --- a/tests/acceptance/10_files/08_field_edits/005.cf +++ b/tests/acceptance/10_files/08_field_edits/005.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/006.x.cf b/tests/acceptance/10_files/08_field_edits/006.x.cf index 49debce6cc..bb05b6ef2e 100644 --- a/tests/acceptance/10_files/08_field_edits/006.x.cf +++ b/tests/acceptance/10_files/08_field_edits/006.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/007.x.cf b/tests/acceptance/10_files/08_field_edits/007.x.cf index f01f45ded4..a414584457 100644 --- a/tests/acceptance/10_files/08_field_edits/007.x.cf +++ b/tests/acceptance/10_files/08_field_edits/007.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/008.x.cf b/tests/acceptance/10_files/08_field_edits/008.x.cf index 49debce6cc..bb05b6ef2e 100644 --- a/tests/acceptance/10_files/08_field_edits/008.x.cf +++ b/tests/acceptance/10_files/08_field_edits/008.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/009.cf b/tests/acceptance/10_files/08_field_edits/009.cf index 134fcff8dd..f58644df37 100644 --- a/tests/acceptance/10_files/08_field_edits/009.cf +++ b/tests/acceptance/10_files/08_field_edits/009.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/010.cf b/tests/acceptance/10_files/08_field_edits/010.cf index 385ab83be5..18d1cbeec5 100644 --- a/tests/acceptance/10_files/08_field_edits/010.cf +++ b/tests/acceptance/10_files/08_field_edits/010.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/015.cf b/tests/acceptance/10_files/08_field_edits/015.cf index 0d50cbbc39..faeec4f16b 100644 --- a/tests/acceptance/10_files/08_field_edits/015.cf +++ b/tests/acceptance/10_files/08_field_edits/015.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/016.cf b/tests/acceptance/10_files/08_field_edits/016.cf index 3829fdd4c9..f21fd5a5dd 100644 --- a/tests/acceptance/10_files/08_field_edits/016.cf +++ b/tests/acceptance/10_files/08_field_edits/016.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/017.cf b/tests/acceptance/10_files/08_field_edits/017.cf index 8351970f84..759a0b729c 100644 --- a/tests/acceptance/10_files/08_field_edits/017.cf +++ b/tests/acceptance/10_files/08_field_edits/017.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/018.cf b/tests/acceptance/10_files/08_field_edits/018.cf index 3160e69956..5598b5a500 100644 --- a/tests/acceptance/10_files/08_field_edits/018.cf +++ b/tests/acceptance/10_files/08_field_edits/018.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/019.cf b/tests/acceptance/10_files/08_field_edits/019.cf index 238023bbe9..c2c6960bb7 100644 --- a/tests/acceptance/10_files/08_field_edits/019.cf +++ b/tests/acceptance/10_files/08_field_edits/019.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/020.cf b/tests/acceptance/10_files/08_field_edits/020.cf index 5f9a58f2b9..a0598f6ea5 100644 --- a/tests/acceptance/10_files/08_field_edits/020.cf +++ b/tests/acceptance/10_files/08_field_edits/020.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/023.cf b/tests/acceptance/10_files/08_field_edits/023.cf index 17ac175b7e..ef2d701039 100644 --- a/tests/acceptance/10_files/08_field_edits/023.cf +++ b/tests/acceptance/10_files/08_field_edits/023.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/024.cf b/tests/acceptance/10_files/08_field_edits/024.cf index eb11cca2ae..ec28cc87c4 100644 --- a/tests/acceptance/10_files/08_field_edits/024.cf +++ b/tests/acceptance/10_files/08_field_edits/024.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/027.cf b/tests/acceptance/10_files/08_field_edits/027.cf index a967e66193..01b33b6256 100644 --- a/tests/acceptance/10_files/08_field_edits/027.cf +++ b/tests/acceptance/10_files/08_field_edits/027.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/028.cf b/tests/acceptance/10_files/08_field_edits/028.cf index 01a00b7fc2..34c7b2cb29 100644 --- a/tests/acceptance/10_files/08_field_edits/028.cf +++ b/tests/acceptance/10_files/08_field_edits/028.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/029.cf b/tests/acceptance/10_files/08_field_edits/029.cf index faa665046e..b0e7ff1abc 100644 --- a/tests/acceptance/10_files/08_field_edits/029.cf +++ b/tests/acceptance/10_files/08_field_edits/029.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/030.cf b/tests/acceptance/10_files/08_field_edits/030.cf index f55d66f881..39b8e2d100 100644 --- a/tests/acceptance/10_files/08_field_edits/030.cf +++ b/tests/acceptance/10_files/08_field_edits/030.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/031.cf b/tests/acceptance/10_files/08_field_edits/031.cf index 622d66ee03..bef5dcc063 100644 --- a/tests/acceptance/10_files/08_field_edits/031.cf +++ b/tests/acceptance/10_files/08_field_edits/031.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/032.cf b/tests/acceptance/10_files/08_field_edits/032.cf index d3d33c25b0..1c9cf1e079 100644 --- a/tests/acceptance/10_files/08_field_edits/032.cf +++ b/tests/acceptance/10_files/08_field_edits/032.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/033.cf b/tests/acceptance/10_files/08_field_edits/033.cf index ed8bb37536..34b3f2630e 100644 --- a/tests/acceptance/10_files/08_field_edits/033.cf +++ b/tests/acceptance/10_files/08_field_edits/033.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/036.cf b/tests/acceptance/10_files/08_field_edits/036.cf index a6838b3451..61ccc30442 100644 --- a/tests/acceptance/10_files/08_field_edits/036.cf +++ b/tests/acceptance/10_files/08_field_edits/036.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/037.cf b/tests/acceptance/10_files/08_field_edits/037.cf index 26d018be54..b6795488b9 100644 --- a/tests/acceptance/10_files/08_field_edits/037.cf +++ b/tests/acceptance/10_files/08_field_edits/037.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/038.x.cf b/tests/acceptance/10_files/08_field_edits/038.x.cf index c211071e17..f9ed88f1c8 100644 --- a/tests/acceptance/10_files/08_field_edits/038.x.cf +++ b/tests/acceptance/10_files/08_field_edits/038.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/file_content.cf b/tests/acceptance/10_files/08_field_edits/file_content.cf index 8f2e9f5978..524f5ed69b 100644 --- a/tests/acceptance/10_files/08_field_edits/file_content.cf +++ b/tests/acceptance/10_files/08_field_edits/file_content.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/file_content.error.cf b/tests/acceptance/10_files/08_field_edits/file_content.error.cf index cc1fa1392f..ec783cd998 100644 --- a/tests/acceptance/10_files/08_field_edits/file_content.error.cf +++ b/tests/acceptance/10_files/08_field_edits/file_content.error.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/set_classes_in_warn_only.cf b/tests/acceptance/10_files/08_field_edits/set_classes_in_warn_only.cf index f77f084b4c..5e399e99e2 100644 --- a/tests/acceptance/10_files/08_field_edits/set_classes_in_warn_only.cf +++ b/tests/acceptance/10_files/08_field_edits/set_classes_in_warn_only.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -118,4 +118,3 @@ bundle agent check !(test_result_kept_ok.test_result_failed_failed):: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/10_files/08_field_edits/set_empty_field_erroneous_message.cf b/tests/acceptance/10_files/08_field_edits/set_empty_field_erroneous_message.cf index 2927709f55..bfcc745227 100644 --- a/tests/acceptance/10_files/08_field_edits/set_empty_field_erroneous_message.cf +++ b/tests/acceptance/10_files/08_field_edits/set_empty_field_erroneous_message.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/set_empty_field_erroneous_message.cf.sub b/tests/acceptance/10_files/08_field_edits/set_empty_field_erroneous_message.cf.sub index e2814166ed..823a73b783 100644 --- a/tests/acceptance/10_files/08_field_edits/set_empty_field_erroneous_message.cf.sub +++ b/tests/acceptance/10_files/08_field_edits/set_empty_field_erroneous_message.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { editor }; } diff --git a/tests/acceptance/10_files/08_field_edits/set_value_line_long.cf b/tests/acceptance/10_files/08_field_edits/set_value_line_long.cf index 088f06343d..f8279d0301 100644 --- a/tests/acceptance/10_files/08_field_edits/set_value_line_long.cf +++ b/tests/acceptance/10_files/08_field_edits/set_value_line_long.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/staging/011.x.cf b/tests/acceptance/10_files/08_field_edits/staging/011.x.cf index cffad95e10..228ed541f8 100644 --- a/tests/acceptance/10_files/08_field_edits/staging/011.x.cf +++ b/tests/acceptance/10_files/08_field_edits/staging/011.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/staging/012.x.cf b/tests/acceptance/10_files/08_field_edits/staging/012.x.cf index 094624008a..4bb1d5b2b6 100644 --- a/tests/acceptance/10_files/08_field_edits/staging/012.x.cf +++ b/tests/acceptance/10_files/08_field_edits/staging/012.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/staging/013.x.cf b/tests/acceptance/10_files/08_field_edits/staging/013.x.cf index 13e05dabef..a2148be34f 100644 --- a/tests/acceptance/10_files/08_field_edits/staging/013.x.cf +++ b/tests/acceptance/10_files/08_field_edits/staging/013.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/staging/014.x.cf b/tests/acceptance/10_files/08_field_edits/staging/014.x.cf index 4c69bc6891..e1cd4927c5 100644 --- a/tests/acceptance/10_files/08_field_edits/staging/014.x.cf +++ b/tests/acceptance/10_files/08_field_edits/staging/014.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/staging/021.x.cf b/tests/acceptance/10_files/08_field_edits/staging/021.x.cf index 4700c76a07..99e025608e 100644 --- a/tests/acceptance/10_files/08_field_edits/staging/021.x.cf +++ b/tests/acceptance/10_files/08_field_edits/staging/021.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/staging/022.x.cf b/tests/acceptance/10_files/08_field_edits/staging/022.x.cf index bb5c572a48..7e09d6a0aa 100644 --- a/tests/acceptance/10_files/08_field_edits/staging/022.x.cf +++ b/tests/acceptance/10_files/08_field_edits/staging/022.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/staging/025.cf b/tests/acceptance/10_files/08_field_edits/staging/025.cf index 794b178da1..b47158233b 100644 --- a/tests/acceptance/10_files/08_field_edits/staging/025.cf +++ b/tests/acceptance/10_files/08_field_edits/staging/025.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/staging/026.cf b/tests/acceptance/10_files/08_field_edits/staging/026.cf index 56a54fa478..2c648a139f 100644 --- a/tests/acceptance/10_files/08_field_edits/staging/026.cf +++ b/tests/acceptance/10_files/08_field_edits/staging/026.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/staging/034.x.cf b/tests/acceptance/10_files/08_field_edits/staging/034.x.cf index 65edcb3aab..889569bbdb 100644 --- a/tests/acceptance/10_files/08_field_edits/staging/034.x.cf +++ b/tests/acceptance/10_files/08_field_edits/staging/034.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/staging/035.x.cf b/tests/acceptance/10_files/08_field_edits/staging/035.x.cf index 205525e57c..3d51c9154b 100644 --- a/tests/acceptance/10_files/08_field_edits/staging/035.x.cf +++ b/tests/acceptance/10_files/08_field_edits/staging/035.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/staging/039.cf b/tests/acceptance/10_files/08_field_edits/staging/039.cf index b60e18b4de..0943048bd3 100644 --- a/tests/acceptance/10_files/08_field_edits/staging/039.cf +++ b/tests/acceptance/10_files/08_field_edits/staging/039.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/staging/040.cf b/tests/acceptance/10_files/08_field_edits/staging/040.cf index b69ccc8a66..942e5d0228 100644 --- a/tests/acceptance/10_files/08_field_edits/staging/040.cf +++ b/tests/acceptance/10_files/08_field_edits/staging/040.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/staging/041.x.cf b/tests/acceptance/10_files/08_field_edits/staging/041.x.cf index cf17444e5e..9e2d352d06 100644 --- a/tests/acceptance/10_files/08_field_edits/staging/041.x.cf +++ b/tests/acceptance/10_files/08_field_edits/staging/041.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/staging/042.x.cf b/tests/acceptance/10_files/08_field_edits/staging/042.x.cf index 6e84185d67..afd813d4b6 100644 --- a/tests/acceptance/10_files/08_field_edits/staging/042.x.cf +++ b/tests/acceptance/10_files/08_field_edits/staging/042.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/staging/043.x.cf b/tests/acceptance/10_files/08_field_edits/staging/043.x.cf index 42e7870fe1..f7a07e4d8d 100644 --- a/tests/acceptance/10_files/08_field_edits/staging/043.x.cf +++ b/tests/acceptance/10_files/08_field_edits/staging/043.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/staging/044.x.cf b/tests/acceptance/10_files/08_field_edits/staging/044.x.cf index 739502098d..6159dc6ab6 100644 --- a/tests/acceptance/10_files/08_field_edits/staging/044.x.cf +++ b/tests/acceptance/10_files/08_field_edits/staging/044.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/staging/045.x.cf b/tests/acceptance/10_files/08_field_edits/staging/045.x.cf index 48fb7cad45..8162c266bc 100644 --- a/tests/acceptance/10_files/08_field_edits/staging/045.x.cf +++ b/tests/acceptance/10_files/08_field_edits/staging/045.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/08_field_edits/staging/046.x.cf b/tests/acceptance/10_files/08_field_edits/staging/046.x.cf index 6e84185d67..afd813d4b6 100644 --- a/tests/acceptance/10_files/08_field_edits/staging/046.x.cf +++ b/tests/acceptance/10_files/08_field_edits/staging/046.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/001.cf b/tests/acceptance/10_files/09_insert_lines/001.cf index 5c9861c020..808fb18bbb 100644 --- a/tests/acceptance/10_files/09_insert_lines/001.cf +++ b/tests/acceptance/10_files/09_insert_lines/001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/002.cf b/tests/acceptance/10_files/09_insert_lines/002.cf index 658e3aa31b..f58919b8cf 100644 --- a/tests/acceptance/10_files/09_insert_lines/002.cf +++ b/tests/acceptance/10_files/09_insert_lines/002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/003.cf b/tests/acceptance/10_files/09_insert_lines/003.cf index bd96b1a2d7..a3c0ba15cc 100644 --- a/tests/acceptance/10_files/09_insert_lines/003.cf +++ b/tests/acceptance/10_files/09_insert_lines/003.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/004.cf b/tests/acceptance/10_files/09_insert_lines/004.cf index dc8756b99d..58b5e488df 100644 --- a/tests/acceptance/10_files/09_insert_lines/004.cf +++ b/tests/acceptance/10_files/09_insert_lines/004.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/005.cf b/tests/acceptance/10_files/09_insert_lines/005.cf index a9b0be7a40..0ed6f4fd36 100644 --- a/tests/acceptance/10_files/09_insert_lines/005.cf +++ b/tests/acceptance/10_files/09_insert_lines/005.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/006.cf b/tests/acceptance/10_files/09_insert_lines/006.cf index 59b127c617..9fff5f8448 100644 --- a/tests/acceptance/10_files/09_insert_lines/006.cf +++ b/tests/acceptance/10_files/09_insert_lines/006.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/007.cf b/tests/acceptance/10_files/09_insert_lines/007.cf index 019d6e8535..17258e1981 100644 --- a/tests/acceptance/10_files/09_insert_lines/007.cf +++ b/tests/acceptance/10_files/09_insert_lines/007.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/008.cf b/tests/acceptance/10_files/09_insert_lines/008.cf index d88208645a..0edc4d1b10 100644 --- a/tests/acceptance/10_files/09_insert_lines/008.cf +++ b/tests/acceptance/10_files/09_insert_lines/008.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/009.cf b/tests/acceptance/10_files/09_insert_lines/009.cf index 7f323e02ff..381074d0a6 100644 --- a/tests/acceptance/10_files/09_insert_lines/009.cf +++ b/tests/acceptance/10_files/09_insert_lines/009.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/010.cf b/tests/acceptance/10_files/09_insert_lines/010.cf index 863ab7c406..470f5b32cc 100644 --- a/tests/acceptance/10_files/09_insert_lines/010.cf +++ b/tests/acceptance/10_files/09_insert_lines/010.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/011.cf b/tests/acceptance/10_files/09_insert_lines/011.cf index f9c3198053..624734a4a9 100644 --- a/tests/acceptance/10_files/09_insert_lines/011.cf +++ b/tests/acceptance/10_files/09_insert_lines/011.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/012.cf b/tests/acceptance/10_files/09_insert_lines/012.cf index 69a680b20e..cb2a6d3044 100644 --- a/tests/acceptance/10_files/09_insert_lines/012.cf +++ b/tests/acceptance/10_files/09_insert_lines/012.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/013.cf b/tests/acceptance/10_files/09_insert_lines/013.cf index 9ef8afe2a2..e6aee1c1ed 100644 --- a/tests/acceptance/10_files/09_insert_lines/013.cf +++ b/tests/acceptance/10_files/09_insert_lines/013.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/014.cf b/tests/acceptance/10_files/09_insert_lines/014.cf index 33203fbdd4..60881eb392 100644 --- a/tests/acceptance/10_files/09_insert_lines/014.cf +++ b/tests/acceptance/10_files/09_insert_lines/014.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/015.cf b/tests/acceptance/10_files/09_insert_lines/015.cf index 5439e8711c..c330212284 100644 --- a/tests/acceptance/10_files/09_insert_lines/015.cf +++ b/tests/acceptance/10_files/09_insert_lines/015.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/016.cf b/tests/acceptance/10_files/09_insert_lines/016.cf index 443d6e17c6..07023a561e 100644 --- a/tests/acceptance/10_files/09_insert_lines/016.cf +++ b/tests/acceptance/10_files/09_insert_lines/016.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/017.cf b/tests/acceptance/10_files/09_insert_lines/017.cf index 66882d5a44..7ce56636df 100644 --- a/tests/acceptance/10_files/09_insert_lines/017.cf +++ b/tests/acceptance/10_files/09_insert_lines/017.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/019.cf b/tests/acceptance/10_files/09_insert_lines/019.cf index e4ca9e318f..be68ef9383 100644 --- a/tests/acceptance/10_files/09_insert_lines/019.cf +++ b/tests/acceptance/10_files/09_insert_lines/019.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/020.cf b/tests/acceptance/10_files/09_insert_lines/020.cf index 2397538784..c6011cba56 100644 --- a/tests/acceptance/10_files/09_insert_lines/020.cf +++ b/tests/acceptance/10_files/09_insert_lines/020.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/021.cf b/tests/acceptance/10_files/09_insert_lines/021.cf index a5bfd3e5bf..4f07b03491 100644 --- a/tests/acceptance/10_files/09_insert_lines/021.cf +++ b/tests/acceptance/10_files/09_insert_lines/021.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/101.cf b/tests/acceptance/10_files/09_insert_lines/101.cf index 3e0023269c..663225a66a 100644 --- a/tests/acceptance/10_files/09_insert_lines/101.cf +++ b/tests/acceptance/10_files/09_insert_lines/101.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/102.cf b/tests/acceptance/10_files/09_insert_lines/102.cf index 3534363373..713846198c 100644 --- a/tests/acceptance/10_files/09_insert_lines/102.cf +++ b/tests/acceptance/10_files/09_insert_lines/102.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/103.cf b/tests/acceptance/10_files/09_insert_lines/103.cf index 9f6433dd90..65decb118f 100644 --- a/tests/acceptance/10_files/09_insert_lines/103.cf +++ b/tests/acceptance/10_files/09_insert_lines/103.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/104.cf b/tests/acceptance/10_files/09_insert_lines/104.cf index 7d4bed7678..78132e75ed 100644 --- a/tests/acceptance/10_files/09_insert_lines/104.cf +++ b/tests/acceptance/10_files/09_insert_lines/104.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/105.cf b/tests/acceptance/10_files/09_insert_lines/105.cf index 68630cb9c8..5e8bd3b455 100644 --- a/tests/acceptance/10_files/09_insert_lines/105.cf +++ b/tests/acceptance/10_files/09_insert_lines/105.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/106.cf b/tests/acceptance/10_files/09_insert_lines/106.cf index 57e3dad4c0..4d1cfe6382 100644 --- a/tests/acceptance/10_files/09_insert_lines/106.cf +++ b/tests/acceptance/10_files/09_insert_lines/106.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/107.cf b/tests/acceptance/10_files/09_insert_lines/107.cf index 27580172ac..e5484b324e 100644 --- a/tests/acceptance/10_files/09_insert_lines/107.cf +++ b/tests/acceptance/10_files/09_insert_lines/107.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/108.cf b/tests/acceptance/10_files/09_insert_lines/108.cf index 54157e6a63..5854494fbf 100644 --- a/tests/acceptance/10_files/09_insert_lines/108.cf +++ b/tests/acceptance/10_files/09_insert_lines/108.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/109.cf b/tests/acceptance/10_files/09_insert_lines/109.cf index f1c6d5f97b..071f8fda9a 100644 --- a/tests/acceptance/10_files/09_insert_lines/109.cf +++ b/tests/acceptance/10_files/09_insert_lines/109.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/112.cf b/tests/acceptance/10_files/09_insert_lines/112.cf index 9cf6119ad5..b2e4ae2cda 100644 --- a/tests/acceptance/10_files/09_insert_lines/112.cf +++ b/tests/acceptance/10_files/09_insert_lines/112.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/113.cf b/tests/acceptance/10_files/09_insert_lines/113.cf index 883d9e00f0..570aa677cc 100644 --- a/tests/acceptance/10_files/09_insert_lines/113.cf +++ b/tests/acceptance/10_files/09_insert_lines/113.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/114.cf b/tests/acceptance/10_files/09_insert_lines/114.cf index 280790130c..a3316a0ae2 100644 --- a/tests/acceptance/10_files/09_insert_lines/114.cf +++ b/tests/acceptance/10_files/09_insert_lines/114.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/115.cf b/tests/acceptance/10_files/09_insert_lines/115.cf index 937a1f12b8..5871cc3d16 100644 --- a/tests/acceptance/10_files/09_insert_lines/115.cf +++ b/tests/acceptance/10_files/09_insert_lines/115.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/116.cf b/tests/acceptance/10_files/09_insert_lines/116.cf index 7e135e391a..ec1191c7aa 100644 --- a/tests/acceptance/10_files/09_insert_lines/116.cf +++ b/tests/acceptance/10_files/09_insert_lines/116.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/117.cf b/tests/acceptance/10_files/09_insert_lines/117.cf index db52fe3e1c..5635975e25 100644 --- a/tests/acceptance/10_files/09_insert_lines/117.cf +++ b/tests/acceptance/10_files/09_insert_lines/117.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/118.cf b/tests/acceptance/10_files/09_insert_lines/118.cf index 5e8a0c5fc6..383c4c5063 100644 --- a/tests/acceptance/10_files/09_insert_lines/118.cf +++ b/tests/acceptance/10_files/09_insert_lines/118.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/119.cf b/tests/acceptance/10_files/09_insert_lines/119.cf index 7f99df3f4c..aede846a71 100644 --- a/tests/acceptance/10_files/09_insert_lines/119.cf +++ b/tests/acceptance/10_files/09_insert_lines/119.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/121.cf b/tests/acceptance/10_files/09_insert_lines/121.cf index 75f223d6d0..87fbc937e5 100644 --- a/tests/acceptance/10_files/09_insert_lines/121.cf +++ b/tests/acceptance/10_files/09_insert_lines/121.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/122.cf b/tests/acceptance/10_files/09_insert_lines/122.cf index 5bd406048a..593b1e27a1 100644 --- a/tests/acceptance/10_files/09_insert_lines/122.cf +++ b/tests/acceptance/10_files/09_insert_lines/122.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/201.cf b/tests/acceptance/10_files/09_insert_lines/201.cf index 24e646e1ea..dc3914a53f 100644 --- a/tests/acceptance/10_files/09_insert_lines/201.cf +++ b/tests/acceptance/10_files/09_insert_lines/201.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/202.cf b/tests/acceptance/10_files/09_insert_lines/202.cf index 2758ab0b3a..261b8f3dbf 100644 --- a/tests/acceptance/10_files/09_insert_lines/202.cf +++ b/tests/acceptance/10_files/09_insert_lines/202.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/203.cf b/tests/acceptance/10_files/09_insert_lines/203.cf index e8bf97494d..a4ffac8904 100644 --- a/tests/acceptance/10_files/09_insert_lines/203.cf +++ b/tests/acceptance/10_files/09_insert_lines/203.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/204.cf b/tests/acceptance/10_files/09_insert_lines/204.cf index b92a540e31..83a8d4cf87 100644 --- a/tests/acceptance/10_files/09_insert_lines/204.cf +++ b/tests/acceptance/10_files/09_insert_lines/204.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/205.cf b/tests/acceptance/10_files/09_insert_lines/205.cf index b6b962803f..e17c1541d0 100644 --- a/tests/acceptance/10_files/09_insert_lines/205.cf +++ b/tests/acceptance/10_files/09_insert_lines/205.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/206.cf b/tests/acceptance/10_files/09_insert_lines/206.cf index 9df27e54f5..bf9efa1671 100644 --- a/tests/acceptance/10_files/09_insert_lines/206.cf +++ b/tests/acceptance/10_files/09_insert_lines/206.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/207.cf b/tests/acceptance/10_files/09_insert_lines/207.cf index b8386c80d6..219a367cf4 100644 --- a/tests/acceptance/10_files/09_insert_lines/207.cf +++ b/tests/acceptance/10_files/09_insert_lines/207.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/208.cf b/tests/acceptance/10_files/09_insert_lines/208.cf index 08a779f172..e2e1a0f72e 100644 --- a/tests/acceptance/10_files/09_insert_lines/208.cf +++ b/tests/acceptance/10_files/09_insert_lines/208.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/212.cf b/tests/acceptance/10_files/09_insert_lines/212.cf index 25a19edd1b..d4d8badc7b 100644 --- a/tests/acceptance/10_files/09_insert_lines/212.cf +++ b/tests/acceptance/10_files/09_insert_lines/212.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/213.cf b/tests/acceptance/10_files/09_insert_lines/213.cf index 968197b0c1..b345fd0ca8 100644 --- a/tests/acceptance/10_files/09_insert_lines/213.cf +++ b/tests/acceptance/10_files/09_insert_lines/213.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/214.cf b/tests/acceptance/10_files/09_insert_lines/214.cf index 2b539760d1..e6bf01223c 100644 --- a/tests/acceptance/10_files/09_insert_lines/214.cf +++ b/tests/acceptance/10_files/09_insert_lines/214.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/215.cf b/tests/acceptance/10_files/09_insert_lines/215.cf index bd710de6ae..9ba9137f75 100644 --- a/tests/acceptance/10_files/09_insert_lines/215.cf +++ b/tests/acceptance/10_files/09_insert_lines/215.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/216.cf b/tests/acceptance/10_files/09_insert_lines/216.cf index 54e1d9418e..f1aadedcfd 100644 --- a/tests/acceptance/10_files/09_insert_lines/216.cf +++ b/tests/acceptance/10_files/09_insert_lines/216.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/217.cf b/tests/acceptance/10_files/09_insert_lines/217.cf index c04075d0bf..b4885f3a99 100644 --- a/tests/acceptance/10_files/09_insert_lines/217.cf +++ b/tests/acceptance/10_files/09_insert_lines/217.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/218.cf b/tests/acceptance/10_files/09_insert_lines/218.cf index 307534fe82..36e31238d5 100644 --- a/tests/acceptance/10_files/09_insert_lines/218.cf +++ b/tests/acceptance/10_files/09_insert_lines/218.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/219.cf b/tests/acceptance/10_files/09_insert_lines/219.cf index ed9ca61279..1240046f65 100644 --- a/tests/acceptance/10_files/09_insert_lines/219.cf +++ b/tests/acceptance/10_files/09_insert_lines/219.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/221.cf b/tests/acceptance/10_files/09_insert_lines/221.cf index 21c786b17c..dae1ce96fa 100644 --- a/tests/acceptance/10_files/09_insert_lines/221.cf +++ b/tests/acceptance/10_files/09_insert_lines/221.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/222.cf b/tests/acceptance/10_files/09_insert_lines/222.cf index 9de53b3b09..f527cf73af 100644 --- a/tests/acceptance/10_files/09_insert_lines/222.cf +++ b/tests/acceptance/10_files/09_insert_lines/222.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/300.cf b/tests/acceptance/10_files/09_insert_lines/300.cf index 820c7569e6..86b361da0e 100644 --- a/tests/acceptance/10_files/09_insert_lines/300.cf +++ b/tests/acceptance/10_files/09_insert_lines/300.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/301.cf b/tests/acceptance/10_files/09_insert_lines/301.cf index c618a7e382..c72478cd02 100644 --- a/tests/acceptance/10_files/09_insert_lines/301.cf +++ b/tests/acceptance/10_files/09_insert_lines/301.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/302.cf b/tests/acceptance/10_files/09_insert_lines/302.cf index 006fea558d..bbb188062b 100644 --- a/tests/acceptance/10_files/09_insert_lines/302.cf +++ b/tests/acceptance/10_files/09_insert_lines/302.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/303.cf b/tests/acceptance/10_files/09_insert_lines/303.cf index dcaebe6649..d467ea5620 100644 --- a/tests/acceptance/10_files/09_insert_lines/303.cf +++ b/tests/acceptance/10_files/09_insert_lines/303.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/400.cf b/tests/acceptance/10_files/09_insert_lines/400.cf index 6d63fbe02b..e38c52fa49 100644 --- a/tests/acceptance/10_files/09_insert_lines/400.cf +++ b/tests/acceptance/10_files/09_insert_lines/400.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/block_insert_duplicate.cf b/tests/acceptance/10_files/09_insert_lines/block_insert_duplicate.cf index 7187a58b34..d97d8f04c1 100644 --- a/tests/acceptance/10_files/09_insert_lines/block_insert_duplicate.cf +++ b/tests/acceptance/10_files/09_insert_lines/block_insert_duplicate.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -74,4 +74,3 @@ bundle agent check ### PROJECT_ID: core ### CATEGORY_ID: 27 - diff --git a/tests/acceptance/10_files/09_insert_lines/block_insert_order.cf b/tests/acceptance/10_files/09_insert_lines/block_insert_order.cf index f168755d1b..036097f4e5 100644 --- a/tests/acceptance/10_files/09_insert_lines/block_insert_order.cf +++ b/tests/acceptance/10_files/09_insert_lines/block_insert_order.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/crlf-in-cftemplate.cf b/tests/acceptance/10_files/09_insert_lines/crlf-in-cftemplate.cf index 2df2c6c3a3..dd32a9cf66 100644 --- a/tests/acceptance/10_files/09_insert_lines/crlf-in-cftemplate.cf +++ b/tests/acceptance/10_files/09_insert_lines/crlf-in-cftemplate.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/crlf-in-edit_line-insert-file.cf b/tests/acceptance/10_files/09_insert_lines/crlf-in-edit_line-insert-file.cf index 33b35afad4..c046897af1 100644 --- a/tests/acceptance/10_files/09_insert_lines/crlf-in-edit_line-insert-file.cf +++ b/tests/acceptance/10_files/09_insert_lines/crlf-in-edit_line-insert-file.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/crlf-in-edit_line.cf b/tests/acceptance/10_files/09_insert_lines/crlf-in-edit_line.cf index 4981106520..a565418857 100644 --- a/tests/acceptance/10_files/09_insert_lines/crlf-in-edit_line.cf +++ b/tests/acceptance/10_files/09_insert_lines/crlf-in-edit_line.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/crlf-in-mustache.cf b/tests/acceptance/10_files/09_insert_lines/crlf-in-mustache.cf index cd00b69c5e..fb3043512f 100644 --- a/tests/acceptance/10_files/09_insert_lines/crlf-in-mustache.cf +++ b/tests/acceptance/10_files/09_insert_lines/crlf-in-mustache.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/edit_line_bundle_called_from_namespace.cf b/tests/acceptance/10_files/09_insert_lines/edit_line_bundle_called_from_namespace.cf index 6ef2a4cef7..d6df1b7c42 100644 --- a/tests/acceptance/10_files/09_insert_lines/edit_line_bundle_called_from_namespace.cf +++ b/tests/acceptance/10_files/09_insert_lines/edit_line_bundle_called_from_namespace.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub", "edit_line_bundle_called_from_namespace.cf.sub" }; + inputs => { "../../default.sub.cf", "edit_line_bundle_called_from_namespace.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } 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 4f0a600e8d..35faab8fa4 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 @@ -1,7 +1,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/insert_line_end_do_not_match_eof_control_body.cf b/tests/acceptance/10_files/09_insert_lines/insert_line_end_do_not_match_eof_control_body.cf index 10726cff67..bc15bfe4e0 100644 --- a/tests/acceptance/10_files/09_insert_lines/insert_line_end_do_not_match_eof_control_body.cf +++ b/tests/acceptance/10_files/09_insert_lines/insert_line_end_do_not_match_eof_control_body.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/insert_line_end_match_eof.cf b/tests/acceptance/10_files/09_insert_lines/insert_line_end_match_eof.cf index 7baba7e4d6..6070a93858 100644 --- a/tests/acceptance/10_files/09_insert_lines/insert_line_end_match_eof.cf +++ b/tests/acceptance/10_files/09_insert_lines/insert_line_end_match_eof.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/insert_line_end_match_eof_control_body.cf b/tests/acceptance/10_files/09_insert_lines/insert_line_end_match_eof_control_body.cf index 9db635ffa3..845c3dd94d 100644 --- a/tests/acceptance/10_files/09_insert_lines/insert_line_end_match_eof_control_body.cf +++ b/tests/acceptance/10_files/09_insert_lines/insert_line_end_match_eof_control_body.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/insert_line_end_match_eof_default.cf b/tests/acceptance/10_files/09_insert_lines/insert_line_end_match_eof_default.cf index 63aabc5c32..5234111a91 100644 --- a/tests/acceptance/10_files/09_insert_lines/insert_line_end_match_eof_default.cf +++ b/tests/acceptance/10_files/09_insert_lines/insert_line_end_match_eof_default.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/insertion-order-reversal.cf b/tests/acceptance/10_files/09_insert_lines/insertion-order-reversal.cf index bf7dc5c062..1507dd458f 100644 --- a/tests/acceptance/10_files/09_insert_lines/insertion-order-reversal.cf +++ b/tests/acceptance/10_files/09_insert_lines/insertion-order-reversal.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/multi-files-dirs.cf b/tests/acceptance/10_files/09_insert_lines/multi-files-dirs.cf index 72f8b97503..955945ac98 100644 --- a/tests/acceptance/10_files/09_insert_lines/multi-files-dirs.cf +++ b/tests/acceptance/10_files/09_insert_lines/multi-files-dirs.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/namespaced_edit_line_bundle.cf b/tests/acceptance/10_files/09_insert_lines/namespaced_edit_line_bundle.cf index 3cf0c14b91..54949f1a59 100644 --- a/tests/acceptance/10_files/09_insert_lines/namespaced_edit_line_bundle.cf +++ b/tests/acceptance/10_files/09_insert_lines/namespaced_edit_line_bundle.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub", "namespaced_edit_line_bundle.cf.sub" }; + inputs => { "../../default.sub.cf", "namespaced_edit_line_bundle.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/nothing_to_repeat_error.cf b/tests/acceptance/10_files/09_insert_lines/nothing_to_repeat_error.cf index 63a2116a14..a986a4e971 100644 --- a/tests/acceptance/10_files/09_insert_lines/nothing_to_repeat_error.cf +++ b/tests/acceptance/10_files/09_insert_lines/nothing_to_repeat_error.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/nothing_to_repeat_error.cf.sub b/tests/acceptance/10_files/09_insert_lines/nothing_to_repeat_error.cf.sub index 5d950a517b..71f11096bb 100644 --- a/tests/acceptance/10_files/09_insert_lines/nothing_to_repeat_error.cf.sub +++ b/tests/acceptance/10_files/09_insert_lines/nothing_to_repeat_error.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { build_linux_limits_conf }; } diff --git a/tests/acceptance/10_files/09_insert_lines/preserve_block_blank_lines.cf b/tests/acceptance/10_files/09_insert_lines/preserve_block_blank_lines.cf index 7e8153d553..5df1cafc57 100644 --- a/tests/acceptance/10_files/09_insert_lines/preserve_block_blank_lines.cf +++ b/tests/acceptance/10_files/09_insert_lines/preserve_block_blank_lines.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/same_text_in_two_regions.cf b/tests/acceptance/10_files/09_insert_lines/same_text_in_two_regions.cf index af7e446a6b..bbc70892c3 100644 --- a/tests/acceptance/10_files/09_insert_lines/same_text_in_two_regions.cf +++ b/tests/acceptance/10_files/09_insert_lines/same_text_in_two_regions.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/10_files/09_insert_lines/selectlinematching.cf b/tests/acceptance/10_files/09_insert_lines/selectlinematching.cf index 2f14d1e7c1..292b1539ec 100644 --- a/tests/acceptance/10_files/09_insert_lines/selectlinematching.cf +++ b/tests/acceptance/10_files/09_insert_lines/selectlinematching.cf @@ -27,7 +27,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/selectlinematching.cf.sub_1 b/tests/acceptance/10_files/09_insert_lines/selectlinematching.cf.sub_1 index 50a092b91c..48800080fa 100644 --- a/tests/acceptance/10_files/09_insert_lines/selectlinematching.cf.sub_1 +++ b/tests/acceptance/10_files/09_insert_lines/selectlinematching.cf.sub_1 @@ -12,7 +12,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -100,4 +100,3 @@ methods: "$(G.testfile).expected", "$(this.promise_filename)"); } - diff --git a/tests/acceptance/10_files/09_insert_lines/selectlinematching.cf.sub_2 b/tests/acceptance/10_files/09_insert_lines/selectlinematching.cf.sub_2 index 1b5afc024e..5b33a51aeb 100644 --- a/tests/acceptance/10_files/09_insert_lines/selectlinematching.cf.sub_2 +++ b/tests/acceptance/10_files/09_insert_lines/selectlinematching.cf.sub_2 @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -88,4 +88,3 @@ methods: "$(G.testfile).expected", "$(this.promise_filename)"); } - diff --git a/tests/acceptance/10_files/09_insert_lines/staging/120.x.cf b/tests/acceptance/10_files/09_insert_lines/staging/120.x.cf index bce956b51f..b5bee3d4f2 100644 --- a/tests/acceptance/10_files/09_insert_lines/staging/120.x.cf +++ b/tests/acceptance/10_files/09_insert_lines/staging/120.x.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/staging/220.x.cf b/tests/acceptance/10_files/09_insert_lines/staging/220.x.cf index 47704b3108..8102335a83 100644 --- a/tests/acceptance/10_files/09_insert_lines/staging/220.x.cf +++ b/tests/acceptance/10_files/09_insert_lines/staging/220.x.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/09_insert_lines/staging/304.cf b/tests/acceptance/10_files/09_insert_lines/staging/304.cf index 574c32329f..f1f5645e39 100644 --- a/tests/acceptance/10_files/09_insert_lines/staging/304.cf +++ b/tests/acceptance/10_files/09_insert_lines/staging/304.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub", "304.cf.namespaced.sub" }; + inputs => { "../../default.sub.cf", "304.cf.namespaced.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/10_links/001.cf b/tests/acceptance/10_files/10_links/001.cf index 8959a66836..b3fe50bccc 100644 --- a/tests/acceptance/10_files/10_links/001.cf +++ b/tests/acceptance/10_files/10_links/001.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/10_links/002.cf b/tests/acceptance/10_files/10_links/002.cf index 70b5fb63d8..97e5e546ba 100644 --- a/tests/acceptance/10_files/10_links/002.cf +++ b/tests/acceptance/10_files/10_links/002.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub", "002-namespaced_links.cf.sub" }; + inputs => { "../../default.sub.cf", "002-namespaced_links.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/10_links/delete_dangling_symlink.cf b/tests/acceptance/10_files/10_links/delete_dangling_symlink.cf index 3264843d64..88be894aa2 100644 --- a/tests/acceptance/10_files/10_links/delete_dangling_symlink.cf +++ b/tests/acceptance/10_files/10_links/delete_dangling_symlink.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/10_links/edit_linked_file.cf b/tests/acceptance/10_files/10_links/edit_linked_file.cf index 2a832c1b03..e485bce20d 100644 --- a/tests/acceptance/10_files/10_links/edit_linked_file.cf +++ b/tests/acceptance/10_files/10_links/edit_linked_file.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/10_links/owner-mismatch-link-and-target.cf b/tests/acceptance/10_files/10_links/owner-mismatch-link-and-target.cf index 1202fab036..bdb4cb7445 100755 --- a/tests/acceptance/10_files/10_links/owner-mismatch-link-and-target.cf +++ b/tests/acceptance/10_files/10_links/owner-mismatch-link-and-target.cf @@ -1,7 +1,7 @@ #!/var/cfengine/bin/cf-agent -f- body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/10_links/select_file_by_symlink_target.cf b/tests/acceptance/10_files/10_links/select_file_by_symlink_target.cf index 047f17c56e..1c9b564867 100644 --- a/tests/acceptance/10_files/10_links/select_file_by_symlink_target.cf +++ b/tests/acceptance/10_files/10_links/select_file_by_symlink_target.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/10_links/select_file_by_type.cf b/tests/acceptance/10_files/10_links/select_file_by_type.cf index 985c182bcf..7cb83d3a6d 100644 --- a/tests/acceptance/10_files/10_links/select_file_by_type.cf +++ b/tests/acceptance/10_files/10_links/select_file_by_type.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/11_xml_edits/CFE-3806.cf b/tests/acceptance/10_files/11_xml_edits/CFE-3806.cf index 0c1ea77478..7b04df0980 100644 --- a/tests/acceptance/10_files/11_xml_edits/CFE-3806.cf +++ b/tests/acceptance/10_files/11_xml_edits/CFE-3806.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/11_xml_edits/build_xpath_001.cf b/tests/acceptance/10_files/11_xml_edits/build_xpath_001.cf index f66a8468c8..b8b1d7d359 100644 --- a/tests/acceptance/10_files/11_xml_edits/build_xpath_001.cf +++ b/tests/acceptance/10_files/11_xml_edits/build_xpath_001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/11_xml_edits/build_xpath_002.cf b/tests/acceptance/10_files/11_xml_edits/build_xpath_002.cf index c16317aaa1..0a2e3dcaf3 100644 --- a/tests/acceptance/10_files/11_xml_edits/build_xpath_002.cf +++ b/tests/acceptance/10_files/11_xml_edits/build_xpath_002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/11_xml_edits/build_xpath_003.cf b/tests/acceptance/10_files/11_xml_edits/build_xpath_003.cf index 9f4e653f15..1f93badfd2 100644 --- a/tests/acceptance/10_files/11_xml_edits/build_xpath_003.cf +++ b/tests/acceptance/10_files/11_xml_edits/build_xpath_003.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/11_xml_edits/delete_attribute_001.cf b/tests/acceptance/10_files/11_xml_edits/delete_attribute_001.cf index ee4d2742e3..83b90719f2 100644 --- a/tests/acceptance/10_files/11_xml_edits/delete_attribute_001.cf +++ b/tests/acceptance/10_files/11_xml_edits/delete_attribute_001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/11_xml_edits/delete_attribute_002.cf b/tests/acceptance/10_files/11_xml_edits/delete_attribute_002.cf index e40fec30ff..b59a7c475d 100644 --- a/tests/acceptance/10_files/11_xml_edits/delete_attribute_002.cf +++ b/tests/acceptance/10_files/11_xml_edits/delete_attribute_002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/11_xml_edits/delete_text_001.cf b/tests/acceptance/10_files/11_xml_edits/delete_text_001.cf index 3c57480ff4..2350d88376 100644 --- a/tests/acceptance/10_files/11_xml_edits/delete_text_001.cf +++ b/tests/acceptance/10_files/11_xml_edits/delete_text_001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/11_xml_edits/delete_text_002.cf b/tests/acceptance/10_files/11_xml_edits/delete_text_002.cf index e6bb71b1d8..c51144ee4b 100644 --- a/tests/acceptance/10_files/11_xml_edits/delete_text_002.cf +++ b/tests/acceptance/10_files/11_xml_edits/delete_text_002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/11_xml_edits/delete_tree_001.cf b/tests/acceptance/10_files/11_xml_edits/delete_tree_001.cf index 7d219b608f..8706dc3653 100644 --- a/tests/acceptance/10_files/11_xml_edits/delete_tree_001.cf +++ b/tests/acceptance/10_files/11_xml_edits/delete_tree_001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/11_xml_edits/delete_tree_002.cf b/tests/acceptance/10_files/11_xml_edits/delete_tree_002.cf index e677aba6c7..549271ffff 100644 --- a/tests/acceptance/10_files/11_xml_edits/delete_tree_002.cf +++ b/tests/acceptance/10_files/11_xml_edits/delete_tree_002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/11_xml_edits/insert_host_example.cf b/tests/acceptance/10_files/11_xml_edits/insert_host_example.cf index c22fcbfd82..d5548f8fcb 100644 --- a/tests/acceptance/10_files/11_xml_edits/insert_host_example.cf +++ b/tests/acceptance/10_files/11_xml_edits/insert_host_example.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/11_xml_edits/insert_text_001.cf b/tests/acceptance/10_files/11_xml_edits/insert_text_001.cf index f7b276f3bc..94704d635e 100644 --- a/tests/acceptance/10_files/11_xml_edits/insert_text_001.cf +++ b/tests/acceptance/10_files/11_xml_edits/insert_text_001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/11_xml_edits/insert_text_002.cf b/tests/acceptance/10_files/11_xml_edits/insert_text_002.cf index 655bab0658..7cd39bf054 100644 --- a/tests/acceptance/10_files/11_xml_edits/insert_text_002.cf +++ b/tests/acceptance/10_files/11_xml_edits/insert_text_002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/11_xml_edits/insert_tree_001.cf b/tests/acceptance/10_files/11_xml_edits/insert_tree_001.cf index 8c71f3b706..932bb6f4c1 100644 --- a/tests/acceptance/10_files/11_xml_edits/insert_tree_001.cf +++ b/tests/acceptance/10_files/11_xml_edits/insert_tree_001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/11_xml_edits/insert_tree_003.cf b/tests/acceptance/10_files/11_xml_edits/insert_tree_003.cf index f80f8cb340..859c16a587 100644 --- a/tests/acceptance/10_files/11_xml_edits/insert_tree_003.cf +++ b/tests/acceptance/10_files/11_xml_edits/insert_tree_003.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/11_xml_edits/set_attribute_001.cf b/tests/acceptance/10_files/11_xml_edits/set_attribute_001.cf index 6706169d8a..05c6e535c2 100644 --- a/tests/acceptance/10_files/11_xml_edits/set_attribute_001.cf +++ b/tests/acceptance/10_files/11_xml_edits/set_attribute_001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/11_xml_edits/set_attribute_002.cf b/tests/acceptance/10_files/11_xml_edits/set_attribute_002.cf index 2c0347fcec..ce0c9a35a1 100644 --- a/tests/acceptance/10_files/11_xml_edits/set_attribute_002.cf +++ b/tests/acceptance/10_files/11_xml_edits/set_attribute_002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/11_xml_edits/set_attribute_003.cf b/tests/acceptance/10_files/11_xml_edits/set_attribute_003.cf index 14b342a244..968a96285c 100644 --- a/tests/acceptance/10_files/11_xml_edits/set_attribute_003.cf +++ b/tests/acceptance/10_files/11_xml_edits/set_attribute_003.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/11_xml_edits/set_text_001.cf b/tests/acceptance/10_files/11_xml_edits/set_text_001.cf index 6f9ac85802..bdc4c53bad 100644 --- a/tests/acceptance/10_files/11_xml_edits/set_text_001.cf +++ b/tests/acceptance/10_files/11_xml_edits/set_text_001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/11_xml_edits/set_text_002.cf b/tests/acceptance/10_files/11_xml_edits/set_text_002.cf index 291ecb9c1f..d68a93b8e0 100644 --- a/tests/acceptance/10_files/11_xml_edits/set_text_002.cf +++ b/tests/acceptance/10_files/11_xml_edits/set_text_002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/11_xml_edits/staging/insert_tree_002.cf b/tests/acceptance/10_files/11_xml_edits/staging/insert_tree_002.cf index a9e459074c..5166493d24 100644 --- a/tests/acceptance/10_files/11_xml_edits/staging/insert_tree_002.cf +++ b/tests/acceptance/10_files/11_xml_edits/staging/insert_tree_002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/11_xml_edits/staging/insert_tree_004.cf b/tests/acceptance/10_files/11_xml_edits/staging/insert_tree_004.cf index 171c3fb7a5..56433d2033 100644 --- a/tests/acceptance/10_files/11_xml_edits/staging/insert_tree_004.cf +++ b/tests/acceptance/10_files/11_xml_edits/staging/insert_tree_004.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/12_acl/acl.cf b/tests/acceptance/10_files/12_acl/acl.cf index cc3b37437a..5a3b898b31 100644 --- a/tests/acceptance/10_files/12_acl/acl.cf +++ b/tests/acceptance/10_files/12_acl/acl.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/12_acl/acl.cf.sub b/tests/acceptance/10_files/12_acl/acl.cf.sub index b24e8abe78..8c42ae029a 100644 --- a/tests/acceptance/10_files/12_acl/acl.cf.sub +++ b/tests/acceptance/10_files/12_acl/acl.cf.sub @@ -8,7 +8,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "init", "test" }; version => "1.0"; } diff --git a/tests/acceptance/10_files/12_acl/file_copy_acl.cf b/tests/acceptance/10_files/12_acl/file_copy_acl.cf index 47df84c132..cd53cdc65f 100644 --- a/tests/acceptance/10_files/12_acl/file_copy_acl.cf +++ b/tests/acceptance/10_files/12_acl/file_copy_acl.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/12_acl/file_edit_acl.cf b/tests/acceptance/10_files/12_acl/file_edit_acl.cf index bf8d1d6a80..b05d64ff22 100644 --- a/tests/acceptance/10_files/12_acl/file_edit_acl.cf +++ b/tests/acceptance/10_files/12_acl/file_edit_acl.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/12_acl/getacls.cf b/tests/acceptance/10_files/12_acl/getacls.cf index 619792c8f8..86e5ac6d26 100644 --- a/tests/acceptance/10_files/12_acl/getacls.cf +++ b/tests/acceptance/10_files/12_acl/getacls.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/13_file_dir/001.cf b/tests/acceptance/10_files/13_file_dir/001.cf index 7a006a1c11..4f6b394e6e 100644 --- a/tests/acceptance/10_files/13_file_dir/001.cf +++ b/tests/acceptance/10_files/13_file_dir/001.cf @@ -15,7 +15,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/13_file_dir/001.cf.sub b/tests/acceptance/10_files/13_file_dir/001.cf.sub index fb84e230e4..fc8a535f65 100644 --- a/tests/acceptance/10_files/13_file_dir/001.cf.sub +++ b/tests/acceptance/10_files/13_file_dir/001.cf.sub @@ -1,7 +1,7 @@ body common control { bundlesequence => { "create_test_file" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } body agent control @@ -29,4 +29,3 @@ body changes diff report_diffs => "true"; update_hashes => "yes"; } - diff --git a/tests/acceptance/10_files/13_file_dir/never_delete_nonempty_dir.cf b/tests/acceptance/10_files/13_file_dir/never_delete_nonempty_dir.cf index a626d698b4..614d6b5959 100644 --- a/tests/acceptance/10_files/13_file_dir/never_delete_nonempty_dir.cf +++ b/tests/acceptance/10_files/13_file_dir/never_delete_nonempty_dir.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/13_file_dir/never_delete_parent_dir.cf b/tests/acceptance/10_files/13_file_dir/never_delete_parent_dir.cf index 3043af80ba..1676f0aaca 100644 --- a/tests/acceptance/10_files/13_file_dir/never_delete_parent_dir.cf +++ b/tests/acceptance/10_files/13_file_dir/never_delete_parent_dir.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/FIM/monitoring_symlinks_does_not_constantly_report_change.cf b/tests/acceptance/10_files/FIM/monitoring_symlinks_does_not_constantly_report_change.cf index fe1b5d5cd0..8a19297ded 100644 --- a/tests/acceptance/10_files/FIM/monitoring_symlinks_does_not_constantly_report_change.cf +++ b/tests/acceptance/10_files/FIM/monitoring_symlinks_does_not_constantly_report_change.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -58,4 +58,3 @@ body link_from ln_s(x) source => "$(x)"; when_no_source => "force"; } - diff --git a/tests/acceptance/10_files/FIM/monitoring_symlinks_does_not_constantly_report_change.cf.sub b/tests/acceptance/10_files/FIM/monitoring_symlinks_does_not_constantly_report_change.cf.sub index 9ca0b5f791..72210ea7eb 100644 --- a/tests/acceptance/10_files/FIM/monitoring_symlinks_does_not_constantly_report_change.cf.sub +++ b/tests/acceptance/10_files/FIM/monitoring_symlinks_does_not_constantly_report_change.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; version => "1.0"; } @@ -28,4 +28,3 @@ body changes detect_all_change report_changes => "all"; update_hashes => "yes"; } - diff --git a/tests/acceptance/10_files/agent_control_default_directory_create_mode.cf b/tests/acceptance/10_files/agent_control_default_directory_create_mode.cf index 9e79ab2100..a4112966e5 100644 --- a/tests/acceptance/10_files/agent_control_default_directory_create_mode.cf +++ b/tests/acceptance/10_files/agent_control_default_directory_create_mode.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files.cf b/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files.cf index 6600f3c9db..1bc8186c64 100644 --- a/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files.cf +++ b/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files_1.cf b/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files_1.cf index 638da9481a..5f83bf438a 100644 --- a/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files_1.cf +++ b/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files_1.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files_2.cf b/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files_2.cf index a23ce078db..ed57c99bc7 100644 --- a/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files_2.cf +++ b/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files_2.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files_3.cf b/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files_3.cf index e49510713e..80dea9e81c 100644 --- a/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files_3.cf +++ b/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files_3.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files_4.cf b/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files_4.cf index 6f64d7c6a4..e8eb87eab4 100644 --- a/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files_4.cf +++ b/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files_4.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files_5.cf b/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files_5.cf index 607032403a..e704190d77 100644 --- a/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files_5.cf +++ b/tests/acceptance/10_files/agent_control_files_single_copy_does_not_apply_to_nonmatching_files_5.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/agent_control_files_single_copy_prevents_subsequent_copy_on_exact_match.cf b/tests/acceptance/10_files/agent_control_files_single_copy_prevents_subsequent_copy_on_exact_match.cf index ec3cb1cd45..2ce983108f 100644 --- a/tests/acceptance/10_files/agent_control_files_single_copy_prevents_subsequent_copy_on_exact_match.cf +++ b/tests/acceptance/10_files/agent_control_files_single_copy_prevents_subsequent_copy_on_exact_match.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/agent_control_files_single_copy_prevents_subsequent_copy_on_regular_expression_match.cf b/tests/acceptance/10_files/agent_control_files_single_copy_prevents_subsequent_copy_on_regular_expression_match.cf index 41b4fa12ad..68c06ce5b5 100644 --- a/tests/acceptance/10_files/agent_control_files_single_copy_prevents_subsequent_copy_on_regular_expression_match.cf +++ b/tests/acceptance/10_files/agent_control_files_single_copy_prevents_subsequent_copy_on_regular_expression_match.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/can_set_sticky_bits_without_root_owning_directory.cf b/tests/acceptance/10_files/can_set_sticky_bits_without_root_owning_directory.cf index 7ca867896b..af9516c023 100644 --- a/tests/acceptance/10_files/can_set_sticky_bits_without_root_owning_directory.cf +++ b/tests/acceptance/10_files/can_set_sticky_bits_without_root_owning_directory.cf @@ -9,7 +9,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/copy_from_convert.cf b/tests/acceptance/10_files/copy_from_convert.cf index 15235077be..8f06723e23 100644 --- a/tests/acceptance/10_files/copy_from_convert.cf +++ b/tests/acceptance/10_files/copy_from_convert.cf @@ -5,7 +5,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/copy_from_preserve_false.cf b/tests/acceptance/10_files/copy_from_preserve_false.cf index 70a7375919..25278f4e33 100644 --- a/tests/acceptance/10_files/copy_from_preserve_false.cf +++ b/tests/acceptance/10_files/copy_from_preserve_false.cf @@ -1,6 +1,6 @@ body file control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; } bundle agent main diff --git a/tests/acceptance/10_files/copy_from_this_promiser.cf b/tests/acceptance/10_files/copy_from_this_promiser.cf index 877c147ae1..1c224300ff 100755 --- a/tests/acceptance/10_files/copy_from_this_promiser.cf +++ b/tests/acceptance/10_files/copy_from_this_promiser.cf @@ -1,7 +1,7 @@ #!/var/cfengine/bin/cf-agent -f- body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/copy_local_file.cf b/tests/acceptance/10_files/copy_local_file.cf index b24def6767..d1f55ff1f0 100644 --- a/tests/acceptance/10_files/copy_local_file.cf +++ b/tests/acceptance/10_files/copy_local_file.cf @@ -12,7 +12,7 @@ bundle common test_meta body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/copy_local_file3.cf b/tests/acceptance/10_files/copy_local_file3.cf index bff436667c..666bc5683b 100644 --- a/tests/acceptance/10_files/copy_local_file3.cf +++ b/tests/acceptance/10_files/copy_local_file3.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/file_select_attrs_consistent_behavior/main.cf b/tests/acceptance/10_files/file_select_attrs_consistent_behavior/main.cf index 9b511b638a..4ae20d5770 100644 --- a/tests/acceptance/10_files/file_select_attrs_consistent_behavior/main.cf +++ b/tests/acceptance/10_files/file_select_attrs_consistent_behavior/main.cf @@ -5,7 +5,7 @@ ####################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/files_with_spaces.cf b/tests/acceptance/10_files/files_with_spaces.cf index 01124151da..85fe266680 100644 --- a/tests/acceptance/10_files/files_with_spaces.cf +++ b/tests/acceptance/10_files/files_with_spaces.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/locally_copied_sparse_file_preserves_sparseness.cf b/tests/acceptance/10_files/locally_copied_sparse_file_preserves_sparseness.cf index 2999a77986..43b59c5ca1 100644 --- a/tests/acceptance/10_files/locally_copied_sparse_file_preserves_sparseness.cf +++ b/tests/acceptance/10_files/locally_copied_sparse_file_preserves_sparseness.cf @@ -1,7 +1,7 @@ # Test that locally copied files keep their sparsness body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/move_obstruction_respects_warn_only.cf b/tests/acceptance/10_files/move_obstruction_respects_warn_only.cf index 6c44b1a413..e957087359 100644 --- a/tests/acceptance/10_files/move_obstruction_respects_warn_only.cf +++ b/tests/acceptance/10_files/move_obstruction_respects_warn_only.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/move_obstructions-promiser-is-symlink.cf b/tests/acceptance/10_files/move_obstructions-promiser-is-symlink.cf index 8e07372895..4da0193bbf 100644 --- a/tests/acceptance/10_files/move_obstructions-promiser-is-symlink.cf +++ b/tests/acceptance/10_files/move_obstructions-promiser-is-symlink.cf @@ -9,7 +9,7 @@ body file control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; } ############################################################################## 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 37e7e2e183..6bf7c50624 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 @@ -12,7 +12,7 @@ bundle common test_meta body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/mustache_propagates_failure.cf b/tests/acceptance/10_files/mustache_propagates_failure.cf index c892da6677..53a81cf630 100644 --- a/tests/acceptance/10_files/mustache_propagates_failure.cf +++ b/tests/acceptance/10_files/mustache_propagates_failure.cf @@ -8,7 +8,7 @@ bundle common test_meta body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } 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 eff73e17c2..15e3038764 100644 --- a/tests/acceptance/10_files/mustache_render_multiline_template_data.cf +++ b/tests/acceptance/10_files/mustache_render_multiline_template_data.cf @@ -6,7 +6,7 @@ bundle common test_meta body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/mustache_respects_dryryn.cf b/tests/acceptance/10_files/mustache_respects_dryryn.cf index 827ee76a7e..458219d1e4 100644 --- a/tests/acceptance/10_files/mustache_respects_dryryn.cf +++ b/tests/acceptance/10_files/mustache_respects_dryryn.cf @@ -12,7 +12,7 @@ bundle common test_meta body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/mustache_respects_dryryn.cf.sub b/tests/acceptance/10_files/mustache_respects_dryryn.cf.sub index c5c63c3565..615e30d641 100644 --- a/tests/acceptance/10_files/mustache_respects_dryryn.cf.sub +++ b/tests/acceptance/10_files/mustache_respects_dryryn.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/mustache_respects_dryryn_option.cf b/tests/acceptance/10_files/mustache_respects_dryryn_option.cf index cfd23834c1..673fe04f5c 100644 --- a/tests/acceptance/10_files/mustache_respects_dryryn_option.cf +++ b/tests/acceptance/10_files/mustache_respects_dryryn_option.cf @@ -12,7 +12,7 @@ bundle common test_meta body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/mustache_respects_dryryn_option.cf.sub b/tests/acceptance/10_files/mustache_respects_dryryn_option.cf.sub index 2069f341ac..11c514c16f 100644 --- a/tests/acceptance/10_files/mustache_respects_dryryn_option.cf.sub +++ b/tests/acceptance/10_files/mustache_respects_dryryn_option.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/mustache_respects_warn_only.cf b/tests/acceptance/10_files/mustache_respects_warn_only.cf index 3fe37dc238..60e074a9f3 100644 --- a/tests/acceptance/10_files/mustache_respects_warn_only.cf +++ b/tests/acceptance/10_files/mustache_respects_warn_only.cf @@ -12,7 +12,7 @@ bundle common test_meta body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/no_error_archiving_previous_backup_using_copy_from_without_create_true.cf b/tests/acceptance/10_files/no_error_archiving_previous_backup_using_copy_from_without_create_true.cf index 20f251a24f..cd75ba5fcb 100644 --- a/tests/acceptance/10_files/no_error_archiving_previous_backup_using_copy_from_without_create_true.cf +++ b/tests/acceptance/10_files/no_error_archiving_previous_backup_using_copy_from_without_create_true.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/no_error_archiving_previous_backup_using_copy_from_without_create_true.cf.sub b/tests/acceptance/10_files/no_error_archiving_previous_backup_using_copy_from_without_create_true.cf.sub index acc778ac50..8bb77e7e5d 100644 --- a/tests/acceptance/10_files/no_error_archiving_previous_backup_using_copy_from_without_create_true.cf.sub +++ b/tests/acceptance/10_files/no_error_archiving_previous_backup_using_copy_from_without_create_true.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; version => "1.0"; } diff --git a/tests/acceptance/10_files/purge_reports_as_repaired.cf b/tests/acceptance/10_files/purge_reports_as_repaired.cf index 8483caae6b..949b03d7a9 100644 --- a/tests/acceptance/10_files/purge_reports_as_repaired.cf +++ b/tests/acceptance/10_files/purge_reports_as_repaired.cf @@ -8,7 +8,7 @@ bundle common test_meta body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/rename/main.cf b/tests/acceptance/10_files/rename/main.cf index 45bf929575..f9b3efa8e9 100644 --- a/tests/acceptance/10_files/rename/main.cf +++ b/tests/acceptance/10_files/rename/main.cf @@ -1,6 +1,6 @@ body file control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } bundle agent main diff --git a/tests/acceptance/10_files/replace_patterns/basic_replace.cf b/tests/acceptance/10_files/replace_patterns/basic_replace.cf index 03e43d8ee8..6cefb38032 100644 --- a/tests/acceptance/10_files/replace_patterns/basic_replace.cf +++ b/tests/acceptance/10_files/replace_patterns/basic_replace.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/replace_patterns/noop_replace.cf b/tests/acceptance/10_files/replace_patterns/noop_replace.cf index 84ad65ce0a..76e7cc678e 100644 --- a/tests/acceptance/10_files/replace_patterns/noop_replace.cf +++ b/tests/acceptance/10_files/replace_patterns/noop_replace.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/replace_patterns/staging/advanced_replace.cf b/tests/acceptance/10_files/replace_patterns/staging/advanced_replace.cf index 00f7d35d2f..e2e68c72ea 100644 --- a/tests/acceptance/10_files/replace_patterns/staging/advanced_replace.cf +++ b/tests/acceptance/10_files/replace_patterns/staging/advanced_replace.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/templating/basic_classes.cf b/tests/acceptance/10_files/templating/basic_classes.cf index 5ea91c8a1e..43fe7f9f53 100644 --- a/tests/acceptance/10_files/templating/basic_classes.cf +++ b/tests/acceptance/10_files/templating/basic_classes.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/10_files/templating/cftemplate.cf b/tests/acceptance/10_files/templating/cftemplate.cf index 78225555fb..d50188c610 100644 --- a/tests/acceptance/10_files/templating/cftemplate.cf +++ b/tests/acceptance/10_files/templating/cftemplate.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/10_files/templating/classic_template_wont_render_cf_null_with_empty_datacontainer.cf b/tests/acceptance/10_files/templating/classic_template_wont_render_cf_null_with_empty_datacontainer.cf index 5722852acb..afbb9914fa 100644 --- a/tests/acceptance/10_files/templating/classic_template_wont_render_cf_null_with_empty_datacontainer.cf +++ b/tests/acceptance/10_files/templating/classic_template_wont_render_cf_null_with_empty_datacontainer.cf @@ -2,7 +2,7 @@ body common control { # ignore_missing_bundles => "true"; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } @@ -87,5 +87,3 @@ bundle agent cmerge(name, varlist) "$(name)" data => mergedata($(name), $(varlist)), policy => "free"; # iterates! "$(name)_str" string => format("%S", $(name)), policy => "free"; } - - diff --git a/tests/acceptance/10_files/templating/edit_template_string/mustache_edit_template_string_vs_edit_template.cf b/tests/acceptance/10_files/templating/edit_template_string/mustache_edit_template_string_vs_edit_template.cf index 460453b7f3..c5f23c8529 100644 --- a/tests/acceptance/10_files/templating/edit_template_string/mustache_edit_template_string_vs_edit_template.cf +++ b/tests/acceptance/10_files/templating/edit_template_string/mustache_edit_template_string_vs_edit_template.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -95,4 +95,3 @@ body printfile cat(file) file_to_print => "$(file)"; number_of_lines => "inf"; } - diff --git a/tests/acceptance/10_files/templating/edit_template_string/mustache_edit_template_string_vs_string_mustache.cf b/tests/acceptance/10_files/templating/edit_template_string/mustache_edit_template_string_vs_string_mustache.cf index 571424eb95..23219a4e10 100644 --- a/tests/acceptance/10_files/templating/edit_template_string/mustache_edit_template_string_vs_string_mustache.cf +++ b/tests/acceptance/10_files/templating/edit_template_string/mustache_edit_template_string_vs_string_mustache.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/templating/empty_template_empty_file.cf b/tests/acceptance/10_files/templating/empty_template_empty_file.cf index a1bcd10345..937d1eb9ca 100644 --- a/tests/acceptance/10_files/templating/empty_template_empty_file.cf +++ b/tests/acceptance/10_files/templating/empty_template_empty_file.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/10_files/templating/large_template_blocks.cf b/tests/acceptance/10_files/templating/large_template_blocks.cf index 692967a2e7..812d8dc0b7 100644 --- a/tests/acceptance/10_files/templating/large_template_blocks.cf +++ b/tests/acceptance/10_files/templating/large_template_blocks.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/10_files/templating/missing_file.cf b/tests/acceptance/10_files/templating/missing_file.cf index ad9f68bd28..745ee030a9 100644 --- a/tests/acceptance/10_files/templating/missing_file.cf +++ b/tests/acceptance/10_files/templating/missing_file.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/templating/missing_template_file.cf b/tests/acceptance/10_files/templating/missing_template_file.cf index 7a3c596a17..f82757fabf 100644 --- a/tests/acceptance/10_files/templating/missing_template_file.cf +++ b/tests/acceptance/10_files/templating/missing_template_file.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub", "../../plucked.sub.cf" }; + inputs => { "../../default.sub.cf", "../../plucked.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/templating/mustache_abuse.cf b/tests/acceptance/10_files/templating/mustache_abuse.cf index 57986e4723..474f7d25b5 100644 --- a/tests/acceptance/10_files/templating/mustache_abuse.cf +++ b/tests/acceptance/10_files/templating/mustache_abuse.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/10_files/templating/mustache_container_serialization.cf b/tests/acceptance/10_files/templating/mustache_container_serialization.cf index d6c2371aa7..4481217830 100644 --- a/tests/acceptance/10_files/templating/mustache_container_serialization.cf +++ b/tests/acceptance/10_files/templating/mustache_container_serialization.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/templating/mustache_datastate_demo.cf b/tests/acceptance/10_files/templating/mustache_datastate_demo.cf index 42f462e489..a92fbb0c34 100644 --- a/tests/acceptance/10_files/templating/mustache_datastate_demo.cf +++ b/tests/acceptance/10_files/templating/mustache_datastate_demo.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/10_files/templating/mustache_demo.cf b/tests/acceptance/10_files/templating/mustache_demo.cf index d5476bd847..305b613cbd 100644 --- a/tests/acceptance/10_files/templating/mustache_demo.cf +++ b/tests/acceptance/10_files/templating/mustache_demo.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/10_files/templating/mustache_expect_list_find_string.cf b/tests/acceptance/10_files/templating/mustache_expect_list_find_string.cf index 69e115abb8..622e906ccc 100644 --- a/tests/acceptance/10_files/templating/mustache_expect_list_find_string.cf +++ b/tests/acceptance/10_files/templating/mustache_expect_list_find_string.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/10_files/templating/mustache_from_json_or_classic_array.cf b/tests/acceptance/10_files/templating/mustache_from_json_or_classic_array.cf index 4b601e4054..b488785129 100644 --- a/tests/acceptance/10_files/templating/mustache_from_json_or_classic_array.cf +++ b/tests/acceptance/10_files/templating/mustache_from_json_or_classic_array.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/10_files/templating/mustache_html_escape.cf b/tests/acceptance/10_files/templating/mustache_html_escape.cf index 5a85acc37d..1c03c16fc9 100644 --- a/tests/acceptance/10_files/templating/mustache_html_escape.cf +++ b/tests/acceptance/10_files/templating/mustache_html_escape.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/10_files/templating/mustache_inline_demo.cf b/tests/acceptance/10_files/templating/mustache_inline_demo.cf index 275432052a..afcab5da05 100644 --- a/tests/acceptance/10_files/templating/mustache_inline_demo.cf +++ b/tests/acceptance/10_files/templating/mustache_inline_demo.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/10_files/templating/mustache_invalid_template.cf b/tests/acceptance/10_files/templating/mustache_invalid_template.cf index e86994d28b..f667124dbf 100644 --- a/tests/acceptance/10_files/templating/mustache_invalid_template.cf +++ b/tests/acceptance/10_files/templating/mustache_invalid_template.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/10_files/templating/mustache_invalid_template_data.cf b/tests/acceptance/10_files/templating/mustache_invalid_template_data.cf index 062290dfbe..13e8750f7c 100644 --- a/tests/acceptance/10_files/templating/mustache_invalid_template_data.cf +++ b/tests/acceptance/10_files/templating/mustache_invalid_template_data.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/10_files/templating/mustache_no_fallback_to_datastate_with_undefined_direct_data.cf b/tests/acceptance/10_files/templating/mustache_no_fallback_to_datastate_with_undefined_direct_data.cf index 1e3db50284..5f491a27f5 100644 --- a/tests/acceptance/10_files/templating/mustache_no_fallback_to_datastate_with_undefined_direct_data.cf +++ b/tests/acceptance/10_files/templating/mustache_no_fallback_to_datastate_with_undefined_direct_data.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/templating/mustache_no_fallback_to_datastate_with_undefined_mergedata.cf b/tests/acceptance/10_files/templating/mustache_no_fallback_to_datastate_with_undefined_mergedata.cf index 944bc788e6..e4bc743ab2 100644 --- a/tests/acceptance/10_files/templating/mustache_no_fallback_to_datastate_with_undefined_mergedata.cf +++ b/tests/acceptance/10_files/templating/mustache_no_fallback_to_datastate_with_undefined_mergedata.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/templating/mustache_no_fallback_to_datastate_with_undefined_parsejson_storejson.cf b/tests/acceptance/10_files/templating/mustache_no_fallback_to_datastate_with_undefined_parsejson_storejson.cf index 165bad22f3..952f9f443b 100644 --- a/tests/acceptance/10_files/templating/mustache_no_fallback_to_datastate_with_undefined_parsejson_storejson.cf +++ b/tests/acceptance/10_files/templating/mustache_no_fallback_to_datastate_with_undefined_parsejson_storejson.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/templating/mustache_no_render_with_undefined_direct_data.cf b/tests/acceptance/10_files/templating/mustache_no_render_with_undefined_direct_data.cf index 59e796863a..04ebadada5 100644 --- a/tests/acceptance/10_files/templating/mustache_no_render_with_undefined_direct_data.cf +++ b/tests/acceptance/10_files/templating/mustache_no_render_with_undefined_direct_data.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/templating/mustache_no_render_with_undefined_mergedata.cf b/tests/acceptance/10_files/templating/mustache_no_render_with_undefined_mergedata.cf index 1fa3fe9650..090772568d 100644 --- a/tests/acceptance/10_files/templating/mustache_no_render_with_undefined_mergedata.cf +++ b/tests/acceptance/10_files/templating/mustache_no_render_with_undefined_mergedata.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/templating/mustache_no_render_with_undefined_parsejson_storejson.cf b/tests/acceptance/10_files/templating/mustache_no_render_with_undefined_parsejson_storejson.cf index 165bad22f3..952f9f443b 100644 --- a/tests/acceptance/10_files/templating/mustache_no_render_with_undefined_parsejson_storejson.cf +++ b/tests/acceptance/10_files/templating/mustache_no_render_with_undefined_parsejson_storejson.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/templating/mustache_render_quote.cf b/tests/acceptance/10_files/templating/mustache_render_quote.cf index f90bd2d213..6b900ecb44 100644 --- a/tests/acceptance/10_files/templating/mustache_render_quote.cf +++ b/tests/acceptance/10_files/templating/mustache_render_quote.cf @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/10_files/templating/mustache_repair_existing.cf b/tests/acceptance/10_files/templating/mustache_repair_existing.cf index b9d7121e3e..084ed4b2b0 100644 --- a/tests/acceptance/10_files/templating/mustache_repair_existing.cf +++ b/tests/acceptance/10_files/templating/mustache_repair_existing.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/10_files/templating/mustache_section.cf b/tests/acceptance/10_files/templating/mustache_section.cf index 9210e50ec2..57fab8a942 100644 --- a/tests/acceptance/10_files/templating/mustache_section.cf +++ b/tests/acceptance/10_files/templating/mustache_section.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } 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 414ccdec1e..3c9ed6dc4d 100644 --- a/tests/acceptance/10_files/templating/mustache_top_level_iteration.cf +++ b/tests/acceptance/10_files/templating/mustache_top_level_iteration.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/10_files/templating/staging/array_expansion.cf b/tests/acceptance/10_files/templating/staging/array_expansion.cf index 5938168769..83541c181d 100644 --- a/tests/acceptance/10_files/templating/staging/array_expansion.cf +++ b/tests/acceptance/10_files/templating/staging/array_expansion.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/10_files/templating/timed/expired_edit_line_locks.cf b/tests/acceptance/10_files/templating/timed/expired_edit_line_locks.cf index 66aa44ebd0..caabbffd40 100644 --- a/tests/acceptance/10_files/templating/timed/expired_edit_line_locks.cf +++ b/tests/acceptance/10_files/templating/timed/expired_edit_line_locks.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../../../dcs.cf.sub", "../../../plucked.sub.cf" }; + inputs => { "../../../dcs.sub.cf", "../../../plucked.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; } diff --git a/tests/acceptance/10_files/templating/timed/expired_edit_line_locks.cf.sub b/tests/acceptance/10_files/templating/timed/expired_edit_line_locks.cf.sub index 05e8f2c353..0aa90f09ab 100644 --- a/tests/acceptance/10_files/templating/timed/expired_edit_line_locks.cf.sub +++ b/tests/acceptance/10_files/templating/timed/expired_edit_line_locks.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../../dcs.cf.sub", "../../../plucked.sub.cf" }; + inputs => { "../../../dcs.sub.cf", "../../../plucked.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; } @@ -28,5 +28,3 @@ bundle agent test edit_template => "$(G.testfile).template", template_method => "mustache"; } - - diff --git a/tests/acceptance/10_files/this_promiser.cf b/tests/acceptance/10_files/this_promiser.cf index c56ebc84ae..c1dc0ac1f1 100644 --- a/tests/acceptance/10_files/this_promiser.cf +++ b/tests/acceptance/10_files/this_promiser.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/unsafe/00_immutable.cf b/tests/acceptance/10_files/unsafe/00_immutable.cf index 54d27cadf4..a23acf5b73 100644 --- a/tests/acceptance/10_files/unsafe/00_immutable.cf +++ b/tests/acceptance/10_files/unsafe/00_immutable.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/unsafe/01_immutable.cf b/tests/acceptance/10_files/unsafe/01_immutable.cf index 95e21234fa..c8f6ac590f 100644 --- a/tests/acceptance/10_files/unsafe/01_immutable.cf +++ b/tests/acceptance/10_files/unsafe/01_immutable.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/unsafe/02_immutable.cf b/tests/acceptance/10_files/unsafe/02_immutable.cf index 3e201d7856..2790575ee3 100644 --- a/tests/acceptance/10_files/unsafe/02_immutable.cf +++ b/tests/acceptance/10_files/unsafe/02_immutable.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/unsafe/03_immutable.cf b/tests/acceptance/10_files/unsafe/03_immutable.cf index e18cdc3191..420faa5d61 100644 --- a/tests/acceptance/10_files/unsafe/03_immutable.cf +++ b/tests/acceptance/10_files/unsafe/03_immutable.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/unsafe/04_immutable.cf b/tests/acceptance/10_files/unsafe/04_immutable.cf index 00979f7f7b..fcda4c0337 100644 --- a/tests/acceptance/10_files/unsafe/04_immutable.cf +++ b/tests/acceptance/10_files/unsafe/04_immutable.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/unsafe/05_immutable.cf b/tests/acceptance/10_files/unsafe/05_immutable.cf index 020058f9c5..0d1aff2774 100644 --- a/tests/acceptance/10_files/unsafe/05_immutable.cf +++ b/tests/acceptance/10_files/unsafe/05_immutable.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/unsafe/06_immutable.cf b/tests/acceptance/10_files/unsafe/06_immutable.cf index 497dfb2450..fd29aa9aad 100644 --- a/tests/acceptance/10_files/unsafe/06_immutable.cf +++ b/tests/acceptance/10_files/unsafe/06_immutable.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/unsafe/07_immutable.cf b/tests/acceptance/10_files/unsafe/07_immutable.cf index 446a433563..dbde4818e6 100644 --- a/tests/acceptance/10_files/unsafe/07_immutable.cf +++ b/tests/acceptance/10_files/unsafe/07_immutable.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/unsafe/08_immutable.cf b/tests/acceptance/10_files/unsafe/08_immutable.cf index dc50046a29..6163ccb596 100644 --- a/tests/acceptance/10_files/unsafe/08_immutable.cf +++ b/tests/acceptance/10_files/unsafe/08_immutable.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/unsafe/09_immutable.cf b/tests/acceptance/10_files/unsafe/09_immutable.cf index 5aa825751f..58587465b9 100644 --- a/tests/acceptance/10_files/unsafe/09_immutable.cf +++ b/tests/acceptance/10_files/unsafe/09_immutable.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/unsafe/10_immutable.cf b/tests/acceptance/10_files/unsafe/10_immutable.cf index 9e588d7232..b204b77bed 100644 --- a/tests/acceptance/10_files/unsafe/10_immutable.cf +++ b/tests/acceptance/10_files/unsafe/10_immutable.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/unsafe/11_immutable.cf b/tests/acceptance/10_files/unsafe/11_immutable.cf index 6ae49ebb67..3b1282a3b1 100644 --- a/tests/acceptance/10_files/unsafe/11_immutable.cf +++ b/tests/acceptance/10_files/unsafe/11_immutable.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/unsafe/12_immutable.cf b/tests/acceptance/10_files/unsafe/12_immutable.cf index a1546db22b..d0b5c99b68 100644 --- a/tests/acceptance/10_files/unsafe/12_immutable.cf +++ b/tests/acceptance/10_files/unsafe/12_immutable.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/unsafe/13_immutable.cf b/tests/acceptance/10_files/unsafe/13_immutable.cf index a23715df19..d35ecdf7cd 100644 --- a/tests/acceptance/10_files/unsafe/13_immutable.cf +++ b/tests/acceptance/10_files/unsafe/13_immutable.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/unsafe/can_set_sticky_bits_with_nonroot_owner_and_group.cf b/tests/acceptance/10_files/unsafe/can_set_sticky_bits_with_nonroot_owner_and_group.cf index afc5c9bd2d..691b928062 100644 --- a/tests/acceptance/10_files/unsafe/can_set_sticky_bits_with_nonroot_owner_and_group.cf +++ b/tests/acceptance/10_files/unsafe/can_set_sticky_bits_with_nonroot_owner_and_group.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/unsafe/multiple-group-candidates-first-found-group-perms-if-no-listed-candidate-matches.cf b/tests/acceptance/10_files/unsafe/multiple-group-candidates-first-found-group-perms-if-no-listed-candidate-matches.cf index ce8ef7a11b..07a4ab3bf7 100644 --- a/tests/acceptance/10_files/unsafe/multiple-group-candidates-first-found-group-perms-if-no-listed-candidate-matches.cf +++ b/tests/acceptance/10_files/unsafe/multiple-group-candidates-first-found-group-perms-if-no-listed-candidate-matches.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -97,4 +97,3 @@ body perms g(g) { groups => { "$(g)" }; } - diff --git a/tests/acceptance/10_files/unsafe/multiple-owner-candidates-first-found-user-perms-if-no-listed-candidate-matches.cf b/tests/acceptance/10_files/unsafe/multiple-owner-candidates-first-found-user-perms-if-no-listed-candidate-matches.cf index 1312bb36d2..f942a6aa88 100644 --- a/tests/acceptance/10_files/unsafe/multiple-owner-candidates-first-found-user-perms-if-no-listed-candidate-matches.cf +++ b/tests/acceptance/10_files/unsafe/multiple-owner-candidates-first-found-user-perms-if-no-listed-candidate-matches.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -69,4 +69,3 @@ body perms o(u) { owners => { "$(u)" }; } - diff --git a/tests/acceptance/10_files/zendesk_1776/zendesk_1776.cf b/tests/acceptance/10_files/zendesk_1776/zendesk_1776.cf index 179ff10a67..347a8a2d34 100644 --- a/tests/acceptance/10_files/zendesk_1776/zendesk_1776.cf +++ b/tests/acceptance/10_files/zendesk_1776/zendesk_1776.cf @@ -12,7 +12,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/zendesk_1776/zendesk_1776.cf.sub b/tests/acceptance/10_files/zendesk_1776/zendesk_1776.cf.sub index 84d54a9f2f..36e9249ed7 100644 --- a/tests/acceptance/10_files/zendesk_1776/zendesk_1776.cf.sub +++ b/tests/acceptance/10_files/zendesk_1776/zendesk_1776.cf.sub @@ -5,7 +5,7 @@ ######################################################################## body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -86,4 +86,3 @@ body link_from ln_s(x) source => "$(x)"; when_no_source => "force"; } - diff --git a/tests/acceptance/10_files/zendesk_1779/zendesk_1779.cf b/tests/acceptance/10_files/zendesk_1779/zendesk_1779.cf index 949757c7b9..b99177da62 100644 --- a/tests/acceptance/10_files/zendesk_1779/zendesk_1779.cf +++ b/tests/acceptance/10_files/zendesk_1779/zendesk_1779.cf @@ -12,7 +12,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/10_files/zendesk_1779/zendesk_1779.cf.sub b/tests/acceptance/10_files/zendesk_1779/zendesk_1779.cf.sub index 9ff9c29ac1..2cfba8b6b0 100644 --- a/tests/acceptance/10_files/zendesk_1779/zendesk_1779.cf.sub +++ b/tests/acceptance/10_files/zendesk_1779/zendesk_1779.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -81,4 +81,3 @@ body link_from ln_s(x) source => "$(x)"; when_no_source => "force"; } - diff --git a/tests/acceptance/11_databases/00_syntax/missing_database_operation.cf b/tests/acceptance/11_databases/00_syntax/missing_database_operation.cf index c2ff5f06a5..c93325cbbe 100644 --- a/tests/acceptance/11_databases/00_syntax/missing_database_operation.cf +++ b/tests/acceptance/11_databases/00_syntax/missing_database_operation.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/14_reports/00_output/001.cf b/tests/acceptance/14_reports/00_output/001.cf index 21722d8e79..dd535df5e0 100644 --- a/tests/acceptance/14_reports/00_output/001.cf +++ b/tests/acceptance/14_reports/00_output/001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/14_reports/00_output/001.cf.sub b/tests/acceptance/14_reports/00_output/001.cf.sub index 6417b67c4d..b771ab56ae 100644 --- a/tests/acceptance/14_reports/00_output/001.cf.sub +++ b/tests/acceptance/14_reports/00_output/001.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "test" }; version => "1.0"; } diff --git a/tests/acceptance/14_reports/00_output/002.cf b/tests/acceptance/14_reports/00_output/002.cf index ae5b861e5d..424825d2e0 100644 --- a/tests/acceptance/14_reports/00_output/002.cf +++ b/tests/acceptance/14_reports/00_output/002.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/14_reports/00_output/report_array.cf b/tests/acceptance/14_reports/00_output/report_array.cf index abb5aaa180..b7f930a2cd 100644 --- a/tests/acceptance/14_reports/00_output/report_array.cf +++ b/tests/acceptance/14_reports/00_output/report_array.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/14_reports/00_output/report_nested_variable.cf b/tests/acceptance/14_reports/00_output/report_nested_variable.cf index 54a26e4c94..6820c9255a 100644 --- a/tests/acceptance/14_reports/00_output/report_nested_variable.cf +++ b/tests/acceptance/14_reports/00_output/report_nested_variable.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/14_reports/00_output/report_once.cf b/tests/acceptance/14_reports/00_output/report_once.cf index 0930e98564..c2b4e1e78e 100644 --- a/tests/acceptance/14_reports/00_output/report_once.cf +++ b/tests/acceptance/14_reports/00_output/report_once.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/14_reports/00_output/staging/report_in_common_bundle.cf b/tests/acceptance/14_reports/00_output/staging/report_in_common_bundle.cf index 536856f0a4..10b58a7633 100644 --- a/tests/acceptance/14_reports/00_output/staging/report_in_common_bundle.cf +++ b/tests/acceptance/14_reports/00_output/staging/report_in_common_bundle.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/14_reports/00_output/unresolved_vars.cf b/tests/acceptance/14_reports/00_output/unresolved_vars.cf index 475b773ac4..d24f2f08d6 100644 --- a/tests/acceptance/14_reports/00_output/unresolved_vars.cf +++ b/tests/acceptance/14_reports/00_output/unresolved_vars.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/14_reports/00_output/unresolved_with.cf b/tests/acceptance/14_reports/00_output/unresolved_with.cf index ba6ff0480b..3607df7d52 100644 --- a/tests/acceptance/14_reports/00_output/unresolved_with.cf +++ b/tests/acceptance/14_reports/00_output/unresolved_with.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/14_reports/failed_reports_are_not_kept.cf b/tests/acceptance/14_reports/failed_reports_are_not_kept.cf index b32749b0c8..00532ff6e3 100644 --- a/tests/acceptance/14_reports/failed_reports_are_not_kept.cf +++ b/tests/acceptance/14_reports/failed_reports_are_not_kept.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/14_reports/report_to_file_suppresses_report_to_stdout.cf b/tests/acceptance/14_reports/report_to_file_suppresses_report_to_stdout.cf index d00240010e..7ee9f40c50 100644 --- a/tests/acceptance/14_reports/report_to_file_suppresses_report_to_stdout.cf +++ b/tests/acceptance/14_reports/report_to_file_suppresses_report_to_stdout.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/14_reports/report_to_file_suppresses_report_to_stdout.cf.sub b/tests/acceptance/14_reports/report_to_file_suppresses_report_to_stdout.cf.sub index a5fd0d9999..7d278bb2a6 100644 --- a/tests/acceptance/14_reports/report_to_file_suppresses_report_to_stdout.cf.sub +++ b/tests/acceptance/14_reports/report_to_file_suppresses_report_to_stdout.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -28,4 +28,3 @@ bundle agent check ok:: "$(this.promise_filename) Pass"; } - diff --git a/tests/acceptance/14_reports/reports_comments_emitted_in_verbose.cf b/tests/acceptance/14_reports/reports_comments_emitted_in_verbose.cf index f4714973b4..56f16186a0 100644 --- a/tests/acceptance/14_reports/reports_comments_emitted_in_verbose.cf +++ b/tests/acceptance/14_reports/reports_comments_emitted_in_verbose.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/15_control/01_common/001.x.cf b/tests/acceptance/15_control/01_common/001.x.cf index c1a1186a3b..97d96c191b 100644 --- a/tests/acceptance/15_control/01_common/001.x.cf +++ b/tests/acceptance/15_control/01_common/001.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "missing", default("$(this.promise_filename)") }; version => "1.0"; } @@ -43,4 +43,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/01_common/002.x.cf b/tests/acceptance/15_control/01_common/002.x.cf index c5e01c927d..1d711d612c 100644 --- a/tests/acceptance/15_control/01_common/002.x.cf +++ b/tests/acceptance/15_control/01_common/002.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "missing", default("$(this.promise_filename)") }; version => "1.0"; ignore_missing_bundles => "off"; @@ -44,4 +44,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/01_common/003.cf b/tests/acceptance/15_control/01_common/003.cf index 62f1e74368..948ca3f175 100644 --- a/tests/acceptance/15_control/01_common/003.cf +++ b/tests/acceptance/15_control/01_common/003.cf @@ -8,7 +8,7 @@ body common control { ignore_missing_bundles => "on"; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "missing", default("$(this.promise_filename)") }; version => "1.0"; } @@ -45,4 +45,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/01_common/004.cf b/tests/acceptance/15_control/01_common/004.cf index aec0e1ed4f..6cc0b9dd4f 100644 --- a/tests/acceptance/15_control/01_common/004.cf +++ b/tests/acceptance/15_control/01_common/004.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "missing", default("$(this.promise_filename)") }; version => "1.0"; ignore_missing_bundles => "on"; # Order should not matter! @@ -44,4 +44,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/01_common/007.cf b/tests/acceptance/15_control/01_common/007.cf index bd6f387619..ed6edbac50 100644 --- a/tests/acceptance/15_control/01_common/007.cf +++ b/tests/acceptance/15_control/01_common/007.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; ignore_missing_bundles => "on"; @@ -44,4 +44,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/01_common/011.x.cf b/tests/acceptance/15_control/01_common/011.x.cf index 39d983688c..1865674caf 100644 --- a/tests/acceptance/15_control/01_common/011.x.cf +++ b/tests/acceptance/15_control/01_common/011.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub", "missing" }; + inputs => { "../../default.sub.cf", "missing" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -43,4 +43,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/01_common/012.x.cf b/tests/acceptance/15_control/01_common/012.x.cf index df798e30bf..c08399865e 100644 --- a/tests/acceptance/15_control/01_common/012.x.cf +++ b/tests/acceptance/15_control/01_common/012.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub", "missing" }; + inputs => { "../../default.sub.cf", "missing" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; ignore_missing_inputs => "off"; @@ -44,4 +44,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/01_common/013.cf b/tests/acceptance/15_control/01_common/013.cf index 93a1a80118..d27d7373b4 100644 --- a/tests/acceptance/15_control/01_common/013.cf +++ b/tests/acceptance/15_control/01_common/013.cf @@ -8,7 +8,7 @@ body common control { ignore_missing_inputs => "on"; - inputs => { "../../default.cf.sub", "missing" }; + inputs => { "../../default.sub.cf", "missing" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -45,4 +45,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/01_common/014.cf b/tests/acceptance/15_control/01_common/014.cf index 1ef38ab36c..6f96bf356e 100644 --- a/tests/acceptance/15_control/01_common/014.cf +++ b/tests/acceptance/15_control/01_common/014.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub", "missing" }; + inputs => { "../../default.sub.cf", "missing" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; ignore_missing_inputs => "on"; # Order should not matter! @@ -44,4 +44,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/01_common/021.cf b/tests/acceptance/15_control/01_common/021.cf index cc8e262b6e..23ffcedf80 100644 --- a/tests/acceptance/15_control/01_common/021.cf +++ b/tests/acceptance/15_control/01_common/021.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; domain => "puppetlabs.com"; @@ -44,4 +44,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/01_common/022.cf b/tests/acceptance/15_control/01_common/022.cf index 5521860be0..8e81f26615 100644 --- a/tests/acceptance/15_control/01_common/022.cf +++ b/tests/acceptance/15_control/01_common/022.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; domain => "puppetlabs.com"; @@ -46,4 +46,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/01_common/classic_evaluation_complex_policy.cf b/tests/acceptance/15_control/01_common/classic_evaluation_complex_policy.cf index e6b03d63e5..6022728864 100644 --- a/tests/acceptance/15_control/01_common/classic_evaluation_complex_policy.cf +++ b/tests/acceptance/15_control/01_common/classic_evaluation_complex_policy.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "test" }; evaluation_order => "classic"; } diff --git a/tests/acceptance/15_control/01_common/classic_evaluation_custom_promise_types.cf b/tests/acceptance/15_control/01_common/classic_evaluation_custom_promise_types.cf index 703d168db2..3dcc41c0c7 100644 --- a/tests/acceptance/15_control/01_common/classic_evaluation_custom_promise_types.cf +++ b/tests/acceptance/15_control/01_common/classic_evaluation_custom_promise_types.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "test" }; evaluation_order => "classic"; } diff --git a/tests/acceptance/15_control/01_common/classic_evaluation_long_policy.cf b/tests/acceptance/15_control/01_common/classic_evaluation_long_policy.cf index ad8404fc1f..f2211687a7 100644 --- a/tests/acceptance/15_control/01_common/classic_evaluation_long_policy.cf +++ b/tests/acceptance/15_control/01_common/classic_evaluation_long_policy.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "init", "test", "cleanup" }; evaluation_order => "classic"; } diff --git a/tests/acceptance/15_control/01_common/default_bundlesequence.cf b/tests/acceptance/15_control/01_common/default_bundlesequence.cf index 07e1846579..9140f77a08 100644 --- a/tests/acceptance/15_control/01_common/default_bundlesequence.cf +++ b/tests/acceptance/15_control/01_common/default_bundlesequence.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } bundle agent main diff --git a/tests/acceptance/15_control/01_common/default_bundlesequence_namespace.x.cf b/tests/acceptance/15_control/01_common/default_bundlesequence_namespace.x.cf index ba79a405d9..503c7c74c1 100644 --- a/tests/acceptance/15_control/01_common/default_bundlesequence_namespace.x.cf +++ b/tests/acceptance/15_control/01_common/default_bundlesequence_namespace.x.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } body file control diff --git a/tests/acceptance/15_control/01_common/inputs_directory.cf b/tests/acceptance/15_control/01_common/inputs_directory.cf index 4c1ed541cc..e0de1bb51c 100644 --- a/tests/acceptance/15_control/01_common/inputs_directory.cf +++ b/tests/acceptance/15_control/01_common/inputs_directory.cf @@ -4,7 +4,7 @@ body common control { ignore_missing_inputs => "true"; - inputs => { "/x.cf", "/", "../../default.cf.sub" }; + inputs => { "/x.cf", "/", "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/15_control/01_common/inputs_from_json.cf b/tests/acceptance/15_control/01_common/inputs_from_json.cf index c286aebfc1..9aba46fa41 100644 --- a/tests/acceptance/15_control/01_common/inputs_from_json.cf +++ b/tests/acceptance/15_control/01_common/inputs_from_json.cf @@ -3,7 +3,7 @@ body common control { #ignore_missing_inputs => "true"; - inputs => { "../../default.cf.sub", "$(config.myfile)" }; + inputs => { "../../default.sub.cf", "$(config.myfile)" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/15_control/01_common/inputs_from_readstringlist.cf b/tests/acceptance/15_control/01_common/inputs_from_readstringlist.cf index 258266d5d0..270edc17cd 100644 --- a/tests/acceptance/15_control/01_common/inputs_from_readstringlist.cf +++ b/tests/acceptance/15_control/01_common/inputs_from_readstringlist.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub", @(runlist.inputs) }; + inputs => { "../../default.sub.cf", @(runlist.inputs) }; bundlesequence => { prep_runlist, runlist, default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/15_control/01_common/missing_inputs_directory.x.cf b/tests/acceptance/15_control/01_common/missing_inputs_directory.x.cf index 4a70dcf040..2ce10eee30 100644 --- a/tests/acceptance/15_control/01_common/missing_inputs_directory.x.cf +++ b/tests/acceptance/15_control/01_common/missing_inputs_directory.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub", "/" }; + inputs => { "../../default.sub.cf", "/" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; ignore_missing_inputs => "off"; @@ -44,4 +44,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/01_common/staging/005.x.cf b/tests/acceptance/15_control/01_common/staging/005.x.cf index 393f4834cb..433d1200f6 100644 --- a/tests/acceptance/15_control/01_common/staging/005.x.cf +++ b/tests/acceptance/15_control/01_common/staging/005.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -43,4 +43,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/01_common/staging/006.x.cf b/tests/acceptance/15_control/01_common/staging/006.x.cf index d3134d00c7..14ebb83bcd 100644 --- a/tests/acceptance/15_control/01_common/staging/006.x.cf +++ b/tests/acceptance/15_control/01_common/staging/006.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; ignore_missing_bundles => "off"; @@ -44,4 +44,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/01_common/top_down_evaluation_complex_policy.cf b/tests/acceptance/15_control/01_common/top_down_evaluation_complex_policy.cf index 9377b89464..99f6a0b5c4 100644 --- a/tests/acceptance/15_control/01_common/top_down_evaluation_complex_policy.cf +++ b/tests/acceptance/15_control/01_common/top_down_evaluation_complex_policy.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "test" }; evaluation_order => "top_down"; } diff --git a/tests/acceptance/15_control/01_common/top_down_evaluation_long_policy.cf b/tests/acceptance/15_control/01_common/top_down_evaluation_long_policy.cf index fc11a3eb1d..9c91408f55 100644 --- a/tests/acceptance/15_control/01_common/top_down_evaluation_long_policy.cf +++ b/tests/acceptance/15_control/01_common/top_down_evaluation_long_policy.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "init", "test", "cleanup" }; evaluation_order => "top_down"; } diff --git a/tests/acceptance/15_control/02_agent/001.cf b/tests/acceptance/15_control/02_agent/001.cf index 06a558d8b0..332c3e3eb6 100644 --- a/tests/acceptance/15_control/02_agent/001.cf +++ b/tests/acceptance/15_control/02_agent/001.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -47,4 +47,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/02_agent/002.cf b/tests/acceptance/15_control/02_agent/002.cf index 8ca3374299..716863599b 100644 --- a/tests/acceptance/15_control/02_agent/002.cf +++ b/tests/acceptance/15_control/02_agent/002.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -56,4 +56,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/02_agent/002.x.cf b/tests/acceptance/15_control/02_agent/002.x.cf index e67a4f3db1..fb6d73a8e6 100644 --- a/tests/acceptance/15_control/02_agent/002.x.cf +++ b/tests/acceptance/15_control/02_agent/002.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -50,4 +50,3 @@ bundle agent check !ok:: "$(this.promise_filename) Pass"; } - diff --git a/tests/acceptance/15_control/02_agent/003.cf b/tests/acceptance/15_control/02_agent/003.cf index 88ad43f2b6..0ff0b75ce8 100644 --- a/tests/acceptance/15_control/02_agent/003.cf +++ b/tests/acceptance/15_control/02_agent/003.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -56,4 +56,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/02_agent/003.x.cf b/tests/acceptance/15_control/02_agent/003.x.cf index 0a082e6175..b2e0be62a5 100644 --- a/tests/acceptance/15_control/02_agent/003.x.cf +++ b/tests/acceptance/15_control/02_agent/003.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -48,4 +48,3 @@ bundle agent check !ok:: "$(this.promise_filename) Pass"; } - diff --git a/tests/acceptance/15_control/02_agent/004.x.cf b/tests/acceptance/15_control/02_agent/004.x.cf index ac6a3bf27a..b4e4d37ae0 100644 --- a/tests/acceptance/15_control/02_agent/004.x.cf +++ b/tests/acceptance/15_control/02_agent/004.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -56,4 +56,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/02_agent/005.x.cf b/tests/acceptance/15_control/02_agent/005.x.cf index cf46ba573d..810d58892e 100644 --- a/tests/acceptance/15_control/02_agent/005.x.cf +++ b/tests/acceptance/15_control/02_agent/005.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -56,4 +56,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/02_agent/006.x.cf b/tests/acceptance/15_control/02_agent/006.x.cf index 28a3af0911..7c79b43b8e 100644 --- a/tests/acceptance/15_control/02_agent/006.x.cf +++ b/tests/acceptance/15_control/02_agent/006.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -50,4 +50,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/02_agent/007.x.cf b/tests/acceptance/15_control/02_agent/007.x.cf index 0ffa6aaf98..fa796525f2 100644 --- a/tests/acceptance/15_control/02_agent/007.x.cf +++ b/tests/acceptance/15_control/02_agent/007.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -50,4 +50,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/02_agent/008.x.cf b/tests/acceptance/15_control/02_agent/008.x.cf index 35255ff31a..d0e4483c8a 100644 --- a/tests/acceptance/15_control/02_agent/008.x.cf +++ b/tests/acceptance/15_control/02_agent/008.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -48,4 +48,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/02_agent/021.cf b/tests/acceptance/15_control/02_agent/021.cf index 2787f5189e..125e2f60f5 100644 --- a/tests/acceptance/15_control/02_agent/021.cf +++ b/tests/acceptance/15_control/02_agent/021.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -47,4 +47,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/02_agent/022.cf b/tests/acceptance/15_control/02_agent/022.cf index ef43286be2..0ce5c61b39 100644 --- a/tests/acceptance/15_control/02_agent/022.cf +++ b/tests/acceptance/15_control/02_agent/022.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -48,4 +48,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/02_agent/023.cf b/tests/acceptance/15_control/02_agent/023.cf index bff90f71f9..4e48fc9a85 100644 --- a/tests/acceptance/15_control/02_agent/023.cf +++ b/tests/acceptance/15_control/02_agent/023.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -56,4 +56,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/02_agent/031.cf b/tests/acceptance/15_control/02_agent/031.cf index 0f52ac1347..5da8bac564 100644 --- a/tests/acceptance/15_control/02_agent/031.cf +++ b/tests/acceptance/15_control/02_agent/031.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -47,4 +47,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/02_agent/109.x.cf b/tests/acceptance/15_control/02_agent/109.x.cf index c046e1360f..a7ea43952a 100644 --- a/tests/acceptance/15_control/02_agent/109.x.cf +++ b/tests/acceptance/15_control/02_agent/109.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -48,4 +48,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/02_agent/abortbundle_classes.cf b/tests/acceptance/15_control/02_agent/abortbundle_classes.cf index c6c59f0001..c288d30739 100644 --- a/tests/acceptance/15_control/02_agent/abortbundle_classes.cf +++ b/tests/acceptance/15_control/02_agent/abortbundle_classes.cf @@ -9,7 +9,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/15_control/02_agent/abortbundle_classes.cf.sub b/tests/acceptance/15_control/02_agent/abortbundle_classes.cf.sub index d311f1ca06..ec78474227 100644 --- a/tests/acceptance/15_control/02_agent/abortbundle_classes.cf.sub +++ b/tests/acceptance/15_control/02_agent/abortbundle_classes.cf.sub @@ -14,7 +14,7 @@ body agent control body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/15_control/02_agent/abortbundle_classexpression.cf b/tests/acceptance/15_control/02_agent/abortbundle_classexpression.cf index ba1faa66ff..4e134908e8 100644 --- a/tests/acceptance/15_control/02_agent/abortbundle_classexpression.cf +++ b/tests/acceptance/15_control/02_agent/abortbundle_classexpression.cf @@ -10,7 +10,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/15_control/02_agent/abortbundle_classexpression.cf.sub b/tests/acceptance/15_control/02_agent/abortbundle_classexpression.cf.sub index 4518fb0269..3277b1fe3a 100644 --- a/tests/acceptance/15_control/02_agent/abortbundle_classexpression.cf.sub +++ b/tests/acceptance/15_control/02_agent/abortbundle_classexpression.cf.sub @@ -13,7 +13,7 @@ body agent control body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/15_control/02_agent/abortbundle_nomatchclassexpression.cf b/tests/acceptance/15_control/02_agent/abortbundle_nomatchclassexpression.cf index 51f1220861..a86bf567cc 100644 --- a/tests/acceptance/15_control/02_agent/abortbundle_nomatchclassexpression.cf +++ b/tests/acceptance/15_control/02_agent/abortbundle_nomatchclassexpression.cf @@ -8,7 +8,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/15_control/02_agent/abortbundle_nomatchclassexpression.cf.sub b/tests/acceptance/15_control/02_agent/abortbundle_nomatchclassexpression.cf.sub index fad72daf48..89c5c8718d 100644 --- a/tests/acceptance/15_control/02_agent/abortbundle_nomatchclassexpression.cf.sub +++ b/tests/acceptance/15_control/02_agent/abortbundle_nomatchclassexpression.cf.sub @@ -13,7 +13,7 @@ body agent control body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/15_control/02_agent/abortbundle_regex.cf b/tests/acceptance/15_control/02_agent/abortbundle_regex.cf index 7ba8b0617b..cbd19b5e7f 100644 --- a/tests/acceptance/15_control/02_agent/abortbundle_regex.cf +++ b/tests/acceptance/15_control/02_agent/abortbundle_regex.cf @@ -10,7 +10,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/15_control/02_agent/abortbundle_regex.cf.sub b/tests/acceptance/15_control/02_agent/abortbundle_regex.cf.sub index cbd20d8db9..4a7ee47391 100644 --- a/tests/acceptance/15_control/02_agent/abortbundle_regex.cf.sub +++ b/tests/acceptance/15_control/02_agent/abortbundle_regex.cf.sub @@ -15,7 +15,7 @@ body agent control body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; diff --git a/tests/acceptance/15_control/02_agent/abortclasses_from_common_bundle.x.cf b/tests/acceptance/15_control/02_agent/abortclasses_from_common_bundle.x.cf index 71b2ceb409..8872bf3d23 100644 --- a/tests/acceptance/15_control/02_agent/abortclasses_from_common_bundle.x.cf +++ b/tests/acceptance/15_control/02_agent/abortclasses_from_common_bundle.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -47,4 +47,3 @@ bundle agent check !ok:: "$(this.promise_filename) Pass"; } - diff --git a/tests/acceptance/15_control/02_agent/staging/024.x.cf b/tests/acceptance/15_control/02_agent/staging/024.x.cf index 592358d6ab..9eb960212c 100644 --- a/tests/acceptance/15_control/02_agent/staging/024.x.cf +++ b/tests/acceptance/15_control/02_agent/staging/024.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -54,4 +54,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/02_agent/staging/025.x.cf b/tests/acceptance/15_control/02_agent/staging/025.x.cf index b331e5775c..b5cf0dc9ca 100644 --- a/tests/acceptance/15_control/02_agent/staging/025.x.cf +++ b/tests/acceptance/15_control/02_agent/staging/025.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -56,4 +56,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/02_agent/staging/026.x.cf b/tests/acceptance/15_control/02_agent/staging/026.x.cf index f135ad74e8..cbb2dd5917 100644 --- a/tests/acceptance/15_control/02_agent/staging/026.x.cf +++ b/tests/acceptance/15_control/02_agent/staging/026.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -56,4 +56,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/02_agent/staging/027.x.cf b/tests/acceptance/15_control/02_agent/staging/027.x.cf index 492a87a181..1a1daa9ad1 100644 --- a/tests/acceptance/15_control/02_agent/staging/027.x.cf +++ b/tests/acceptance/15_control/02_agent/staging/027.x.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -54,4 +54,3 @@ bundle agent check !ok:: "$(this.promise_filename) FAIL"; } - diff --git a/tests/acceptance/15_control/file/file_inputs.cf b/tests/acceptance/15_control/file/file_inputs.cf index 43488ab8b3..8ca9ed9723 100644 --- a/tests/acceptance/15_control/file/file_inputs.cf +++ b/tests/acceptance/15_control/file/file_inputs.cf @@ -1,7 +1,7 @@ body common control { ignore_missing_bundles => "yes"; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { "missing", default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/001.cf b/tests/acceptance/16_cf-serverd/serial/001.cf index 3cfa2ae037..b78da08af5 100644 --- a/tests/acceptance/16_cf-serverd/serial/001.cf +++ b/tests/acceptance/16_cf-serverd/serial/001.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/001.cf.sub b/tests/acceptance/16_cf-serverd/serial/001.cf.sub index 282e9f5dc0..8c7e1eae2b 100644 --- a/tests/acceptance/16_cf-serverd/serial/001.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/001.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/002.cf b/tests/acceptance/16_cf-serverd/serial/002.cf index 76798cb862..0fefabdd36 100644 --- a/tests/acceptance/16_cf-serverd/serial/002.cf +++ b/tests/acceptance/16_cf-serverd/serial/002.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/002.cf.sub b/tests/acceptance/16_cf-serverd/serial/002.cf.sub index 7ac87c03f9..9db7a59a62 100644 --- a/tests/acceptance/16_cf-serverd/serial/002.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/002.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/003.cf b/tests/acceptance/16_cf-serverd/serial/003.cf index 20c74fc150..a6848c915d 100644 --- a/tests/acceptance/16_cf-serverd/serial/003.cf +++ b/tests/acceptance/16_cf-serverd/serial/003.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/003.cf.sub b/tests/acceptance/16_cf-serverd/serial/003.cf.sub index a0756fe3d1..0856986a81 100644 --- a/tests/acceptance/16_cf-serverd/serial/003.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/003.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/005.cf b/tests/acceptance/16_cf-serverd/serial/005.cf index 89a0b23a86..01f8276968 100644 --- a/tests/acceptance/16_cf-serverd/serial/005.cf +++ b/tests/acceptance/16_cf-serverd/serial/005.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/005.cf.sub b/tests/acceptance/16_cf-serverd/serial/005.cf.sub index b1023bada0..69dd445a60 100644 --- a/tests/acceptance/16_cf-serverd/serial/005.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/005.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/006.cf b/tests/acceptance/16_cf-serverd/serial/006.cf index b9d298dc7f..80ff70d79b 100644 --- a/tests/acceptance/16_cf-serverd/serial/006.cf +++ b/tests/acceptance/16_cf-serverd/serial/006.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/006.cf.sub b/tests/acceptance/16_cf-serverd/serial/006.cf.sub index 6fdec3c9a3..a5ef144663 100644 --- a/tests/acceptance/16_cf-serverd/serial/006.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/006.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/007.cf b/tests/acceptance/16_cf-serverd/serial/007.cf index 1e8a9090d2..0b5507624d 100644 --- a/tests/acceptance/16_cf-serverd/serial/007.cf +++ b/tests/acceptance/16_cf-serverd/serial/007.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/007.cf.sub b/tests/acceptance/16_cf-serverd/serial/007.cf.sub index c44039d118..31206d253a 100644 --- a/tests/acceptance/16_cf-serverd/serial/007.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/007.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/008.cf b/tests/acceptance/16_cf-serverd/serial/008.cf index 1e8a9090d2..0b5507624d 100644 --- a/tests/acceptance/16_cf-serverd/serial/008.cf +++ b/tests/acceptance/16_cf-serverd/serial/008.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/008.cf.sub b/tests/acceptance/16_cf-serverd/serial/008.cf.sub index 31e2ddd790..c57794cf3a 100644 --- a/tests/acceptance/16_cf-serverd/serial/008.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/008.cf.sub @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/009.cf b/tests/acceptance/16_cf-serverd/serial/009.cf index d657fbbbc0..6b136ab916 100644 --- a/tests/acceptance/16_cf-serverd/serial/009.cf +++ b/tests/acceptance/16_cf-serverd/serial/009.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/009.cf.sub b/tests/acceptance/16_cf-serverd/serial/009.cf.sub index e44b3514a7..486223c834 100644 --- a/tests/acceptance/16_cf-serverd/serial/009.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/009.cf.sub @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/010.cf b/tests/acceptance/16_cf-serverd/serial/010.cf index 1e8a9090d2..0b5507624d 100644 --- a/tests/acceptance/16_cf-serverd/serial/010.cf +++ b/tests/acceptance/16_cf-serverd/serial/010.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/010.cf.sub b/tests/acceptance/16_cf-serverd/serial/010.cf.sub index aa96ecda4d..ae7bec22ec 100644 --- a/tests/acceptance/16_cf-serverd/serial/010.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/010.cf.sub @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/011.cf b/tests/acceptance/16_cf-serverd/serial/011.cf index 1e8a9090d2..0b5507624d 100644 --- a/tests/acceptance/16_cf-serverd/serial/011.cf +++ b/tests/acceptance/16_cf-serverd/serial/011.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/011.cf.sub b/tests/acceptance/16_cf-serverd/serial/011.cf.sub index 69463e98b2..a197ef6e68 100644 --- a/tests/acceptance/16_cf-serverd/serial/011.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/011.cf.sub @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/allow_path1_then_deny_path2_a.cf b/tests/acceptance/16_cf-serverd/serial/allow_path1_then_deny_path2_a.cf index 491bf82ffc..8becf9a821 100644 --- a/tests/acceptance/16_cf-serverd/serial/allow_path1_then_deny_path2_a.cf +++ b/tests/acceptance/16_cf-serverd/serial/allow_path1_then_deny_path2_a.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { create_directories, default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/allow_path1_then_deny_path2_a.cf.sub b/tests/acceptance/16_cf-serverd/serial/allow_path1_then_deny_path2_a.cf.sub index cf3013a179..061e992070 100644 --- a/tests/acceptance/16_cf-serverd/serial/allow_path1_then_deny_path2_a.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/allow_path1_then_deny_path2_a.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/allow_path1_then_deny_path2_b.cf b/tests/acceptance/16_cf-serverd/serial/allow_path1_then_deny_path2_b.cf index ea30667cac..7e8a26dd54 100644 --- a/tests/acceptance/16_cf-serverd/serial/allow_path1_then_deny_path2_b.cf +++ b/tests/acceptance/16_cf-serverd/serial/allow_path1_then_deny_path2_b.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { create_directories, default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/allow_path1_then_deny_path2_b.cf.sub b/tests/acceptance/16_cf-serverd/serial/allow_path1_then_deny_path2_b.cf.sub index e90426172b..e3930788e7 100644 --- a/tests/acceptance/16_cf-serverd/serial/allow_path1_then_deny_path2_b.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/allow_path1_then_deny_path2_b.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/allowlegacyconnects_absent.srv b/tests/acceptance/16_cf-serverd/serial/allowlegacyconnects_absent.srv index 0dea279dcb..7ced35212f 100644 --- a/tests/acceptance/16_cf-serverd/serial/allowlegacyconnects_absent.srv +++ b/tests/acceptance/16_cf-serverd/serial/allowlegacyconnects_absent.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } diff --git a/tests/acceptance/16_cf-serverd/serial/allowlegacyconnects_closed.srv b/tests/acceptance/16_cf-serverd/serial/allowlegacyconnects_closed.srv index 9f3a1c5fba..079698ff64 100644 --- a/tests/acceptance/16_cf-serverd/serial/allowlegacyconnects_closed.srv +++ b/tests/acceptance/16_cf-serverd/serial/allowlegacyconnects_closed.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } diff --git a/tests/acceptance/16_cf-serverd/serial/allowlegacyconnects_open.srv b/tests/acceptance/16_cf-serverd/serial/allowlegacyconnects_open.srv index 448f0e97b0..9f3f1dd83b 100644 --- a/tests/acceptance/16_cf-serverd/serial/allowlegacyconnects_open.srv +++ b/tests/acceptance/16_cf-serverd/serial/allowlegacyconnects_open.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } diff --git a/tests/acceptance/16_cf-serverd/serial/copied_files_can_be_sparse.cf b/tests/acceptance/16_cf-serverd/serial/copied_files_can_be_sparse.cf index c7580061c0..2954415a25 100644 --- a/tests/acceptance/16_cf-serverd/serial/copied_files_can_be_sparse.cf +++ b/tests/acceptance/16_cf-serverd/serial/copied_files_can_be_sparse.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copied_files_can_be_sparse.cf.sub b/tests/acceptance/16_cf-serverd/serial/copied_files_can_be_sparse.cf.sub index 3ade624815..a5d2de4be7 100644 --- a/tests/acceptance/16_cf-serverd/serial/copied_files_can_be_sparse.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/copied_files_can_be_sparse.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_fail.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_fail.cf index 21678b3bde..2122c88c68 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_fail.cf +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_fail.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_fail.cf.sub b/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_fail.cf.sub index 342b53cf62..0cb802c0fc 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_fail.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_fail.cf.sub @@ -11,7 +11,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; # This cipher doesn't match neither of the two diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_success.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_success.cf index 0928558dce..26fc02a564 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_success.cf +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_success.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_success.cf.sub b/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_success.cf.sub index 1e734f09fc..5eeff2b62a 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_success.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_success.cf.sub @@ -11,7 +11,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; # Do not set this, just use the very broad OpenSSL default. diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_classic_protocol_fail.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_classic_protocol_fail.cf index 6888dad380..3724d1955a 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_classic_protocol_fail.cf +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_classic_protocol_fail.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_classic_protocol_fail.cf.sub b/tests/acceptance/16_cf-serverd/serial/copy_from_classic_protocol_fail.cf.sub index 784b3ab38c..3b4c3db87b 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_classic_protocol_fail.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_classic_protocol_fail.cf.sub @@ -10,7 +10,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; # FORCE CLASSIC PROTOCOL diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_classic_protocol_success.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_classic_protocol_success.cf index 79bf2269ac..9dd6d5219d 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_classic_protocol_success.cf +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_classic_protocol_success.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_classic_protocol_success.cf.sub b/tests/acceptance/16_cf-serverd/serial/copy_from_classic_protocol_success.cf.sub index bf2d7e6e12..da6d463ca2 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_classic_protocol_success.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_classic_protocol_success.cf.sub @@ -9,7 +9,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; # FORCE CLASSIC PROTOCOL diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different.cf index 9882be5491..facc774dd6 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different.cf +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different.cf.sub b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different.cf.sub index c51846daed..e387db21c2 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip.cf index f327f6ca7f..53c51970b1 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip.cf +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip.cf.sub b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip.cf.sub index 1eed795808..52b3ab09a2 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip.cf.sub @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip_and_shortcut.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip_and_shortcut.cf index f327f6ca7f..53c51970b1 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip_and_shortcut.cf +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip_and_shortcut.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip_and_shortcut.cf.sub b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip_and_shortcut.cf.sub index e8fbc3e342..a01e7c8d88 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip_and_shortcut.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip_and_shortcut.cf.sub @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_shortcut.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_shortcut.cf index 139a1e35ba..236cfe4d8e 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_shortcut.cf +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_shortcut.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_shortcut.cf.sub b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_shortcut.cf.sub index 84431e0ec4..700120b51c 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_shortcut.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_shortcut.cf.sub @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same.cf index cfbaa5f73a..c14d6cee33 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same.cf +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same.cf.sub b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same.cf.sub index 5ea31c1802..6a29ebdd45 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_ip.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_ip.cf index 569c884350..d052ed9dbd 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_ip.cf +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_ip.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_ip.cf.sub b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_ip.cf.sub index 08fd9b920b..c71e494a05 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_ip.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_ip.cf.sub @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_ip_and_shortcut.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_ip_and_shortcut.cf index 569c884350..d052ed9dbd 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_ip_and_shortcut.cf +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_ip_and_shortcut.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_ip_and_shortcut.cf.sub b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_ip_and_shortcut.cf.sub index a83355e9e9..faf8a1581d 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_ip_and_shortcut.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_ip_and_shortcut.cf.sub @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_shortcut.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_shortcut.cf index 4604789c5b..10e02d06f6 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_shortcut.cf +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_shortcut.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_shortcut.cf.sub b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_shortcut.cf.sub index 7736c0663e..66fd890b03 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_shortcut.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_same_expand_shortcut.cf.sub @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_encrypted_md5_zero_length_file.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_encrypted_md5_zero_length_file.cf index b99eaa6243..c5fd0ae45b 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_encrypted_md5_zero_length_file.cf +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_encrypted_md5_zero_length_file.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_encrypted_md5_zero_length_file.cf.sub b/tests/acceptance/16_cf-serverd/serial/copy_from_encrypted_md5_zero_length_file.cf.sub index da0c7f8559..021dffc346 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_encrypted_md5_zero_length_file.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_encrypted_md5_zero_length_file.cf.sub @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_expand_ip_admit_directory_deny_file.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_expand_ip_admit_directory_deny_file.cf index f43712bf14..62053248c6 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_expand_ip_admit_directory_deny_file.cf +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_expand_ip_admit_directory_deny_file.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_expand_ip_admit_directory_deny_file.cf.sub b/tests/acceptance/16_cf-serverd/serial/copy_from_expand_ip_admit_directory_deny_file.cf.sub index 3492e67fdc..c0782bac37 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_expand_ip_admit_directory_deny_file.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_expand_ip_admit_directory_deny_file.cf.sub @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_expand_ip_directory.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_expand_ip_directory.cf index c79ff63c7e..759fa975f6 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_expand_ip_directory.cf +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_expand_ip_directory.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_expand_ip_directory.cf.sub b/tests/acceptance/16_cf-serverd/serial/copy_from_expand_ip_directory.cf.sub index 4c8f3ca7cd..f18259b69b 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_expand_ip_directory.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_expand_ip_directory.cf.sub @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed-classic_protocol.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed-classic_protocol.cf index f3e45f0131..6f581f999b 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed-classic_protocol.cf +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed-classic_protocol.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed-classic_protocol.cf.sub b/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed-classic_protocol.cf.sub index 779d3a9cce..898ac4c92b 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed-classic_protocol.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed-classic_protocol.cf.sub @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; protocol_version => "classic"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed.cf index f3e45f0131..6f581f999b 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed.cf +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed.cf.sub b/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed.cf.sub index 514539fa82..1da262d406 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed.cf.sub @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_md5_zero_length_file.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_md5_zero_length_file.cf index b99eaa6243..c5fd0ae45b 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_md5_zero_length_file.cf +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_md5_zero_length_file.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_md5_zero_length_file.cf.sub b/tests/acceptance/16_cf-serverd/serial/copy_from_md5_zero_length_file.cf.sub index 5fe7bed4f4..490f58ce27 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_md5_zero_length_file.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_md5_zero_length_file.cf.sub @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_reordered_ciphers_success.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_reordered_ciphers_success.cf index d809fc6d31..3fba4cb3d5 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_reordered_ciphers_success.cf +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_reordered_ciphers_success.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_reordered_ciphers_success.cf.sub b/tests/acceptance/16_cf-serverd/serial/copy_from_reordered_ciphers_success.cf.sub index df151f01e6..991c09f90e 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_reordered_ciphers_success.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_reordered_ciphers_success.cf.sub @@ -11,7 +11,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; # Do not set this, just use the very broad OpenSSL default. diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_fail.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_fail.cf index f580826488..11c4bb9204 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_fail.cf +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_fail.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_fail.cf.sub b/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_fail.cf.sub index 35bcab7bb9..18b19b581a 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_fail.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_fail.cf.sub @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; # Require TLS 1.3 diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_success.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_success.cf index 867d21ad96..5f3b455f78 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_success.cf +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_success.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_success.cf.sub b/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_success.cf.sub index 7030b4a03a..3ba331f6c5 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_success.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_success.cf.sub @@ -8,7 +8,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; # Require TLS 1.3 diff --git a/tests/acceptance/16_cf-serverd/serial/copy_missing_ok.cf b/tests/acceptance/16_cf-serverd/serial/copy_missing_ok.cf index 9ae428b473..ca4f8f0f9f 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_missing_ok.cf +++ b/tests/acceptance/16_cf-serverd/serial/copy_missing_ok.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/copy_missing_ok.cf.sub b/tests/acceptance/16_cf-serverd/serial/copy_missing_ok.cf.sub index 588fb1305a..a121513ad3 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_missing_ok.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/copy_missing_ok.cf.sub @@ -11,7 +11,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/16_cf-serverd/serial/default_ciphers_tlsversion.srv b/tests/acceptance/16_cf-serverd/serial/default_ciphers_tlsversion.srv index 58e2107236..a4a11f36fe 100644 --- a/tests/acceptance/16_cf-serverd/serial/default_ciphers_tlsversion.srv +++ b/tests/acceptance/16_cf-serverd/serial/default_ciphers_tlsversion.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } diff --git a/tests/acceptance/16_cf-serverd/serial/lan_deny_connect.srv b/tests/acceptance/16_cf-serverd/serial/lan_deny_connect.srv index e4207eb7c9..0e662ae743 100644 --- a/tests/acceptance/16_cf-serverd/serial/lan_deny_connect.srv +++ b/tests/acceptance/16_cf-serverd/serial/lan_deny_connect.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -29,4 +29,3 @@ bundle server access_rules() "$(G.testdir)/source_file" admit => { @(sys.ip_addresses) }; } - diff --git a/tests/acceptance/16_cf-serverd/serial/localhost_closed_deny_hostnames.srv b/tests/acceptance/16_cf-serverd/serial/localhost_closed_deny_hostnames.srv index 3bb5d7134f..d2606636a4 100644 --- a/tests/acceptance/16_cf-serverd/serial/localhost_closed_deny_hostnames.srv +++ b/tests/acceptance/16_cf-serverd/serial/localhost_closed_deny_hostnames.srv @@ -3,7 +3,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -32,4 +32,3 @@ bundle server access_rules() admit => { "0.0.0.0/0" }, # admit everyone but deny_hostnames => { "localhost", "localhost.localdomain" }; # deny is stronger than admit } - diff --git a/tests/acceptance/16_cf-serverd/serial/localhost_closed_hostname.srv b/tests/acceptance/16_cf-serverd/serial/localhost_closed_hostname.srv index 0ff8b17da4..d12d8543b2 100644 --- a/tests/acceptance/16_cf-serverd/serial/localhost_closed_hostname.srv +++ b/tests/acceptance/16_cf-serverd/serial/localhost_closed_hostname.srv @@ -3,7 +3,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -32,4 +32,3 @@ bundle server access_rules() admit => { "0.0.0.0/0" }, # admit everyone deny => { "localhost", "localhost.localdomain" }; # deny is stronger than admit } - diff --git a/tests/acceptance/16_cf-serverd/serial/localhost_deny_connect.srv b/tests/acceptance/16_cf-serverd/serial/localhost_deny_connect.srv index 374de1665e..cabc3f3892 100644 --- a/tests/acceptance/16_cf-serverd/serial/localhost_deny_connect.srv +++ b/tests/acceptance/16_cf-serverd/serial/localhost_deny_connect.srv @@ -2,7 +2,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -30,4 +30,3 @@ bundle server access_rules() "$(G.testdir)/source_file" admit => { "127.0.0.1", "::1" }; } - diff --git a/tests/acceptance/16_cf-serverd/serial/localhost_deny_one_directory.srv b/tests/acceptance/16_cf-serverd/serial/localhost_deny_one_directory.srv index a04ad1a830..664108cbbe 100644 --- a/tests/acceptance/16_cf-serverd/serial/localhost_deny_one_directory.srv +++ b/tests/acceptance/16_cf-serverd/serial/localhost_deny_one_directory.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } ######################################################### diff --git a/tests/acceptance/16_cf-serverd/serial/localhost_deny_one_directory_with_regex.srv b/tests/acceptance/16_cf-serverd/serial/localhost_deny_one_directory_with_regex.srv index a4572ea153..3cbb46a732 100644 --- a/tests/acceptance/16_cf-serverd/serial/localhost_deny_one_directory_with_regex.srv +++ b/tests/acceptance/16_cf-serverd/serial/localhost_deny_one_directory_with_regex.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } ######################################################### diff --git a/tests/acceptance/16_cf-serverd/serial/localhost_noaccess.srv b/tests/acceptance/16_cf-serverd/serial/localhost_noaccess.srv index cd0fb89893..cd5fdf0aa3 100644 --- a/tests/acceptance/16_cf-serverd/serial/localhost_noaccess.srv +++ b/tests/acceptance/16_cf-serverd/serial/localhost_noaccess.srv @@ -2,7 +2,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -29,4 +29,3 @@ bundle server access_rules() # no access granted } - diff --git a/tests/acceptance/16_cf-serverd/serial/localhost_open.srv b/tests/acceptance/16_cf-serverd/serial/localhost_open.srv index ebcc67f990..dc40bc7c9c 100644 --- a/tests/acceptance/16_cf-serverd/serial/localhost_open.srv +++ b/tests/acceptance/16_cf-serverd/serial/localhost_open.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -55,4 +55,3 @@ bundle server access_rules() "$(G.testdir)/$(connection.ip)_DIR2/DENY_FILE" deny_ips => { "$(connection.ip)" }; } - diff --git a/tests/acceptance/16_cf-serverd/serial/localhost_open_admit_hostnames.srv b/tests/acceptance/16_cf-serverd/serial/localhost_open_admit_hostnames.srv index a202c7796a..9b419bfeda 100644 --- a/tests/acceptance/16_cf-serverd/serial/localhost_open_admit_hostnames.srv +++ b/tests/acceptance/16_cf-serverd/serial/localhost_open_admit_hostnames.srv @@ -3,7 +3,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -31,4 +31,3 @@ bundle server access_rules() "$(G.testdir)/source_file" admit_hostnames => { "localhost", "localhost.localdomain" }; } - diff --git a/tests/acceptance/16_cf-serverd/serial/localhost_open_hostname.srv b/tests/acceptance/16_cf-serverd/serial/localhost_open_hostname.srv index 21a9488bf7..09e5b9f493 100644 --- a/tests/acceptance/16_cf-serverd/serial/localhost_open_hostname.srv +++ b/tests/acceptance/16_cf-serverd/serial/localhost_open_hostname.srv @@ -3,7 +3,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -31,4 +31,3 @@ bundle server access_rules() "$(G.testdir)/source_file" admit => { "localhost", "localhost.localdomain" }; } - diff --git a/tests/acceptance/16_cf-serverd/serial/localhost_open_with_data_select.srv b/tests/acceptance/16_cf-serverd/serial/localhost_open_with_data_select.srv index d4ec5ae3ae..0470da73ef 100644 --- a/tests/acceptance/16_cf-serverd/serial/localhost_open_with_data_select.srv +++ b/tests/acceptance/16_cf-serverd/serial/localhost_open_with_data_select.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } diff --git a/tests/acceptance/16_cf-serverd/serial/network/004.cf b/tests/acceptance/16_cf-serverd/serial/network/004.cf index 97a28cc2dc..c68256ceb1 100644 --- a/tests/acceptance/16_cf-serverd/serial/network/004.cf +++ b/tests/acceptance/16_cf-serverd/serial/network/004.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../../default.cf.sub", "../../../run_with_server.cf.sub" }; + inputs => { "../../../default.sub.cf", "../../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/network/004.cf.sub b/tests/acceptance/16_cf-serverd/serial/network/004.cf.sub index a267ab9bd2..6884eec3c1 100644 --- a/tests/acceptance/16_cf-serverd/serial/network/004.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/network/004.cf.sub @@ -6,7 +6,7 @@ body common control { - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/network/lan_open.srv b/tests/acceptance/16_cf-serverd/serial/network/lan_open.srv index 812ccd4741..cb328b620f 100644 --- a/tests/acceptance/16_cf-serverd/serial/network/lan_open.srv +++ b/tests/acceptance/16_cf-serverd/serial/network/lan_open.srv @@ -3,7 +3,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../../default.cf.sub" }; + inputs => { "../../../default.sub.cf" }; } @@ -37,4 +37,3 @@ bundle server access_rules() "$(G.testdir)/source_file" admit => { @(sys.ip_addresses) }; } - diff --git a/tests/acceptance/16_cf-serverd/serial/no_tls_1_3.srv b/tests/acceptance/16_cf-serverd/serial/no_tls_1_3.srv index 8663b81d10..6a859689f5 100644 --- a/tests/acceptance/16_cf-serverd/serial/no_tls_1_3.srv +++ b/tests/acceptance/16_cf-serverd/serial/no_tls_1_3.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } diff --git a/tests/acceptance/16_cf-serverd/serial/nondefault_ciphers_tlsversion.srv b/tests/acceptance/16_cf-serverd/serial/nondefault_ciphers_tlsversion.srv index 9dad9f2a06..98052ff321 100644 --- a/tests/acceptance/16_cf-serverd/serial/nondefault_ciphers_tlsversion.srv +++ b/tests/acceptance/16_cf-serverd/serial/nondefault_ciphers_tlsversion.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } diff --git a/tests/acceptance/16_cf-serverd/serial/reordered_default_ciphers_tlsversion.srv b/tests/acceptance/16_cf-serverd/serial/reordered_default_ciphers_tlsversion.srv index d72e0de62a..f0575765f0 100644 --- a/tests/acceptance/16_cf-serverd/serial/reordered_default_ciphers_tlsversion.srv +++ b/tests/acceptance/16_cf-serverd/serial/reordered_default_ciphers_tlsversion.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } diff --git a/tests/acceptance/16_cf-serverd/serial/simple_copy_from_admit_localhost.cf b/tests/acceptance/16_cf-serverd/serial/simple_copy_from_admit_localhost.cf index 9dcb42bba0..71d23c31f1 100644 --- a/tests/acceptance/16_cf-serverd/serial/simple_copy_from_admit_localhost.cf +++ b/tests/acceptance/16_cf-serverd/serial/simple_copy_from_admit_localhost.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/simple_copy_from_admit_localhost.cf.sub b/tests/acceptance/16_cf-serverd/serial/simple_copy_from_admit_localhost.cf.sub index 211b77ae68..844f5c074f 100644 --- a/tests/acceptance/16_cf-serverd/serial/simple_copy_from_admit_localhost.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/simple_copy_from_admit_localhost.cf.sub @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/simple_copy_from_deny_localhost.cf b/tests/acceptance/16_cf-serverd/serial/simple_copy_from_deny_localhost.cf index 6adaeadd97..5cce7403f1 100644 --- a/tests/acceptance/16_cf-serverd/serial/simple_copy_from_deny_localhost.cf +++ b/tests/acceptance/16_cf-serverd/serial/simple_copy_from_deny_localhost.cf @@ -1,7 +1,7 @@ # body common control { - inputs => { "../../default.cf.sub", "../../run_with_server.cf.sub" }; + inputs => { "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/simple_copy_from_deny_localhost.cf.sub b/tests/acceptance/16_cf-serverd/serial/simple_copy_from_deny_localhost.cf.sub index bf71d9399a..a29cefc201 100644 --- a/tests/acceptance/16_cf-serverd/serial/simple_copy_from_deny_localhost.cf.sub +++ b/tests/acceptance/16_cf-serverd/serial/simple_copy_from_deny_localhost.cf.sub @@ -7,7 +7,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/tcp_port_copy_from_within_range.cf b/tests/acceptance/16_cf-serverd/serial/tcp_port_copy_from_within_range.cf index 1bdee572e6..4bb8079dcf 100644 --- a/tests/acceptance/16_cf-serverd/serial/tcp_port_copy_from_within_range.cf +++ b/tests/acceptance/16_cf-serverd/serial/tcp_port_copy_from_within_range.cf @@ -6,7 +6,7 @@ body common control { bundlesequence => { default("$(this.promise_filename)") }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/tcp_port_listen_outside_range.x.cf b/tests/acceptance/16_cf-serverd/serial/tcp_port_listen_outside_range.x.cf index 08556127ea..c0030b3624 100644 --- a/tests/acceptance/16_cf-serverd/serial/tcp_port_listen_outside_range.x.cf +++ b/tests/acceptance/16_cf-serverd/serial/tcp_port_listen_outside_range.x.cf @@ -6,7 +6,7 @@ body common control { bundlesequence => { default("$(this.promise_filename)") }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; version => "1.0"; } diff --git a/tests/acceptance/16_cf-serverd/serial/tcp_port_listen_within_range.cf b/tests/acceptance/16_cf-serverd/serial/tcp_port_listen_within_range.cf index 42ec7dcef9..18548af4ed 100644 --- a/tests/acceptance/16_cf-serverd/serial/tcp_port_listen_within_range.cf +++ b/tests/acceptance/16_cf-serverd/serial/tcp_port_listen_within_range.cf @@ -6,7 +6,7 @@ body common control { bundlesequence => { default("$(this.promise_filename)") }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; version => "1.0"; } @@ -20,4 +20,3 @@ bundle agent test reports: "$(this.promise_filename) Pass"; } - diff --git a/tests/acceptance/16_cf-serverd/serial/tls_1_3_only.srv b/tests/acceptance/16_cf-serverd/serial/tls_1_3_only.srv index 4e73ae4f27..c7d957aa1c 100644 --- a/tests/acceptance/16_cf-serverd/serial/tls_1_3_only.srv +++ b/tests/acceptance/16_cf-serverd/serial/tls_1_3_only.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } diff --git a/tests/acceptance/17_users/unsafe/05_hpux_set_non_trusted_mode.cf b/tests/acceptance/17_users/unsafe/05_hpux_set_non_trusted_mode.cf index 5fdd5b06f6..9681da00dd 100644 --- a/tests/acceptance/17_users/unsafe/05_hpux_set_non_trusted_mode.cf +++ b/tests/acceptance/17_users/unsafe/05_hpux_set_non_trusted_mode.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_add_user.cf b/tests/acceptance/17_users/unsafe/10_add_user.cf index 545c71de15..f5eb7b996f 100644 --- a/tests/acceptance/17_users/unsafe/10_add_user.cf +++ b/tests/acceptance/17_users/unsafe/10_add_user.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_add_user_locked.cf b/tests/acceptance/17_users/unsafe/10_add_user_locked.cf index 0206fc867c..d25048c7f2 100644 --- a/tests/acceptance/17_users/unsafe/10_add_user_locked.cf +++ b/tests/acceptance/17_users/unsafe/10_add_user_locked.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_add_user_locked_with_password.cf b/tests/acceptance/17_users/unsafe/10_add_user_locked_with_password.cf index 427390a5f5..c00b3633ba 100644 --- a/tests/acceptance/17_users/unsafe/10_add_user_locked_with_password.cf +++ b/tests/acceptance/17_users/unsafe/10_add_user_locked_with_password.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_add_user_warn.cf b/tests/acceptance/17_users/unsafe/10_add_user_warn.cf index 633b39f0d0..47dbf431be 100644 --- a/tests/acceptance/17_users/unsafe/10_add_user_warn.cf +++ b/tests/acceptance/17_users/unsafe/10_add_user_warn.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_add_user_with_description.cf b/tests/acceptance/17_users/unsafe/10_add_user_with_description.cf index ee5ec1ac7d..f0900b97ad 100644 --- a/tests/acceptance/17_users/unsafe/10_add_user_with_description.cf +++ b/tests/acceptance/17_users/unsafe/10_add_user_with_description.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_add_user_with_hashed_password.cf b/tests/acceptance/17_users/unsafe/10_add_user_with_hashed_password.cf index 927fc15382..b09b7c7bc7 100644 --- a/tests/acceptance/17_users/unsafe/10_add_user_with_hashed_password.cf +++ b/tests/acceptance/17_users/unsafe/10_add_user_with_hashed_password.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_add_user_with_many_attributes.cf b/tests/acceptance/17_users/unsafe/10_add_user_with_many_attributes.cf index 82add1c1a6..345d951963 100644 --- a/tests/acceptance/17_users/unsafe/10_add_user_with_many_attributes.cf +++ b/tests/acceptance/17_users/unsafe/10_add_user_with_many_attributes.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_add_user_with_many_attributes_warn.cf b/tests/acceptance/17_users/unsafe/10_add_user_with_many_attributes_warn.cf index 7b6e4446f9..9968697813 100644 --- a/tests/acceptance/17_users/unsafe/10_add_user_with_many_attributes_warn.cf +++ b/tests/acceptance/17_users/unsafe/10_add_user_with_many_attributes_warn.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_add_user_with_many_empty_attributes.cf b/tests/acceptance/17_users/unsafe/10_add_user_with_many_empty_attributes.cf index 677b46ac5c..7d2ecc0ccd 100644 --- a/tests/acceptance/17_users/unsafe/10_add_user_with_many_empty_attributes.cf +++ b/tests/acceptance/17_users/unsafe/10_add_user_with_many_empty_attributes.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_add_user_with_password.cf b/tests/acceptance/17_users/unsafe/10_add_user_with_password.cf index 2db323a5d4..37239464bc 100644 --- a/tests/acceptance/17_users/unsafe/10_add_user_with_password.cf +++ b/tests/acceptance/17_users/unsafe/10_add_user_with_password.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_add_user_with_primary_gid.cf b/tests/acceptance/17_users/unsafe/10_add_user_with_primary_gid.cf index 6709a94c34..8f7e214345 100644 --- a/tests/acceptance/17_users/unsafe/10_add_user_with_primary_gid.cf +++ b/tests/acceptance/17_users/unsafe/10_add_user_with_primary_gid.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", + inputs => { "../../default.sub.cf", "user_queries.cf.sub", "disable_sudo_tty_requirement.cf.sub" }; diff --git a/tests/acceptance/17_users/unsafe/10_add_user_with_primary_group.cf b/tests/acceptance/17_users/unsafe/10_add_user_with_primary_group.cf index 1ce89fd925..3259a22f19 100644 --- a/tests/acceptance/17_users/unsafe/10_add_user_with_primary_group.cf +++ b/tests/acceptance/17_users/unsafe/10_add_user_with_primary_group.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", + inputs => { "../../default.sub.cf", "user_queries.cf.sub", "disable_sudo_tty_requirement.cf.sub" }; diff --git a/tests/acceptance/17_users/unsafe/10_add_user_with_secondary_gid.cf b/tests/acceptance/17_users/unsafe/10_add_user_with_secondary_gid.cf index 55e917cb59..4249ab3379 100644 --- a/tests/acceptance/17_users/unsafe/10_add_user_with_secondary_gid.cf +++ b/tests/acceptance/17_users/unsafe/10_add_user_with_secondary_gid.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", + inputs => { "../../default.sub.cf", "user_queries.cf.sub", "disable_sudo_tty_requirement.cf.sub" }; diff --git a/tests/acceptance/17_users/unsafe/10_add_user_with_secondary_group.cf b/tests/acceptance/17_users/unsafe/10_add_user_with_secondary_group.cf index 9c48f38ee7..18ab9df565 100644 --- a/tests/acceptance/17_users/unsafe/10_add_user_with_secondary_group.cf +++ b/tests/acceptance/17_users/unsafe/10_add_user_with_secondary_group.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", + inputs => { "../../default.sub.cf", "user_queries.cf.sub", "disable_sudo_tty_requirement.cf.sub" }; diff --git a/tests/acceptance/17_users/unsafe/10_add_user_with_several_secondary_groups.cf b/tests/acceptance/17_users/unsafe/10_add_user_with_several_secondary_groups.cf index 42b91e08c4..770a9ad5b1 100644 --- a/tests/acceptance/17_users/unsafe/10_add_user_with_several_secondary_groups.cf +++ b/tests/acceptance/17_users/unsafe/10_add_user_with_several_secondary_groups.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", + inputs => { "../../default.sub.cf", "user_queries.cf.sub", "disable_sudo_tty_requirement.cf.sub" }; diff --git a/tests/acceptance/17_users/unsafe/10_add_user_with_shell.cf b/tests/acceptance/17_users/unsafe/10_add_user_with_shell.cf index 424b3a7b92..8b4c14f0d2 100644 --- a/tests/acceptance/17_users/unsafe/10_add_user_with_shell.cf +++ b/tests/acceptance/17_users/unsafe/10_add_user_with_shell.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", + inputs => { "../../default.sub.cf", "user_queries.cf.sub", "disable_sudo_tty_requirement.cf.sub" }; diff --git a/tests/acceptance/17_users/unsafe/10_add_user_with_uid.cf b/tests/acceptance/17_users/unsafe/10_add_user_with_uid.cf index ccf3f1b77c..b6ea926299 100644 --- a/tests/acceptance/17_users/unsafe/10_add_user_with_uid.cf +++ b/tests/acceptance/17_users/unsafe/10_add_user_with_uid.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_home_bundle_when_removing_user.cf b/tests/acceptance/17_users/unsafe/10_home_bundle_when_removing_user.cf index 0ee06d9706..6216dac38d 100644 --- a/tests/acceptance/17_users/unsafe/10_home_bundle_when_removing_user.cf +++ b/tests/acceptance/17_users/unsafe/10_home_bundle_when_removing_user.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_home_bundle_with_existing_user.cf b/tests/acceptance/17_users/unsafe/10_home_bundle_with_existing_user.cf index 5025357718..bb3af82deb 100644 --- a/tests/acceptance/17_users/unsafe/10_home_bundle_with_existing_user.cf +++ b/tests/acceptance/17_users/unsafe/10_home_bundle_with_existing_user.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_home_bundle_with_new_user_and_default_inherit.cf b/tests/acceptance/17_users/unsafe/10_home_bundle_with_new_user_and_default_inherit.cf index 40654b9fd6..1d0a5c136b 100644 --- a/tests/acceptance/17_users/unsafe/10_home_bundle_with_new_user_and_default_inherit.cf +++ b/tests/acceptance/17_users/unsafe/10_home_bundle_with_new_user_and_default_inherit.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_home_bundle_with_new_user_and_inherit.cf b/tests/acceptance/17_users/unsafe/10_home_bundle_with_new_user_and_inherit.cf index 1113851da0..47b2d7828b 100644 --- a/tests/acceptance/17_users/unsafe/10_home_bundle_with_new_user_and_inherit.cf +++ b/tests/acceptance/17_users/unsafe/10_home_bundle_with_new_user_and_inherit.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_home_bundle_with_new_user_and_no_inherit.cf b/tests/acceptance/17_users/unsafe/10_home_bundle_with_new_user_and_no_inherit.cf index e0256f017b..b2724a5c1b 100644 --- a/tests/acceptance/17_users/unsafe/10_home_bundle_with_new_user_and_no_inherit.cf +++ b/tests/acceptance/17_users/unsafe/10_home_bundle_with_new_user_and_no_inherit.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_missing_policy.cf b/tests/acceptance/17_users/unsafe/10_missing_policy.cf index ac9af5dbee..38f5a4f794 100644 --- a/tests/acceptance/17_users/unsafe/10_missing_policy.cf +++ b/tests/acceptance/17_users/unsafe/10_missing_policy.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_modify_user_lock.cf b/tests/acceptance/17_users/unsafe/10_modify_user_lock.cf index fffe5d37a5..a692f2898f 100644 --- a/tests/acceptance/17_users/unsafe/10_modify_user_lock.cf +++ b/tests/acceptance/17_users/unsafe/10_modify_user_lock.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_modify_user_lock_warn.cf b/tests/acceptance/17_users/unsafe/10_modify_user_lock_warn.cf index d8c72e69ec..7041243c96 100644 --- a/tests/acceptance/17_users/unsafe/10_modify_user_lock_warn.cf +++ b/tests/acceptance/17_users/unsafe/10_modify_user_lock_warn.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_modify_user_lock_with_password.cf b/tests/acceptance/17_users/unsafe/10_modify_user_lock_with_password.cf index 1f888d2788..f416344160 100644 --- a/tests/acceptance/17_users/unsafe/10_modify_user_lock_with_password.cf +++ b/tests/acceptance/17_users/unsafe/10_modify_user_lock_with_password.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_modify_user_unlock.cf b/tests/acceptance/17_users/unsafe/10_modify_user_unlock.cf index 4ed031bc03..8dfa84e55a 100644 --- a/tests/acceptance/17_users/unsafe/10_modify_user_unlock.cf +++ b/tests/acceptance/17_users/unsafe/10_modify_user_unlock.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_modify_user_unlock_warn.cf b/tests/acceptance/17_users/unsafe/10_modify_user_unlock_warn.cf index f9b6fc3331..c58a28d7ed 100644 --- a/tests/acceptance/17_users/unsafe/10_modify_user_unlock_warn.cf +++ b/tests/acceptance/17_users/unsafe/10_modify_user_unlock_warn.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_modify_user_unlock_with_password.cf b/tests/acceptance/17_users/unsafe/10_modify_user_unlock_with_password.cf index 407fe77c8c..b7d08c572c 100644 --- a/tests/acceptance/17_users/unsafe/10_modify_user_unlock_with_password.cf +++ b/tests/acceptance/17_users/unsafe/10_modify_user_unlock_with_password.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_modify_user_with_hashed_password.cf b/tests/acceptance/17_users/unsafe/10_modify_user_with_hashed_password.cf index b6919e188e..366c34080b 100644 --- a/tests/acceptance/17_users/unsafe/10_modify_user_with_hashed_password.cf +++ b/tests/acceptance/17_users/unsafe/10_modify_user_with_hashed_password.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_modify_user_with_many_attributes.cf b/tests/acceptance/17_users/unsafe/10_modify_user_with_many_attributes.cf index 655c26c84a..bd130f6229 100644 --- a/tests/acceptance/17_users/unsafe/10_modify_user_with_many_attributes.cf +++ b/tests/acceptance/17_users/unsafe/10_modify_user_with_many_attributes.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_modify_user_with_many_attributes_warn.cf b/tests/acceptance/17_users/unsafe/10_modify_user_with_many_attributes_warn.cf index 5366a0953d..7afbcec231 100644 --- a/tests/acceptance/17_users/unsafe/10_modify_user_with_many_attributes_warn.cf +++ b/tests/acceptance/17_users/unsafe/10_modify_user_with_many_attributes_warn.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_modify_user_with_many_empty_attributes.cf b/tests/acceptance/17_users/unsafe/10_modify_user_with_many_empty_attributes.cf index 7f9cd9a31c..be69210d4f 100644 --- a/tests/acceptance/17_users/unsafe/10_modify_user_with_many_empty_attributes.cf +++ b/tests/acceptance/17_users/unsafe/10_modify_user_with_many_empty_attributes.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_modify_user_with_password.cf b/tests/acceptance/17_users/unsafe/10_modify_user_with_password.cf index aca7f816f2..fadbe5463c 100644 --- a/tests/acceptance/17_users/unsafe/10_modify_user_with_password.cf +++ b/tests/acceptance/17_users/unsafe/10_modify_user_with_password.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_modify_user_with_same_password.cf b/tests/acceptance/17_users/unsafe/10_modify_user_with_same_password.cf index d335163480..c7d790b554 100644 --- a/tests/acceptance/17_users/unsafe/10_modify_user_with_same_password.cf +++ b/tests/acceptance/17_users/unsafe/10_modify_user_with_same_password.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_newly_created_account_should_not_count_as_locked.cf b/tests/acceptance/17_users/unsafe/10_newly_created_account_should_not_count_as_locked.cf index f29e14e9c1..4a88c17913 100644 --- a/tests/acceptance/17_users/unsafe/10_newly_created_account_should_not_count_as_locked.cf +++ b/tests/acceptance/17_users/unsafe/10_newly_created_account_should_not_count_as_locked.cf @@ -16,7 +16,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_password_hash_is_not_cached.cf b/tests/acceptance/17_users/unsafe/10_password_hash_is_not_cached.cf index 29aa62fd8c..183963ae90 100644 --- a/tests/acceptance/17_users/unsafe/10_password_hash_is_not_cached.cf +++ b/tests/acceptance/17_users/unsafe/10_password_hash_is_not_cached.cf @@ -18,7 +18,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_password_with_no_data.cf b/tests/acceptance/17_users/unsafe/10_password_with_no_data.cf index 7978033d9f..d63dd2623c 100644 --- a/tests/acceptance/17_users/unsafe/10_password_with_no_data.cf +++ b/tests/acceptance/17_users/unsafe/10_password_with_no_data.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_password_with_no_format.cf b/tests/acceptance/17_users/unsafe/10_password_with_no_format.cf index 10a01db4df..44246864fd 100644 --- a/tests/acceptance/17_users/unsafe/10_password_with_no_format.cf +++ b/tests/acceptance/17_users/unsafe/10_password_with_no_format.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_promise_outcomes.cf b/tests/acceptance/17_users/unsafe/10_promise_outcomes.cf index 2dbbbeb601..90820e7f98 100644 --- a/tests/acceptance/17_users/unsafe/10_promise_outcomes.cf +++ b/tests/acceptance/17_users/unsafe/10_promise_outcomes.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_remove_user.cf b/tests/acceptance/17_users/unsafe/10_remove_user.cf index 09388e533c..f7da93e393 100644 --- a/tests/acceptance/17_users/unsafe/10_remove_user.cf +++ b/tests/acceptance/17_users/unsafe/10_remove_user.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/10_remove_user_warn.cf b/tests/acceptance/17_users/unsafe/10_remove_user_warn.cf index 71605e8322..6349e4601b 100644 --- a/tests/acceptance/17_users/unsafe/10_remove_user_warn.cf +++ b/tests/acceptance/17_users/unsafe/10_remove_user_warn.cf @@ -10,7 +10,7 @@ bundle common test_meta body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/15_hpux_set_trusted_mode.cf b/tests/acceptance/17_users/unsafe/15_hpux_set_trusted_mode.cf index 6635808385..64b31d6ae5 100644 --- a/tests/acceptance/17_users/unsafe/15_hpux_set_trusted_mode.cf +++ b/tests/acceptance/17_users/unsafe/15_hpux_set_trusted_mode.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/20_modify_user_missing_secondary_group.cf b/tests/acceptance/17_users/unsafe/20_modify_user_missing_secondary_group.cf index 56714687eb..9389e17eed 100644 --- a/tests/acceptance/17_users/unsafe/20_modify_user_missing_secondary_group.cf +++ b/tests/acceptance/17_users/unsafe/20_modify_user_missing_secondary_group.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/17_users/unsafe/20_modify_user_secondary_groups.cf b/tests/acceptance/17_users/unsafe/20_modify_user_secondary_groups.cf index d84054ded6..99d891d772 100644 --- a/tests/acceptance/17_users/unsafe/20_modify_user_secondary_groups.cf +++ b/tests/acceptance/17_users/unsafe/20_modify_user_secondary_groups.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub", "user_queries.cf.sub" }; + inputs => { "../../default.sub.cf", "user_queries.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/19_security/other_writeable/group_write.cf b/tests/acceptance/19_security/other_writeable/group_write.cf index 0c9a5cc8d1..73786f129c 100644 --- a/tests/acceptance/19_security/other_writeable/group_write.cf +++ b/tests/acceptance/19_security/other_writeable/group_write.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/19_security/other_writeable/other_write.cf b/tests/acceptance/19_security/other_writeable/other_write.cf index b6542593d8..48ec961be3 100644 --- a/tests/acceptance/19_security/other_writeable/other_write.cf +++ b/tests/acceptance/19_security/other_writeable/other_write.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/20_meta/basic.cf b/tests/acceptance/20_meta/basic.cf index 0e02377c89..2e666cbd1a 100644 --- a/tests/acceptance/20_meta/basic.cf +++ b/tests/acceptance/20_meta/basic.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/20_meta/this_bundle_meta_expands.cf b/tests/acceptance/20_meta/this_bundle_meta_expands.cf index 2941fba8d2..a10d8db7dd 100644 --- a/tests/acceptance/20_meta/this_bundle_meta_expands.cf +++ b/tests/acceptance/20_meta/this_bundle_meta_expands.cf @@ -11,7 +11,7 @@ bundle common test_meta body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/21_methods/array_reset.cf b/tests/acceptance/21_methods/array_reset.cf index 806d231a16..c74f88a3c7 100644 --- a/tests/acceptance/21_methods/array_reset.cf +++ b/tests/acceptance/21_methods/array_reset.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -44,4 +44,3 @@ bundle agent check DEBUG.!ok:: "test_method.array has $(dim) entries instead of 1"; } - 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 dfa945a782..6b6ce245e1 100644 --- a/tests/acceptance/21_methods/call_methods_using_array_expansion.cf +++ b/tests/acceptance/21_methods/call_methods_using_array_expansion.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/21_methods/callers/callers_directly.cf b/tests/acceptance/21_methods/callers/callers_directly.cf index 0ddd755446..624ba06765 100644 --- a/tests/acceptance/21_methods/callers/callers_directly.cf +++ b/tests/acceptance/21_methods/callers/callers_directly.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/21_methods/callers/promisers_directly.cf b/tests/acceptance/21_methods/callers/promisers_directly.cf index 14edfd48cd..54a62cba0c 100644 --- a/tests/acceptance/21_methods/callers/promisers_directly.cf +++ b/tests/acceptance/21_methods/callers/promisers_directly.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -50,4 +50,3 @@ bundle agent dummy { "EXPECT: callers_promisers_string = ${callers_promisers_expect}"; "ACTUAL: callers_promisers_string = ${callers_promisers_actual}"; } - diff --git a/tests/acceptance/21_methods/callers/promisers_indirectly.cf b/tests/acceptance/21_methods/callers/promisers_indirectly.cf index 4e145766b7..136efee86f 100644 --- a/tests/acceptance/21_methods/callers/promisers_indirectly.cf +++ b/tests/acceptance/21_methods/callers/promisers_indirectly.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -68,4 +68,3 @@ bundle agent dummy { "EXPECT (second in ${this.bundle}): callers_promisers_string = ${callers_promisers_expect_second}"; "ACTUAL (second in ${this.bundle}): callers_promisers_string = ${callers_promisers_actual}"; } - diff --git a/tests/acceptance/21_methods/method_outcomes.cf b/tests/acceptance/21_methods/method_outcomes.cf index 66b0ad25c9..9d0a5e2ca9 100644 --- a/tests/acceptance/21_methods/method_outcomes.cf +++ b/tests/acceptance/21_methods/method_outcomes.cf @@ -3,7 +3,7 @@ # bundle. body file control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; } bundle agent main diff --git a/tests/acceptance/21_methods/reporting/kept.cf b/tests/acceptance/21_methods/reporting/kept.cf index 24590e98bc..72339839ea 100644 --- a/tests/acceptance/21_methods/reporting/kept.cf +++ b/tests/acceptance/21_methods/reporting/kept.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/21_methods/usebundle_with_or_without.cf b/tests/acceptance/21_methods/usebundle_with_or_without.cf index 24eabccb59..f1c0e60633 100644 --- a/tests/acceptance/21_methods/usebundle_with_or_without.cf +++ b/tests/acceptance/21_methods/usebundle_with_or_without.cf @@ -2,7 +2,7 @@ body common control { - inputs => { '../default.cf.sub' }; + inputs => { '../default.sub.cf' }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/21_methods/warn_only.cf b/tests/acceptance/21_methods/warn_only.cf index a5741d35ca..8292b6409d 100644 --- a/tests/acceptance/21_methods/warn_only.cf +++ b/tests/acceptance/21_methods/warn_only.cf @@ -6,7 +6,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/22_cf-runagent/serial/allroles_nonroot_role2_root_allowed.22009.srv b/tests/acceptance/22_cf-runagent/serial/allroles_nonroot_role2_root_allowed.22009.srv index 421f097e64..9cfb00f017 100644 --- a/tests/acceptance/22_cf-runagent/serial/allroles_nonroot_role2_root_allowed.22009.srv +++ b/tests/acceptance/22_cf-runagent/serial/allroles_nonroot_role2_root_allowed.22009.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -41,4 +41,3 @@ bundle server access_rules() "role2" authorize => { "root" }; } - diff --git a/tests/acceptance/22_cf-runagent/serial/allroles_root_allowed.22006.srv b/tests/acceptance/22_cf-runagent/serial/allroles_root_allowed.22006.srv index 5271db6c15..1c42ffec8c 100644 --- a/tests/acceptance/22_cf-runagent/serial/allroles_root_allowed.22006.srv +++ b/tests/acceptance/22_cf-runagent/serial/allroles_root_allowed.22006.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -40,4 +40,3 @@ bundle server access_rules() ".*" authorize => { "root" }; } - diff --git a/tests/acceptance/22_cf-runagent/serial/bundle2_role2_only_allowed.22012.srv b/tests/acceptance/22_cf-runagent/serial/bundle2_role2_only_allowed.22012.srv index e1fec6e320..b536ac71bd 100644 --- a/tests/acceptance/22_cf-runagent/serial/bundle2_role2_only_allowed.22012.srv +++ b/tests/acceptance/22_cf-runagent/serial/bundle2_role2_only_allowed.22012.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -44,4 +44,3 @@ bundle server access_rules() "role2" authorize => { "root" }; } - diff --git a/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed.22010.srv b/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed.22010.srv index 08e16535ae..91cfef2571 100644 --- a/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed.22010.srv +++ b/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed.22010.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -40,4 +40,3 @@ bundle server access_rules() resource_type => "bundle"; } - diff --git a/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed_regex_disallowed.22013.srv b/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed_regex_disallowed.22013.srv index 80ab439edd..c2554bff42 100644 --- a/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed_regex_disallowed.22013.srv +++ b/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed_regex_disallowed.22013.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -44,4 +44,3 @@ bundle server access_rules() resource_type => "bundle"; } - diff --git a/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed_regex_disallowed_admitted.cf b/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed_regex_disallowed_admitted.cf index 84a92cb499..46e0a5e6bc 100644 --- a/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed_regex_disallowed_admitted.cf +++ b/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed_regex_disallowed_admitted.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed_regex_disallowed_denied.cf b/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed_regex_disallowed_denied.cf index ac8cfbc69c..963256eafe 100644 --- a/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed_regex_disallowed_denied.cf +++ b/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed_regex_disallowed_denied.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed_roles_disallowed_denied.cf b/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed_roles_disallowed_denied.cf index 7d6bd1bd5d..7f549e2f73 100644 --- a/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed_roles_disallowed_denied.cf +++ b/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed_roles_disallowed_denied.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/bundles_roles_all_allowed.22011.srv b/tests/acceptance/22_cf-runagent/serial/bundles_roles_all_allowed.22011.srv index 1b09aaad2b..0f0a1edcad 100644 --- a/tests/acceptance/22_cf-runagent/serial/bundles_roles_all_allowed.22011.srv +++ b/tests/acceptance/22_cf-runagent/serial/bundles_roles_all_allowed.22011.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -44,4 +44,3 @@ bundle server access_rules() ".*" authorize => { "root" }; } - diff --git a/tests/acceptance/22_cf-runagent/serial/cfruncommand_argv0_quoted.22014.srv b/tests/acceptance/22_cf-runagent/serial/cfruncommand_argv0_quoted.22014.srv index b5d3213a09..f418f8739c 100644 --- a/tests/acceptance/22_cf-runagent/serial/cfruncommand_argv0_quoted.22014.srv +++ b/tests/acceptance/22_cf-runagent/serial/cfruncommand_argv0_quoted.22014.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -43,4 +43,3 @@ bundle server access_rules() # ".*" authorize => { "root" }; } - diff --git a/tests/acceptance/22_cf-runagent/serial/cfruncommand_argv0_quoted.cf b/tests/acceptance/22_cf-runagent/serial/cfruncommand_argv0_quoted.cf index 83901b0d19..8bc55b830d 100644 --- a/tests/acceptance/22_cf-runagent/serial/cfruncommand_argv0_quoted.cf +++ b/tests/acceptance/22_cf-runagent/serial/cfruncommand_argv0_quoted.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/cfruncommand_deny_root.22001.srv b/tests/acceptance/22_cf-runagent/serial/cfruncommand_deny_root.22001.srv index d4a1ce0ac0..de15d290c0 100644 --- a/tests/acceptance/22_cf-runagent/serial/cfruncommand_deny_root.22001.srv +++ b/tests/acceptance/22_cf-runagent/serial/cfruncommand_deny_root.22001.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -36,4 +36,3 @@ bundle server access_rules() admit_ips => { "127.0.0.1", "::1" }; } - diff --git a/tests/acceptance/22_cf-runagent/serial/cfruncommand_deny_root.cf b/tests/acceptance/22_cf-runagent/serial/cfruncommand_deny_root.cf index 37cd4e8152..c8fd9d0fe7 100644 --- a/tests/acceptance/22_cf-runagent/serial/cfruncommand_deny_root.cf +++ b/tests/acceptance/22_cf-runagent/serial/cfruncommand_deny_root.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access.22002.srv b/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access.22002.srv index 3c67ba1d0e..46509f458e 100644 --- a/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access.22002.srv +++ b/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access.22002.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -42,4 +42,3 @@ bundle server access_rules() # ".*" authorize => { "root" }; } - diff --git a/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access.22003.srv b/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access.22003.srv index 32659e350c..7636cf0f84 100644 --- a/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access.22003.srv +++ b/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access.22003.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -42,4 +42,3 @@ bundle server access_rules() # ".*" authorize => { "root" }; } - diff --git a/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access.22004.srv b/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access.22004.srv index e1507126ec..317d0f710e 100644 --- a/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access.22004.srv +++ b/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access.22004.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -42,4 +42,3 @@ bundle server access_rules() # ".*" authorize => { "root" }; } - diff --git a/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access_1.cf b/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access_1.cf index 554515f035..56655451c1 100644 --- a/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access_1.cf +++ b/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access_1.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access_2.cf b/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access_2.cf index 04968f30a1..7e033ca54b 100644 --- a/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access_2.cf +++ b/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access_2.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access_3.cf b/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access_3.cf index 3e9f7467d1..aedf501d3b 100644 --- a/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access_3.cf +++ b/tests/acceptance/22_cf-runagent/serial/cfruncommand_no_access_3.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/cfruncommand_open.22000.srv b/tests/acceptance/22_cf-runagent/serial/cfruncommand_open.22000.srv index 23de49073d..eabd0b0634 100644 --- a/tests/acceptance/22_cf-runagent/serial/cfruncommand_open.22000.srv +++ b/tests/acceptance/22_cf-runagent/serial/cfruncommand_open.22000.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -40,4 +40,3 @@ bundle server access_rules() # ".*" authorize => { "root" }; } - diff --git a/tests/acceptance/22_cf-runagent/serial/cfruncommand_open.cf b/tests/acceptance/22_cf-runagent/serial/cfruncommand_open.cf index ea6acae5c3..bdf065ff3a 100644 --- a/tests/acceptance/22_cf-runagent/serial/cfruncommand_open.cf +++ b/tests/acceptance/22_cf-runagent/serial/cfruncommand_open.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/cfruncommand_relative_paths_disallowed.srv b/tests/acceptance/22_cf-runagent/serial/cfruncommand_relative_paths_disallowed.srv index 9d7dcaf914..6105b7da74 100644 --- a/tests/acceptance/22_cf-runagent/serial/cfruncommand_relative_paths_disallowed.srv +++ b/tests/acceptance/22_cf-runagent/serial/cfruncommand_relative_paths_disallowed.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -40,4 +40,3 @@ bundle server access_rules() # ".*" authorize => { "root" }; } - diff --git a/tests/acceptance/22_cf-runagent/serial/ns2_bundle2_ns1_role2_only_allowed.22015.srv b/tests/acceptance/22_cf-runagent/serial/ns2_bundle2_ns1_role2_only_allowed.22015.srv index 9cebd898d7..02a7c8accd 100644 --- a/tests/acceptance/22_cf-runagent/serial/ns2_bundle2_ns1_role2_only_allowed.22015.srv +++ b/tests/acceptance/22_cf-runagent/serial/ns2_bundle2_ns1_role2_only_allowed.22015.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -44,4 +44,3 @@ bundle server access_rules() "ns1:role2" authorize => { "root" }; } - diff --git a/tests/acceptance/22_cf-runagent/serial/role12_root_allowed.22007.srv b/tests/acceptance/22_cf-runagent/serial/role12_root_allowed.22007.srv index e6921f7f42..50b8fb88f0 100644 --- a/tests/acceptance/22_cf-runagent/serial/role12_root_allowed.22007.srv +++ b/tests/acceptance/22_cf-runagent/serial/role12_root_allowed.22007.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -40,4 +40,3 @@ bundle server access_rules() "role12" authorize => { "root" }; } - diff --git a/tests/acceptance/22_cf-runagent/serial/role1_role2_root_allowed.22008.srv b/tests/acceptance/22_cf-runagent/serial/role1_role2_root_allowed.22008.srv index 34a3410916..0ea15d9ed8 100644 --- a/tests/acceptance/22_cf-runagent/serial/role1_role2_root_allowed.22008.srv +++ b/tests/acceptance/22_cf-runagent/serial/role1_role2_root_allowed.22008.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -41,4 +41,3 @@ bundle server access_rules() "role2" authorize => { "root" }; } - diff --git a/tests/acceptance/22_cf-runagent/serial/role1_root_allowed.22005.srv b/tests/acceptance/22_cf-runagent/serial/role1_root_allowed.22005.srv index 7884cf48b9..6ea51930e0 100644 --- a/tests/acceptance/22_cf-runagent/serial/role1_root_allowed.22005.srv +++ b/tests/acceptance/22_cf-runagent/serial/role1_root_allowed.22005.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } @@ -40,4 +40,3 @@ bundle server access_rules() "role1" authorize => { "root" }; } - diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_admitted_1.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_admitted_1.cf index 66cc006c40..5a7c77a5c3 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_admitted_1.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_admitted_1.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_bundle2_admitted_1.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_bundle2_admitted_1.cf index d9f0ab8898..07872af5b9 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_bundle2_admitted_1.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_bundle2_admitted_1.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_bundle2_denied.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_bundle2_denied.cf index 41e5654f94..781126803a 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_bundle2_denied.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_bundle2_denied.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_denied_1.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_denied_1.cf index a677b3285f..bade35c183 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_denied_1.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_denied_1.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle2_admitted.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle2_admitted.cf index 421913028a..21d3e2b78e 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle2_admitted.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle2_admitted.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle2_bundle1_denied.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle2_bundle1_denied.cf index b549ebb6dd..b0b71ba0cd 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle2_bundle1_denied.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle2_bundle1_denied.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle_denied.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle_denied.cf index 0384bcba1c..af79d87d76 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle_denied.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle_denied.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-B_specialchars_denied.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-B_specialchars_denied.cf index e6195f3d99..ba6b2490d1 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-B_specialchars_denied.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-B_specialchars_denied.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_ns1_role2_-B_bundle2_denied.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_ns1_role2_-B_bundle2_denied.cf index c2ee447390..56dfa30a66 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_ns1_role2_-B_bundle2_denied.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_ns1_role2_-B_bundle2_denied.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_ns1_role2_-B_ns2_bundle2_admitted.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_ns1_role2_-B_ns2_bundle2_admitted.cf index 9c2b39bf4d..23b2778ccb 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_ns1_role2_-B_ns2_bundle2_admitted.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_ns1_role2_-B_ns2_bundle2_admitted.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_ns1_role2_-B_ns2_bundle2_denied.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_ns1_role2_-B_ns2_bundle2_denied.cf index 5e1d790c18..f1e987c2ad 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_ns1_role2_-B_ns2_bundle2_denied.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_ns1_role2_-B_ns2_bundle2_denied.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_ns2_role2_-B_ns2_bundle2_denied.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_ns2_role2_-B_ns2_bundle2_denied.cf index 2ae80e3053..27376ad93b 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_ns2_role2_-B_ns2_bundle2_denied.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_ns2_role2_-B_ns2_bundle2_denied.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1-B_bundle1_admitted_1.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1-B_bundle1_admitted_1.cf index cbaa462bcd..30c5cd4c5f 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1-B_bundle1_admitted_1.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1-B_bundle1_admitted_1.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role12_denied_1.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role12_denied_1.cf index 4057dec620..95bb0ee48e 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role12_denied_1.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role12_denied_1.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_-B_bundle2_denied.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_-B_bundle2_denied.cf index 3fb009b85d..5bc17fe037 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_-B_bundle2_denied.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_-B_bundle2_denied.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_-D_role2_admitted.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_-D_role2_admitted.cf index 2182a5ca01..bb4ef21d5e 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_-D_role2_admitted.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_-D_role2_admitted.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_1.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_1.cf index 4f4fd72db2..90e922c06b 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_1.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_1.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_2.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_2.cf index 0b0cb1f4f2..d4d7ba574a 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_2.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_2.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_3.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_3.cf index 070d03b888..ed9b4005d4 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_3.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_3.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_denied_1.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_denied_1.cf index 10d5b2a049..be8744669f 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_denied_1.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_denied_1.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_denied_2.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_denied_2.cf index fb39815231..f373c42d6c 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_denied_2.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_denied_2.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_denied_3.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_denied_3.cf index 0238dd0c87..2e81f55efc 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_denied_3.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_denied_3.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_admitted_1.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_admitted_1.cf index bd587cb715..0a6aa9cf6b 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_admitted_1.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_admitted_1.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_admitted_2.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_admitted_2.cf index 3314a10f09..142a11d10f 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_admitted_2.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_admitted_2.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_denied_1.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_denied_1.cf index e4a41eec0d..054c30d48e 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_denied_1.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_denied_1.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_denied_2.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_denied_2.cf index 9b84fa9dd5..03c4843b90 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_denied_2.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_denied_2.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_denied_3.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_denied_3.cf index b5625c7e11..99615b9cde 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_denied_3.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_denied_3.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_-B_bundle1_denied.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_-B_bundle1_denied.cf index 7b426c9e6d..09714f4313 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_-B_bundle1_denied.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_-B_bundle1_denied.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_-B_bundle2_admitted.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_-B_bundle2_admitted.cf index 0cc93ef624..7ca3ccd8c0 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_-B_bundle2_admitted.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_-B_bundle2_admitted.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_admitted_1.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_admitted_1.cf index e8ec9e91cf..8bd3931f3d 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_admitted_1.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_admitted_1.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_admitted_2.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_admitted_2.cf index 6b9724740a..e909f057c7 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_admitted_2.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_admitted_2.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_denied_1.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_denied_1.cf index bda39dca4c..dc2f2366af 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_denied_1.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_denied_1.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_role1_denied_1.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_role1_denied_1.cf index 1368868453..0e95dc5707 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_role1_denied_1.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_role1_denied_1.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_specialchars_denied.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_specialchars_denied.cf index 30f74e208f..efd560e81e 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_specialchars_denied.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_specialchars_denied.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-o_deprecated.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-o_deprecated.cf index 1e12badc0d..eba78e71db 100644 --- a/tests/acceptance/22_cf-runagent/serial/runagent_-o_deprecated.cf +++ b/tests/acceptance/22_cf-runagent/serial/runagent_-o_deprecated.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/23_failsafe/failsafe_created_on_parse_error.cf b/tests/acceptance/23_failsafe/failsafe_created_on_parse_error.cf index f5f2fb504b..84e4397d19 100644 --- a/tests/acceptance/23_failsafe/failsafe_created_on_parse_error.cf +++ b/tests/acceptance/23_failsafe/failsafe_created_on_parse_error.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/23_failsafe/preexisting_failsafe_preserved.cf b/tests/acceptance/23_failsafe/preexisting_failsafe_preserved.cf index da1041a598..d16184e657 100644 --- a/tests/acceptance/23_failsafe/preexisting_failsafe_preserved.cf +++ b/tests/acceptance/23_failsafe/preexisting_failsafe_preserved.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../default.cf.sub", "../plucked.sub.cf" }; + inputs => { "../default.sub.cf", "../plucked.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/24_cmd_line_arguments/parsed_policy.cf b/tests/acceptance/24_cmd_line_arguments/parsed_policy.cf index d073ded8f5..7835fb6591 100644 --- a/tests/acceptance/24_cmd_line_arguments/parsed_policy.cf +++ b/tests/acceptance/24_cmd_line_arguments/parsed_policy.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default($(this.promise_filename)) }; } diff --git a/tests/acceptance/25_cf-execd/mail_1st_run_empty_new_log.cf b/tests/acceptance/25_cf-execd/mail_1st_run_empty_new_log.cf index accdd80788..3e3aecfa65 100644 --- a/tests/acceptance/25_cf-execd/mail_1st_run_empty_new_log.cf +++ b/tests/acceptance/25_cf-execd/mail_1st_run_empty_new_log.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../default.cf.sub", "mailfilter_common.cf.sub" }; + inputs => { "../default.sub.cf", "mailfilter_common.cf.sub" }; bundlesequence => { default($(this.promiser_filename)) }; } diff --git a/tests/acceptance/25_cf-execd/mail_empty_old_and_new_log.cf b/tests/acceptance/25_cf-execd/mail_empty_old_and_new_log.cf index 627a891db7..dbe497c931 100644 --- a/tests/acceptance/25_cf-execd/mail_empty_old_and_new_log.cf +++ b/tests/acceptance/25_cf-execd/mail_empty_old_and_new_log.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../default.cf.sub", "mailfilter_common.cf.sub" }; + inputs => { "../default.sub.cf", "mailfilter_common.cf.sub" }; bundlesequence => { default($(this.promiser_filename)) }; } diff --git a/tests/acceptance/25_cf-execd/mail_exclude_filter.cf b/tests/acceptance/25_cf-execd/mail_exclude_filter.cf index 62e868752d..3269074618 100644 --- a/tests/acceptance/25_cf-execd/mail_exclude_filter.cf +++ b/tests/acceptance/25_cf-execd/mail_exclude_filter.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../default.cf.sub", "mailfilter_common.cf.sub" }; + inputs => { "../default.sub.cf", "mailfilter_common.cf.sub" }; bundlesequence => { default($(this.promise_filename)) }; } diff --git a/tests/acceptance/25_cf-execd/mail_include_and_exclude_filters.cf b/tests/acceptance/25_cf-execd/mail_include_and_exclude_filters.cf index 26ecb478d3..a944a0756f 100644 --- a/tests/acceptance/25_cf-execd/mail_include_and_exclude_filters.cf +++ b/tests/acceptance/25_cf-execd/mail_include_and_exclude_filters.cf @@ -4,7 +4,7 @@ body common control { - inputs => { "../default.cf.sub", "mailfilter_common.cf.sub" }; + inputs => { "../default.sub.cf", "mailfilter_common.cf.sub" }; bundlesequence => { default($(this.promise_filename)) }; } diff --git a/tests/acceptance/25_cf-execd/mail_include_filter.cf b/tests/acceptance/25_cf-execd/mail_include_filter.cf index b5532d33da..5d68ad05e3 100644 --- a/tests/acceptance/25_cf-execd/mail_include_filter.cf +++ b/tests/acceptance/25_cf-execd/mail_include_filter.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../default.cf.sub", "mailfilter_common.cf.sub" }; + inputs => { "../default.sub.cf", "mailfilter_common.cf.sub" }; bundlesequence => { default($(this.promise_filename)) }; } diff --git a/tests/acceptance/25_cf-execd/mail_no_filter.cf b/tests/acceptance/25_cf-execd/mail_no_filter.cf index c26b9bd775..370be75ece 100644 --- a/tests/acceptance/25_cf-execd/mail_no_filter.cf +++ b/tests/acceptance/25_cf-execd/mail_no_filter.cf @@ -2,7 +2,7 @@ body common control { - inputs => { "../default.cf.sub", "mailfilter_common.cf.sub" }; + inputs => { "../default.sub.cf", "mailfilter_common.cf.sub" }; bundlesequence => { default($(this.promise_filename)) }; } diff --git a/tests/acceptance/25_cf-execd/mailfilter_1st_run_everything_filtered.cf b/tests/acceptance/25_cf-execd/mailfilter_1st_run_everything_filtered.cf index 4dec4da34e..4ad8779f81 100644 --- a/tests/acceptance/25_cf-execd/mailfilter_1st_run_everything_filtered.cf +++ b/tests/acceptance/25_cf-execd/mailfilter_1st_run_everything_filtered.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../default.cf.sub", "mailfilter_common.cf.sub" }; + inputs => { "../default.sub.cf", "mailfilter_common.cf.sub" }; bundlesequence => { default($(this.promiser_filename)) }; } diff --git a/tests/acceptance/25_cf-execd/mailfilter_empty_old_log_everything_filtered.cf b/tests/acceptance/25_cf-execd/mailfilter_empty_old_log_everything_filtered.cf index bd01a2f260..3121d7bbac 100644 --- a/tests/acceptance/25_cf-execd/mailfilter_empty_old_log_everything_filtered.cf +++ b/tests/acceptance/25_cf-execd/mailfilter_empty_old_log_everything_filtered.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../default.cf.sub", "mailfilter_common.cf.sub" }; + inputs => { "../default.sub.cf", "mailfilter_common.cf.sub" }; bundlesequence => { default($(this.promiser_filename)) }; } diff --git a/tests/acceptance/25_cf-execd/slow/dies_in_time.cf b/tests/acceptance/25_cf-execd/slow/dies_in_time.cf index e95942b2f6..90faa20938 100644 --- a/tests/acceptance/25_cf-execd/slow/dies_in_time.cf +++ b/tests/acceptance/25_cf-execd/slow/dies_in_time.cf @@ -6,7 +6,7 @@ body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/25_cf-execd/slow/kill_myself.execd.srv b/tests/acceptance/25_cf-execd/slow/kill_myself.execd.srv index d1e73063df..0b8ae9c86c 100644 --- a/tests/acceptance/25_cf-execd/slow/kill_myself.execd.srv +++ b/tests/acceptance/25_cf-execd/slow/kill_myself.execd.srv @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/25_cf-execd/timed/mailfilter_repeated_runs.cf b/tests/acceptance/25_cf-execd/timed/mailfilter_repeated_runs.cf index 1bcd8181b2..bed447743d 100644 --- a/tests/acceptance/25_cf-execd/timed/mailfilter_repeated_runs.cf +++ b/tests/acceptance/25_cf-execd/timed/mailfilter_repeated_runs.cf @@ -3,7 +3,7 @@ body common control { - inputs => { "../../default.cf.sub", "../mailfilter_common.cf.sub" }; + inputs => { "../../default.sub.cf", "../mailfilter_common.cf.sub" }; bundlesequence => { default($(this.promiser_filename)) }; } diff --git a/tests/acceptance/26_cf-net/serial/cf-net_connect.cf b/tests/acceptance/26_cf-net/serial/cf-net_connect.cf index 033183ac17..a89f9ba698 100644 --- a/tests/acceptance/26_cf-net/serial/cf-net_connect.cf +++ b/tests/acceptance/26_cf-net/serial/cf-net_connect.cf @@ -9,7 +9,7 @@ body contain myshell body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/26_cf-net/serial/cf-net_get.cf b/tests/acceptance/26_cf-net/serial/cf-net_get.cf index 3d0d78ee18..5c161ef82d 100644 --- a/tests/acceptance/26_cf-net/serial/cf-net_get.cf +++ b/tests/acceptance/26_cf-net/serial/cf-net_get.cf @@ -9,7 +9,7 @@ body contain myshell body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/26_cf-net/serial/cf-net_help.cf b/tests/acceptance/26_cf-net/serial/cf-net_help.cf index ebfbe74a8e..5bb2ecb07b 100644 --- a/tests/acceptance/26_cf-net/serial/cf-net_help.cf +++ b/tests/acceptance/26_cf-net/serial/cf-net_help.cf @@ -9,7 +9,7 @@ body contain myshell body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/26_cf-net/serial/cf-net_stat.cf b/tests/acceptance/26_cf-net/serial/cf-net_stat.cf index 2fdb01740e..a9deded550 100644 --- a/tests/acceptance/26_cf-net/serial/cf-net_stat.cf +++ b/tests/acceptance/26_cf-net/serial/cf-net_stat.cf @@ -9,7 +9,7 @@ body contain myshell body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/26_cf-net/serial/cf-net_stat_deny.cf b/tests/acceptance/26_cf-net/serial/cf-net_stat_deny.cf index ecea92f941..13b597724d 100644 --- a/tests/acceptance/26_cf-net/serial/cf-net_stat_deny.cf +++ b/tests/acceptance/26_cf-net/serial/cf-net_stat_deny.cf @@ -9,7 +9,7 @@ body contain myshell body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/26_cf-net/serial/cf-net_stat_dir.cf b/tests/acceptance/26_cf-net/serial/cf-net_stat_dir.cf index 685beb317c..900c5a764d 100644 --- a/tests/acceptance/26_cf-net/serial/cf-net_stat_dir.cf +++ b/tests/acceptance/26_cf-net/serial/cf-net_stat_dir.cf @@ -9,7 +9,7 @@ body contain myshell body common control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", "../../run_with_server.cf.sub" }; bundlesequence => { default("$(this.promise_filename)") }; diff --git a/tests/acceptance/26_cf-net/serial/serverd_admit_localhost_15000.cf.srv b/tests/acceptance/26_cf-net/serial/serverd_admit_localhost_15000.cf.srv index 188ad12d73..68e285c8fb 100644 --- a/tests/acceptance/26_cf-net/serial/serverd_admit_localhost_15000.cf.srv +++ b/tests/acceptance/26_cf-net/serial/serverd_admit_localhost_15000.cf.srv @@ -1,7 +1,7 @@ body common control { bundlesequence => { "access_rules" }; - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; } diff --git a/tests/acceptance/27_cf-secret/decrypt.cf b/tests/acceptance/27_cf-secret/decrypt.cf index 0baf3c522c..f50359f89a 100644 --- a/tests/acceptance/27_cf-secret/decrypt.cf +++ b/tests/acceptance/27_cf-secret/decrypt.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/27_cf-secret/encrypt-decrypt-args.cf b/tests/acceptance/27_cf-secret/encrypt-decrypt-args.cf index 7d4c34349b..3700ba6c1f 100644 --- a/tests/acceptance/27_cf-secret/encrypt-decrypt-args.cf +++ b/tests/acceptance/27_cf-secret/encrypt-decrypt-args.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/27_cf-secret/encrypt-decrypt.cf b/tests/acceptance/27_cf-secret/encrypt-decrypt.cf index 57a77623f5..ddb9425356 100644 --- a/tests/acceptance/27_cf-secret/encrypt-decrypt.cf +++ b/tests/acceptance/27_cf-secret/encrypt-decrypt.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/27_cf-secret/encrypt-no-key.cf b/tests/acceptance/27_cf-secret/encrypt-no-key.cf index ce84d42363..361fdfc49f 100644 --- a/tests/acceptance/27_cf-secret/encrypt-no-key.cf +++ b/tests/acceptance/27_cf-secret/encrypt-no-key.cf @@ -7,7 +7,7 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/27_cf-secret/encrypt.x.cf b/tests/acceptance/27_cf-secret/encrypt.x.cf index dca6dfe767..80d289bf76 100644 --- a/tests/acceptance/27_cf-secret/encrypt.x.cf +++ b/tests/acceptance/27_cf-secret/encrypt.x.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/28_inform_testing/common.cf.sub b/tests/acceptance/28_inform_testing/common.cf.sub index 2d031bf945..93f1bfe81e 100644 --- a/tests/acceptance/28_inform_testing/common.cf.sub +++ b/tests/acceptance/28_inform_testing/common.cf.sub @@ -1,7 +1,7 @@ bundle common inform_tests { vars: - "inputs" slist => { "$(this.promise_dirname)/../default.cf.sub" }; + "inputs" slist => { "$(this.promise_dirname)/../default.sub.cf" }; } body common control diff --git a/tests/acceptance/28_inform_testing/common_soft_fail.cf.sub b/tests/acceptance/28_inform_testing/common_soft_fail.cf.sub index 8074a446ca..1b637dd5ec 100644 --- a/tests/acceptance/28_inform_testing/common_soft_fail.cf.sub +++ b/tests/acceptance/28_inform_testing/common_soft_fail.cf.sub @@ -1,7 +1,7 @@ bundle common inform_tests { vars: - "inputs" slist => { "$(this.promise_dirname)/../default.cf.sub" }; + "inputs" slist => { "$(this.promise_dirname)/../default.sub.cf" }; } body common control diff --git a/tests/acceptance/29_simulate_mode/diff_mode.cf b/tests/acceptance/29_simulate_mode/diff_mode.cf index 1d031b2e80..971c6da897 100644 --- a/tests/acceptance/29_simulate_mode/diff_mode.cf +++ b/tests/acceptance/29_simulate_mode/diff_mode.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../default.cf.sub", + "../default.sub.cf", "./prepare_files_for_simulate_tests.cf.sub", "./normalize_agent_output.cf.sub" }; diff --git a/tests/acceptance/29_simulate_mode/manifest_full_mode.cf b/tests/acceptance/29_simulate_mode/manifest_full_mode.cf index c4906d5406..db7a6a1f22 100644 --- a/tests/acceptance/29_simulate_mode/manifest_full_mode.cf +++ b/tests/acceptance/29_simulate_mode/manifest_full_mode.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../default.cf.sub", + "../default.sub.cf", "./prepare_files_for_simulate_tests.cf.sub", "./normalize_agent_output.cf.sub" }; diff --git a/tests/acceptance/29_simulate_mode/manifest_mode.cf b/tests/acceptance/29_simulate_mode/manifest_mode.cf index dda53e7f42..711c356d23 100644 --- a/tests/acceptance/29_simulate_mode/manifest_mode.cf +++ b/tests/acceptance/29_simulate_mode/manifest_mode.cf @@ -1,7 +1,7 @@ body common control { inputs => { - "../default.cf.sub", + "../default.sub.cf", "./prepare_files_for_simulate_tests.cf.sub", "./normalize_agent_output.cf.sub" }; diff --git a/tests/acceptance/29_simulate_mode/promises.cf.sub b/tests/acceptance/29_simulate_mode/promises.cf.sub index 7c3e202912..2d122c9009 100644 --- a/tests/acceptance/29_simulate_mode/promises.cf.sub +++ b/tests/acceptance/29_simulate_mode/promises.cf.sub @@ -1,7 +1,7 @@ bundle common simulation_files_promises { vars: - "inputs" slist => { "$(this.promise_dirname)/../default.cf.sub" }; + "inputs" slist => { "$(this.promise_dirname)/../default.sub.cf" }; } body common control diff --git a/tests/acceptance/29_simulate_mode/simulate_safe_functions.cf b/tests/acceptance/29_simulate_mode/simulate_safe_functions.cf index ecdeb3e323..0de654013e 100644 --- a/tests/acceptance/29_simulate_mode/simulate_safe_functions.cf +++ b/tests/acceptance/29_simulate_mode/simulate_safe_functions.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } diff --git a/tests/acceptance/30_custom_promise_types/01_basic_module.cf b/tests/acceptance/30_custom_promise_types/01_basic_module.cf index 812c362b7f..6eb89eb392 100644 --- a/tests/acceptance/30_custom_promise_types/01_basic_module.cf +++ b/tests/acceptance/30_custom_promise_types/01_basic_module.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/30_custom_promise_types/02_if.cf b/tests/acceptance/30_custom_promise_types/02_if.cf index 6c3ae9c0e9..39ca005a66 100644 --- a/tests/acceptance/30_custom_promise_types/02_if.cf +++ b/tests/acceptance/30_custom_promise_types/02_if.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/30_custom_promise_types/05_meta_attr.cf b/tests/acceptance/30_custom_promise_types/05_meta_attr.cf index 7e38995dce..35f09e5618 100644 --- a/tests/acceptance/30_custom_promise_types/05_meta_attr.cf +++ b/tests/acceptance/30_custom_promise_types/05_meta_attr.cf @@ -7,7 +7,7 @@ ##################################################### body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/30_custom_promise_types/11_unless.cf b/tests/acceptance/30_custom_promise_types/11_unless.cf index 8ca6cdf629..a1c56638bc 100644 --- a/tests/acceptance/30_custom_promise_types/11_unless.cf +++ b/tests/acceptance/30_custom_promise_types/11_unless.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/30_custom_promise_types/12_multiple_promises.cf b/tests/acceptance/30_custom_promise_types/12_multiple_promises.cf index 17fea8d49b..bcb3f5a6c1 100644 --- a/tests/acceptance/30_custom_promise_types/12_multiple_promises.cf +++ b/tests/acceptance/30_custom_promise_types/12_multiple_promises.cf @@ -6,7 +6,7 @@ ##################################################### body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/30_custom_promise_types/13_binary_path.cf b/tests/acceptance/30_custom_promise_types/13_binary_path.cf index bf85e2bb73..f6cd98acb4 100644 --- a/tests/acceptance/30_custom_promise_types/13_binary_path.cf +++ b/tests/acceptance/30_custom_promise_types/13_binary_path.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/30_custom_promise_types/14_multiple_promise_types_same_module.cf b/tests/acceptance/30_custom_promise_types/14_multiple_promise_types_same_module.cf index bc8e134598..352660a244 100644 --- a/tests/acceptance/30_custom_promise_types/14_multiple_promise_types_same_module.cf +++ b/tests/acceptance/30_custom_promise_types/14_multiple_promise_types_same_module.cf @@ -6,7 +6,7 @@ ##################################################### body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/30_custom_promise_types/15_conflicting_interpreters.cf b/tests/acceptance/30_custom_promise_types/15_conflicting_interpreters.cf index 410a7d76c0..eb108acda6 100644 --- a/tests/acceptance/30_custom_promise_types/15_conflicting_interpreters.cf +++ b/tests/acceptance/30_custom_promise_types/15_conflicting_interpreters.cf @@ -7,7 +7,7 @@ ##################################################### body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/30_custom_promise_types/17_early_module_failure.cf b/tests/acceptance/30_custom_promise_types/17_early_module_failure.cf index cfa6bc4a76..2210b316dc 100644 --- a/tests/acceptance/30_custom_promise_types/17_early_module_failure.cf +++ b/tests/acceptance/30_custom_promise_types/17_early_module_failure.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/30_custom_promise_types/17_early_module_failure.cf.sub b/tests/acceptance/30_custom_promise_types/17_early_module_failure.cf.sub index 4cdc5595ad..9c69a77e5c 100644 --- a/tests/acceptance/30_custom_promise_types/17_early_module_failure.cf.sub +++ b/tests/acceptance/30_custom_promise_types/17_early_module_failure.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/30_custom_promise_types/18_early_module_failure_classes.cf b/tests/acceptance/30_custom_promise_types/18_early_module_failure_classes.cf index 1b3b8ed7b3..86e6c67995 100644 --- a/tests/acceptance/30_custom_promise_types/18_early_module_failure_classes.cf +++ b/tests/acceptance/30_custom_promise_types/18_early_module_failure_classes.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/30_custom_promise_types/22_what_module_gets.cf b/tests/acceptance/30_custom_promise_types/22_what_module_gets.cf index 8ad75fd22f..63181be6af 100644 --- a/tests/acceptance/30_custom_promise_types/22_what_module_gets.cf +++ b/tests/acceptance/30_custom_promise_types/22_what_module_gets.cf @@ -5,7 +5,7 @@ ##################################################### body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -56,4 +56,3 @@ bundle agent check "$(this.promise_filename).expected", "$(this.promise_filename)"); } - diff --git a/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_supported.cf b/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_supported.cf index dbcdbd4f5c..7b009e09ec 100644 --- a/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_supported.cf +++ b/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_supported.cf @@ -6,7 +6,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_supported.cf.sub b/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_supported.cf.sub index dcf66d92fe..0ffcd588bc 100644 --- a/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_supported.cf.sub +++ b/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_supported.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -41,4 +41,3 @@ body action policy(pol) { action_policy => "${pol}"; } - diff --git a/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_unsupported.cf b/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_unsupported.cf index 01cb2f2431..77e213b673 100644 --- a/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_unsupported.cf +++ b/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_unsupported.cf @@ -6,7 +6,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_unsupported.cf.sub b/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_unsupported.cf.sub index 43ca335d53..43b66db837 100644 --- a/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_unsupported.cf.sub +++ b/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_unsupported.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -41,4 +41,3 @@ body action policy(pol) { action_policy => "${pol}"; } - diff --git a/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_fake_supported.cf b/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_fake_supported.cf index 7a0ba4207f..81ed9896aa 100644 --- a/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_fake_supported.cf +++ b/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_fake_supported.cf @@ -6,7 +6,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_fake_supported.cf.sub b/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_fake_supported.cf.sub index f845833d9b..e13d82582e 100644 --- a/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_fake_supported.cf.sub +++ b/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_fake_supported.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -41,4 +41,3 @@ body action policy(pol) { action_policy => "${pol}"; } - diff --git a/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_supported.cf b/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_supported.cf index 9472c4d3a3..37e68f5518 100644 --- a/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_supported.cf +++ b/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_supported.cf @@ -6,7 +6,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_supported.cf.sub b/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_supported.cf.sub index dcf66d92fe..0ffcd588bc 100644 --- a/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_supported.cf.sub +++ b/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_supported.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -41,4 +41,3 @@ body action policy(pol) { action_policy => "${pol}"; } - diff --git a/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_unsupported.cf b/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_unsupported.cf index 52b33ccc1d..27df2493b3 100644 --- a/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_unsupported.cf +++ b/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_unsupported.cf @@ -6,7 +6,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_unsupported.cf.sub b/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_unsupported.cf.sub index 43ca335d53..43b66db837 100644 --- a/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_unsupported.cf.sub +++ b/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_unsupported.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -41,4 +41,3 @@ body action policy(pol) { action_policy => "${pol}"; } - diff --git a/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_supported.cf b/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_supported.cf index b8dd3d28ba..2094f3759a 100644 --- a/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_supported.cf +++ b/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_supported.cf @@ -6,7 +6,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_supported.cf.sub b/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_supported.cf.sub index dcf66d92fe..0ffcd588bc 100644 --- a/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_supported.cf.sub +++ b/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_supported.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -41,4 +41,3 @@ body action policy(pol) { action_policy => "${pol}"; } - diff --git a/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_unsupported.cf b/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_unsupported.cf index 1232467af5..3b6408b13f 100644 --- a/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_unsupported.cf +++ b/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_unsupported.cf @@ -6,7 +6,7 @@ ##################################################### body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_unsupported.cf.sub b/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_unsupported.cf.sub index 43ca335d53..43b66db837 100644 --- a/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_unsupported.cf.sub +++ b/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_unsupported.cf.sub @@ -1,6 +1,6 @@ body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } @@ -41,4 +41,3 @@ body action policy(pol) { action_policy => "${pol}"; } - diff --git a/tests/acceptance/31_tickets/CFE-2367/1/test.cf b/tests/acceptance/31_tickets/CFE-2367/1/test.cf index 8edf53bf64..f6f6d17441 100644 --- a/tests/acceptance/31_tickets/CFE-2367/1/test.cf +++ b/tests/acceptance/31_tickets/CFE-2367/1/test.cf @@ -1,7 +1,7 @@ body file control { inputs => { - "../../../default.cf.sub", + "../../../default.sub.cf", }; } bundle agent __main__ diff --git a/tests/acceptance/31_tickets/CFE-2367/2/test.cf b/tests/acceptance/31_tickets/CFE-2367/2/test.cf index 928450022c..03ff5e5752 100644 --- a/tests/acceptance/31_tickets/CFE-2367/2/test.cf +++ b/tests/acceptance/31_tickets/CFE-2367/2/test.cf @@ -1,7 +1,7 @@ body file control { inputs => { - "../../../default.cf.sub", + "../../../default.sub.cf", }; } bundle agent __main__ diff --git a/tests/acceptance/31_tickets/CFE-3866/test.cf b/tests/acceptance/31_tickets/CFE-3866/test.cf index 513a941f44..643ae0e0d3 100644 --- a/tests/acceptance/31_tickets/CFE-3866/test.cf +++ b/tests/acceptance/31_tickets/CFE-3866/test.cf @@ -1,7 +1,7 @@ body file control { inputs => { - "../../default.cf.sub", + "../../default.sub.cf", }; } diff --git a/tests/acceptance/31_tickets/CFE-3987/1/test.cf b/tests/acceptance/31_tickets/CFE-3987/1/test.cf index d6411fe156..e8e56725cc 100644 --- a/tests/acceptance/31_tickets/CFE-3987/1/test.cf +++ b/tests/acceptance/31_tickets/CFE-3987/1/test.cf @@ -1,7 +1,7 @@ body file control { inputs => { - "../../../default.cf.sub", + "../../../default.sub.cf", }; } bundle agent __main__ diff --git a/tests/acceptance/31_tickets/CFE-3987/2/test.cf b/tests/acceptance/31_tickets/CFE-3987/2/test.cf index 87b9ea0721..13b24ed54b 100644 --- a/tests/acceptance/31_tickets/CFE-3987/2/test.cf +++ b/tests/acceptance/31_tickets/CFE-3987/2/test.cf @@ -1,7 +1,7 @@ body file control { inputs => { - "../../../default.cf.sub", + "../../../default.sub.cf", }; } bundle agent __main__ diff --git a/tests/acceptance/31_tickets/CFE-3988/1/test.cf b/tests/acceptance/31_tickets/CFE-3988/1/test.cf index f67749e6ed..1999dd20d4 100644 --- a/tests/acceptance/31_tickets/CFE-3988/1/test.cf +++ b/tests/acceptance/31_tickets/CFE-3988/1/test.cf @@ -1,7 +1,7 @@ body file control { inputs => { - "../../../default.cf.sub", + "../../../default.sub.cf", }; } bundle agent __main__ diff --git a/tests/acceptance/31_tickets/ENT-8788/1/main.cf b/tests/acceptance/31_tickets/ENT-8788/1/main.cf index d02bf2652b..8e32746879 100644 --- a/tests/acceptance/31_tickets/ENT-8788/1/main.cf +++ b/tests/acceptance/31_tickets/ENT-8788/1/main.cf @@ -1,7 +1,7 @@ body file control { inputs => { - "../../../default.cf.sub", + "../../../default.sub.cf", }; } bundle agent __main__ @@ -72,4 +72,3 @@ body edit_defaults size(bigenough) { max_file_size => "$(bigenough)"; } - diff --git a/tests/acceptance/31_tickets/ENT-8788/2/main.cf b/tests/acceptance/31_tickets/ENT-8788/2/main.cf index 0dd281f65b..e7af7a38ce 100644 --- a/tests/acceptance/31_tickets/ENT-8788/2/main.cf +++ b/tests/acceptance/31_tickets/ENT-8788/2/main.cf @@ -1,7 +1,7 @@ body file control { inputs => { - "../../../default.cf.sub", + "../../../default.sub.cf", }; } bundle agent __main__ @@ -72,4 +72,3 @@ body edit_defaults size(bigenough) { max_file_size => "$(bigenough)"; } - diff --git a/tests/acceptance/31_tickets/ENT-8818/1/staging/main.cf b/tests/acceptance/31_tickets/ENT-8818/1/staging/main.cf index bcf6bc4968..0705e06ebc 100644 --- a/tests/acceptance/31_tickets/ENT-8818/1/staging/main.cf +++ b/tests/acceptance/31_tickets/ENT-8818/1/staging/main.cf @@ -2,7 +2,7 @@ body file control { inputs => { - "../../../default.cf.sub", + "../../../default.sub.cf", }; } bundle agent __main__ diff --git a/tests/acceptance/DCS.org b/tests/acceptance/DCS.org index 9d9f92d246..0ba60cd7e5 100644 --- a/tests/acceptance/DCS.org +++ b/tests/acceptance/DCS.org @@ -1,20 +1,20 @@ #+Title: Policy Test Framework -The policy testing framework loaded by [[file:default.cf.sub][=default.cf.sub=]]. For full support of the +The policy testing framework loaded by [[file:default.sub.cf][=default.sub.cf=]]. For full support of the test framework this policy file should be included in each test and the =bundlesequence= should be set to =default("$(this.promise_filename)")=. -NOTE: Be sure the relative path to =default.cf.sub= +NOTE: Be sure the relative path to =default.sub.cf= #+Caption: Common control template to be included in each test #+BEGIN_SRC cfengine3 body common control { - inputs => { "../../default.cf.sub" }; + inputs => { "../../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; } #+END_SRC -[[file:dcs.cf.sub][=dcs.cf.sub=]] contains the majority of the policy testing framework. The +[[file:dcs.sub.cf][=dcs.sub.cf=]] contains the majority of the policy testing framework. The following bundles are useful for common test patterns. In all cases =test= should be passed =$(this.promise_filename)=. @@ -65,4 +65,3 @@ should be passed =$(this.promise_filename)=. - bundle agent =xml_check_diff(file1, file2, test, expected_difference)= :: Pass/FAIL based on =expected_difference= (=yes=/=no=) between xml =file1= and xml =file2=. - diff --git a/tests/acceptance/Makefile.am b/tests/acceptance/Makefile.am index 10af0835e9..6330372050 100644 --- a/tests/acceptance/Makefile.am +++ b/tests/acceptance/Makefile.am @@ -94,7 +94,7 @@ check-local: + $(TESTS_ENVIRONMENT) MAKE=$(MAKE) $(srcdir)/testall -EXTRA_DIST = default.cf.sub dcs.cf.sub plucked.sub.cf run_with_server.cf.sub \ +EXTRA_DIST = default.sub.cf dcs.sub.cf plucked.sub.cf run_with_server.cf.sub \ testall dummy_etc write_args.sh \ root-MD5=617eb383deffef843ea856b129d0a423.pub \ root-MD5=617eb383deffef843ea856b129d0a423.priv diff --git a/tests/acceptance/README b/tests/acceptance/README index 1e61ad598c..2435b57b22 100644 --- a/tests/acceptance/README +++ b/tests/acceptance/README @@ -84,7 +84,7 @@ or directories to 'testall': Creating/editing test cases ------------------------------------------------------------------------------ -Each test should be 100% standalone. If you include "default.cf.sub" in +Each test should be 100% standalone. If you include "default.sub.cf" in inputs, then the bundlesequence is automatically defined, and your file must contain at least 1 of the main bundles: @@ -94,9 +94,9 @@ must contain at least 1 of the main bundles: * destroy - anything you want to do at the end like killing processes etc However if the test is really simple you might want to skip including -"default.cf.sub" in inputs. Then you should define your own +"default.sub.cf" in inputs. Then you should define your own bundlesequence, e.g. {"test","check"}. It's recommended to avoid -including "default.cf.sub" when not needed, since the test will run much +including "default.sub.cf" when not needed, since the test will run much faster. Look in default.cf for some standard check bundles (for example, to compare @@ -161,7 +161,7 @@ Output "$(this.promise_filename) Pass" for passing If you want to use tools like grep, diff, touch, etc, please use the $(G.grep) format so that the correct path to the tool is chosen by -the test template. If a tool is missing you can add it to dcs.cf.sub. +the test template. If a tool is missing you can add it to dcs.sub.cf. ------------------------------------------------------------------------------ Waiting in tests @@ -315,10 +315,10 @@ Example Test Skeleton ------------------------------------------------------------------------------ body file control { - # Feel free to avoid including "default.cf.sub" and define your + # Feel free to avoid including "default.sub.cf" and define your # own bundlesequence for simple tests - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; } ####################################################### diff --git a/tests/acceptance/dcs.cf.sub b/tests/acceptance/dcs.sub.cf similarity index 100% rename from tests/acceptance/dcs.cf.sub rename to tests/acceptance/dcs.sub.cf diff --git a/tests/acceptance/default.cf.sub b/tests/acceptance/default.sub.cf similarity index 90% rename from tests/acceptance/default.cf.sub rename to tests/acceptance/default.sub.cf index c463046f9c..40f15cc14d 100644 --- a/tests/acceptance/default.cf.sub +++ b/tests/acceptance/default.sub.cf @@ -17,7 +17,7 @@ bundle common D !testing_masterfiles_policy_framework:: "inputs" slist => { - "$(D.owndir)$(const.dirsep)dcs.cf.sub", + "$(D.owndir)$(const.dirsep)dcs.sub.cf", "$(D.owndir)$(const.dirsep)plucked.sub.cf", }; @@ -26,7 +26,7 @@ bundle common D testing_masterfiles_policy_framework:: "inputs" slist => { - "$(D.owndir)$(const.dirsep)dcs.cf.sub", + "$(D.owndir)$(const.dirsep)dcs.sub.cf", "$(D.owndir)$(const.dirsep)..$(const.dirsep)..$(const.dirsep)lib$(const.dirsep)stdlib.cf" }; diff --git a/tests/acceptance/selftest/flakey_meta_fail.cf b/tests/acceptance/selftest/flakey_meta_fail.cf index b9c813387d..9f1d6a4b56 100644 --- a/tests/acceptance/selftest/flakey_meta_fail.cf +++ b/tests/acceptance/selftest/flakey_meta_fail.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/selftest/flakey_meta_no_ticket.cf b/tests/acceptance/selftest/flakey_meta_no_ticket.cf index 20d6598e3e..084c77419b 100644 --- a/tests/acceptance/selftest/flakey_meta_no_ticket.cf +++ b/tests/acceptance/selftest/flakey_meta_no_ticket.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/selftest/skipped.cf b/tests/acceptance/selftest/skipped.cf index 3f33de1a24..a90caa0848 100644 --- a/tests/acceptance/selftest/skipped.cf +++ b/tests/acceptance/selftest/skipped.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/selftest/soft_no_ticket.cf b/tests/acceptance/selftest/soft_no_ticket.cf index 3cad6df23f..6e5ce0f3ea 100644 --- a/tests/acceptance/selftest/soft_no_ticket.cf +++ b/tests/acceptance/selftest/soft_no_ticket.cf @@ -1,6 +1,6 @@ body common control { - inputs => { "../default.cf.sub" }; + inputs => { "../default.sub.cf" }; bundlesequence => { default("$(this.promise_filename)") }; version => "1.0"; } diff --git a/tests/acceptance/testall b/tests/acceptance/testall index adc73a6c9d..69099d2a6b 100755 --- a/tests/acceptance/testall +++ b/tests/acceptance/testall @@ -567,9 +567,9 @@ export CFENGINE_TEST_OVERRIDE_WORKDIR TEMP CFENGINE_TEST_OVERRIDE_EXTENSION_LIBR # test should not be allowed to output any other outcome in the same run, # except for FAIL. - # Some states are output by dcs.cf.sub, therefore check for both TEST - # prefix and dcs.cf.sub prefix. - ESCAPED_TEST="$(echo "($TEST|dcs.cf.sub)" | sed -e 's/\./\\./g')" + # Some states are output by dcs.sub.cf, therefore check for both TEST + # prefix and dcs.sub.cf prefix. + ESCAPED_TEST="$(echo "($TEST|dcs.sub.cf)" | sed -e 's/\./\\./g')" if egrep "R: .*$ESCAPED_TEST [XS]FAIL" $OUTFILE > /dev/null && ! egrep "R: .*$ESCAPED_TEST Wait/" $OUTFILE > /dev/null then # Check for passed outcome, which should not happen. From b488176432bdfeffa54037a98a1f190be50a931e Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Fri, 1 May 2026 01:04:09 +0200 Subject: [PATCH 08/22] Added missing semicolon Created a follow-up: https://northerntech.atlassian.net/browse/ENT-14034 Signed-off-by: Ole Herman Schumacher Elgesem (cherry picked from commit 71c998a657b10ff9dc45702ac9c4e7ab18a51364) --- .../02_maintain/staging/line_truncation_at_4096_chars.cf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/10_files/02_maintain/staging/line_truncation_at_4096_chars.cf b/tests/acceptance/10_files/02_maintain/staging/line_truncation_at_4096_chars.cf index 70ee3742ed..ffeaf564e5 100644 --- a/tests/acceptance/10_files/02_maintain/staging/line_truncation_at_4096_chars.cf +++ b/tests/acceptance/10_files/02_maintain/staging/line_truncation_at_4096_chars.cf @@ -79,7 +79,7 @@ bundle agent check reports: DEBUG.!ok:: - "${this.promise_filename} FAILed as the generated file got at least a line truncated to 4096 characters" + "${this.promise_filename} FAILed as the generated file got at least a line truncated to 4096 characters"; ok:: "${this.promise_filename} Pass"; !ok:: From 307bf421fdd583ac34d8ffe72720327493f464d0 Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Fri, 1 May 2026 01:32:02 +0200 Subject: [PATCH 09/22] Renamed one invalid JSON to .x.json Signed-off-by: Ole Herman Schumacher Elgesem (cherry picked from commit 0bc51e199b4256c267feafe0b7f475a8b46bd226) --- tests/acceptance/00_basics/def.json/bad-json.cf | 2 +- .../00_basics/def.json/{bad-json.cf.json => bad-json.cf.x.json} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename tests/acceptance/00_basics/def.json/{bad-json.cf.json => bad-json.cf.x.json} (100%) diff --git a/tests/acceptance/00_basics/def.json/bad-json.cf b/tests/acceptance/00_basics/def.json/bad-json.cf index e6ea9261b6..76a89e1356 100644 --- a/tests/acceptance/00_basics/def.json/bad-json.cf +++ b/tests/acceptance/00_basics/def.json/bad-json.cf @@ -15,7 +15,7 @@ bundle agent test meta => { "ENT-10257" }; methods: - "" usebundle => file_copy("$(this.promise_filename).json", "$(sys.inputdir)$(const.dirsep)def.json"); + "" usebundle => file_copy("$(this.promise_filename).x.json", "$(sys.inputdir)$(const.dirsep)def.json"); } ####################################################### diff --git a/tests/acceptance/00_basics/def.json/bad-json.cf.json b/tests/acceptance/00_basics/def.json/bad-json.cf.x.json similarity index 100% rename from tests/acceptance/00_basics/def.json/bad-json.cf.json rename to tests/acceptance/00_basics/def.json/bad-json.cf.x.json From e9875512234575c77b5b95fcd6fc63f895cfc967 Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Mon, 4 May 2026 22:40:40 +0200 Subject: [PATCH 10/22] Added test for invalid syntax in macros Signed-off-by: Ole Herman Schumacher Elgesem (cherry picked from commit 60b6978f7aba0460e2c0b9be8e3a61f0807cd245) --- .../if_invalid_syntax_in_macro.sub.x.cf | 28 ++++++++++++++ .../if_invalid_syntax_in_macro_parent.cf | 37 +++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 tests/acceptance/00_basics/macros/if_invalid_syntax_in_macro.sub.x.cf create mode 100644 tests/acceptance/00_basics/macros/if_invalid_syntax_in_macro_parent.cf diff --git a/tests/acceptance/00_basics/macros/if_invalid_syntax_in_macro.sub.x.cf b/tests/acceptance/00_basics/macros/if_invalid_syntax_in_macro.sub.x.cf new file mode 100644 index 0000000000..37b91f3f5f --- /dev/null +++ b/tests/acceptance/00_basics/macros/if_invalid_syntax_in_macro.sub.x.cf @@ -0,0 +1,28 @@ +@if feature(ABCD) + This text should never be seen, it's completely ignored +@endif +@if feature(ABCD) + Nor this + Not this either +@endif +@if feature(ABCD) + Nothing should be seen here really + Who knows, perhaps this text doesn't exist..? +@endif + +@if minimum_version(300.600) + This text should never be seen, it's completely ignored +@endif + +@if minimum_version(300.600) + Some new function here... +@should_pass + bundle agent netgroup(@netgroup_list) + more text... +@endif + +bundle agent __main__ +{ + reports: + "$(this.promise_filename) Pass"; +} diff --git a/tests/acceptance/00_basics/macros/if_invalid_syntax_in_macro_parent.cf b/tests/acceptance/00_basics/macros/if_invalid_syntax_in_macro_parent.cf new file mode 100644 index 0000000000..d8d38d72c0 --- /dev/null +++ b/tests/acceptance/00_basics/macros/if_invalid_syntax_in_macro_parent.cf @@ -0,0 +1,37 @@ +###################################################### +# +# Test that macros correctly skip content +# even when it is invalid syntax +# +##################################################### +body common control +{ + inputs => { "../../default.sub.cf" }; + bundlesequence => { default("$(this.promise_filename)") }; +} + +bundle agent init +{ +} + +bundle agent check +{ + methods: + # 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( + ".*$(this.promise_dirname)$(const.dirsep)if_invalid_syntax_in_macro.sub.x.cf Pass.*", + "\\\\", + "\\\\\\\\", + "g" + ), + ".*FAIL.*", + "$(sys.cf_agent) -D AUTO -Kf -f $(this.promise_dirname)$(const.dirsep)if_invalid_syntax_in_macro.sub.x.cf", + $(this.promise_filename) + ); +} From db1ec60a2febcd466d914fac25aef10564befc87 Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Mon, 4 May 2026 23:21:09 +0200 Subject: [PATCH 11/22] testall: Skipped .sub.x.cf files Signed-off-by: Ole Herman Schumacher Elgesem (cherry picked from commit d93f71ff279d60bf98a2328d9be91efe9790b3d1) --- tests/acceptance/testall | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/acceptance/testall b/tests/acceptance/testall index 69099d2a6b..0959688b33 100755 --- a/tests/acceptance/testall +++ b/tests/acceptance/testall @@ -316,6 +316,11 @@ runtest() { printf "$TEST " fi + case "$TEST" in + *.sub.cf) echo "Not a test - file for subagent execution" && exit 1 ;; + *.sub.x.cf) echo "Not a test - file for subagent execution" && exit 1 ;; + esac + case "$TEST" in *.x.cf) TEST_TYPE=errorexit && EXTRATEXT='(should exit with non-zero, but not crash)' ;; @@ -1059,13 +1064,13 @@ then ALL_TESTS="$ALL_TESTS${ALL_TESTS:+ }$test" elif [ -d $test ] then - ALL_TESTS="$ALL_TESTS${ALL_TESTS:+ }$(find "$test" -name workdir -prune -o -name '*.cf' -print | sort)" + ALL_TESTS="$ALL_TESTS${ALL_TESTS:+ }$(find "$test" -name workdir -prune -o -name '*.cf' -and -not -name '*.sub.cf' -and -not -name '*.sub.x.cf' -print | sort)" else echo "Unable to open test file/directory: $test" fi done else - ALL_TESTS="$ALL_TESTS${ALL_TESTS:+ }$(find . \( -name selftest -o -name workdir \) -prune -o -name '*.cf' -print | sort)" + ALL_TESTS="$ALL_TESTS${ALL_TESTS:+ }$(find . \( -name selftest -o -name workdir \) -prune -o -name '*.cf' -and -not -name '*.sub.cf' -and -not -name '*.sub.x.cf' -print | sort)" fi for addtest in $ALL_TESTS From 205742d4e48c0ac19111ef34506b874f822fcd26 Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Mon, 4 May 2026 23:27:44 +0200 Subject: [PATCH 12/22] Renamed failsafe test sub policy file Signed-off-by: Ole Herman Schumacher Elgesem (cherry picked from commit 0c3420a924a6e4b01bbf493002da55098dc05c02) --- tests/acceptance/23_failsafe/failsafe_created_on_parse_error.cf | 2 +- .../{invalid_syntax.cf.sub => invalid_syntax.sub.x.cf} | 0 tests/acceptance/23_failsafe/preexisting_failsafe_preserved.cf | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename tests/acceptance/23_failsafe/{invalid_syntax.cf.sub => invalid_syntax.sub.x.cf} (100%) diff --git a/tests/acceptance/23_failsafe/failsafe_created_on_parse_error.cf b/tests/acceptance/23_failsafe/failsafe_created_on_parse_error.cf index 84e4397d19..ed5793ab00 100644 --- a/tests/acceptance/23_failsafe/failsafe_created_on_parse_error.cf +++ b/tests/acceptance/23_failsafe/failsafe_created_on_parse_error.cf @@ -20,7 +20,7 @@ bundle agent init bundle agent test { commands: - "$(sys.cf_agent) -f $(this.promise_dirname)/invalid_syntax.cf.sub"; + "$(sys.cf_agent) -f $(this.promise_dirname)/invalid_syntax.sub.x.cf"; # TODO this sub-agent fails to run invalid_syntax.cf and writes # failsafe.cf, which then executes. The execute bit is diff --git a/tests/acceptance/23_failsafe/invalid_syntax.cf.sub b/tests/acceptance/23_failsafe/invalid_syntax.sub.x.cf similarity index 100% rename from tests/acceptance/23_failsafe/invalid_syntax.cf.sub rename to tests/acceptance/23_failsafe/invalid_syntax.sub.x.cf diff --git a/tests/acceptance/23_failsafe/preexisting_failsafe_preserved.cf b/tests/acceptance/23_failsafe/preexisting_failsafe_preserved.cf index d16184e657..d2b623f9c3 100644 --- a/tests/acceptance/23_failsafe/preexisting_failsafe_preserved.cf +++ b/tests/acceptance/23_failsafe/preexisting_failsafe_preserved.cf @@ -22,7 +22,7 @@ bundle agent init bundle agent test { commands: - "$(sys.cf_agent) -f $(this.promise_dirname)/invalid_syntax.cf.sub"; + "$(sys.cf_agent) -f $(this.promise_dirname)/invalid_syntax.sub.x.cf"; } bundle agent check From 0515b6f73dd64e9419902187739d60dd039eb9d0 Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Mon, 4 May 2026 23:27:53 +0200 Subject: [PATCH 13/22] Cleaned up macro tests Some of these are overlapping, have misleading comments, and are testing too much at the same time. We want to make them easier to read and understand, and put the parts specific to testing that you can put invalid / future syntax inside macros in its own test(s). Signed-off-by: Ole Herman Schumacher Elgesem (cherry picked from commit 96d35e78c64a2c62928c4b299e7ba62edd278eeb) --- tests/acceptance/00_basics/macros/if.cf | 67 ------------------- .../macros/if_eof_without_endif.x.cf | 5 +- .../macros/if_eof_without_endif2.x.cf | 5 +- .../acceptance/00_basics/macros/if_feature.cf | 26 ------- .../00_basics/macros/if_feature_nested.x.cf | 5 -- .../acceptance/00_basics/macros/if_ignore.cf | 30 --------- .../macros/if_ignore_with_addsign.cf | 30 --------- .../00_basics/macros/if_mismatched.x.cf | 5 -- .../00_basics/macros/if_multiple_endif.x.cf | 5 -- .../00_basics/macros/if_nested.x.cf | 5 -- .../acceptance/00_basics/macros/if_triple.cf | 5 -- 11 files changed, 6 insertions(+), 182 deletions(-) delete mode 100644 tests/acceptance/00_basics/macros/if_ignore.cf delete mode 100644 tests/acceptance/00_basics/macros/if_ignore_with_addsign.cf diff --git a/tests/acceptance/00_basics/macros/if.cf b/tests/acceptance/00_basics/macros/if.cf index 18e9041e62..8380a45f53 100644 --- a/tests/acceptance/00_basics/macros/if.cf +++ b/tests/acceptance/00_basics/macros/if.cf @@ -167,70 +167,3 @@ bundle agent check DEBUG.pass_not_expected:: "pass_not_expected"; } - -@if minimum_version(3.12) -@else -some invalid syntax here -body {} {}{}{{}} -@endif - -@if minimum_version(3) -@else -some invalid syntax here -body {} {}{}{{}} -@endif - -@if minimum_version(300.600) - -This text should never be seen, it's completely ignored -@endif - -@if minimum_version(300.600) - -Nor should this - -@endif - -@if minimum_version(300.600) - -Nor this - -Not this either - -@endif - -@if minimum_version(300.600) -Nothing should be seen here really - -Who knows, perhaps this text doesn't exist..? - -@endif - -@if maximum_version(3.6.0) -body files control { {} } -@endif - -@if between_versions(2.0, 3.0) -more invalid syntax -body body body body {{}};;:: -@endif - -@if between_versions(1, 3.6) -more invalid syntax -body body body body {{}};;:: -@endif - -@if at_version(2) -body invalid syntax -{{{reports:}}};;;::: -@endif - -@if before_version(3) -body invalid syntax -{{{reports:}}};;;::: -@endif - -@if after_version(3) -body invalid syntax -{{{reports:}}};;;::: -@endif diff --git a/tests/acceptance/00_basics/macros/if_eof_without_endif.x.cf b/tests/acceptance/00_basics/macros/if_eof_without_endif.x.cf index 8a0d250ef4..b3c7f048aa 100644 --- a/tests/acceptance/00_basics/macros/if_eof_without_endif.x.cf +++ b/tests/acceptance/00_basics/macros/if_eof_without_endif.x.cf @@ -1,6 +1,6 @@ ###################################################### # -# Test that @if works +# Test that @if without @endif errors (1) # ##################################################### @@ -21,4 +21,5 @@ bundle agent check @if minimum_version(300.100) -This text should never be seen, it's completely ignored +# Even when the if is false / ignored, we should still error when there +# is no endif before EOF diff --git a/tests/acceptance/00_basics/macros/if_eof_without_endif2.x.cf b/tests/acceptance/00_basics/macros/if_eof_without_endif2.x.cf index ec698e553b..0fa31c76fa 100644 --- a/tests/acceptance/00_basics/macros/if_eof_without_endif2.x.cf +++ b/tests/acceptance/00_basics/macros/if_eof_without_endif2.x.cf @@ -1,6 +1,6 @@ ###################################################### # -# Test that @if works +# Test that @if without @endif errors (2) # ##################################################### @@ -21,4 +21,5 @@ bundle agent check @if minimum_version(1.1) -# just testing for EOF +# Even when the if is true / included, we should still error when there +# is no endif before EOF diff --git a/tests/acceptance/00_basics/macros/if_feature.cf b/tests/acceptance/00_basics/macros/if_feature.cf index 954acb1388..4ad91f1d2c 100644 --- a/tests/acceptance/00_basics/macros/if_feature.cf +++ b/tests/acceptance/00_basics/macros/if_feature.cf @@ -45,29 +45,3 @@ bundle agent check "not_expected", $(this.promise_filename)); } - -@if feature(ABCD) - -This text should never be seen, it's completely ignored -@endif - -@if feature(ABCD) - -Nor should this - -@endif - -@if feature(ABCD) - -Nor this - -Not this either - -@endif - -@if feature(ABCD) -Nothing should be seen here really - -Who knows, perhaps this text doesn't exist..? - -@endif diff --git a/tests/acceptance/00_basics/macros/if_feature_nested.x.cf b/tests/acceptance/00_basics/macros/if_feature_nested.x.cf index 8d58d5d284..e340c32bb4 100644 --- a/tests/acceptance/00_basics/macros/if_feature_nested.x.cf +++ b/tests/acceptance/00_basics/macros/if_feature_nested.x.cf @@ -40,8 +40,3 @@ bundle agent check "not_expected", $(this.promise_filename)); } - -@if minimum_version(300.600) - -This text should never be seen, it's completely ignored -@endif diff --git a/tests/acceptance/00_basics/macros/if_ignore.cf b/tests/acceptance/00_basics/macros/if_ignore.cf deleted file mode 100644 index be4c8df67a..0000000000 --- a/tests/acceptance/00_basics/macros/if_ignore.cf +++ /dev/null @@ -1,30 +0,0 @@ -###################################################### -# -# Test that @if works for greater versions -# -##################################################### - -body common control -{ - inputs => { "../../default.sub.cf" }; - bundlesequence => { default("$(this.promise_filename)") }; - version => "1.0"; -} - -bundle common test -{ -@if minimum_version(300.600) - Some new function here... - - - more text... -@endif -} - -bundle agent check -{ - methods: - "" usebundle => dcs_passif_expected("cfengine", - "", - $(this.promise_filename)); -} diff --git a/tests/acceptance/00_basics/macros/if_ignore_with_addsign.cf b/tests/acceptance/00_basics/macros/if_ignore_with_addsign.cf deleted file mode 100644 index 24e96416fd..0000000000 --- a/tests/acceptance/00_basics/macros/if_ignore_with_addsign.cf +++ /dev/null @@ -1,30 +0,0 @@ -###################################################### -# -# Test that @if works for greater versions -# -##################################################### - -body common control -{ - inputs => { "../../default.sub.cf" }; - bundlesequence => { default("$(this.promise_filename)") }; - version => "1.0"; -} - -bundle common test -{ -@if minimum_version(300.600) - Some new function here... -@should_pass - bundle agent netgroup(@netgroup_list) - more text... -@endif -} - -bundle agent check -{ - methods: - "" usebundle => dcs_passif_expected("cfengine", - "", - $(this.promise_filename)); -} diff --git a/tests/acceptance/00_basics/macros/if_mismatched.x.cf b/tests/acceptance/00_basics/macros/if_mismatched.x.cf index efcc3e97b9..76f0fca999 100644 --- a/tests/acceptance/00_basics/macros/if_mismatched.x.cf +++ b/tests/acceptance/00_basics/macros/if_mismatched.x.cf @@ -43,8 +43,3 @@ bundle agent check "not_expected", $(this.promise_filename)); } - -@if minimum_version(300.600) - -This text should never be seen, it's completely ignored -@endif diff --git a/tests/acceptance/00_basics/macros/if_multiple_endif.x.cf b/tests/acceptance/00_basics/macros/if_multiple_endif.x.cf index a209618af0..2adce3737c 100644 --- a/tests/acceptance/00_basics/macros/if_multiple_endif.x.cf +++ b/tests/acceptance/00_basics/macros/if_multiple_endif.x.cf @@ -37,8 +37,3 @@ bundle agent check "not_expected", $(this.promise_filename)); } - -@if minimum_version(300.600) - -This text should never be seen, it's completely ignored -@endif diff --git a/tests/acceptance/00_basics/macros/if_nested.x.cf b/tests/acceptance/00_basics/macros/if_nested.x.cf index d978fd890d..1f9e681ba4 100644 --- a/tests/acceptance/00_basics/macros/if_nested.x.cf +++ b/tests/acceptance/00_basics/macros/if_nested.x.cf @@ -38,8 +38,3 @@ bundle agent check "not_expected", $(this.promise_filename)); } - -@if minimum_version(300.600) - -This text should never be seen, it's completely ignored -@endif diff --git a/tests/acceptance/00_basics/macros/if_triple.cf b/tests/acceptance/00_basics/macros/if_triple.cf index 0f6dcb2c88..a9ae8a5b48 100644 --- a/tests/acceptance/00_basics/macros/if_triple.cf +++ b/tests/acceptance/00_basics/macros/if_triple.cf @@ -38,8 +38,3 @@ bundle agent check "$(sys.cf_agent) -D AUTO -Kf $(G.testdir)$(const.dirsep)test.cf", $(this.promise_filename)); } - -@if minimum_version(300.600.0) - -This text should never be seen, it's completely ignored -@endif From dd4d51cb10fc8bd0ac4791bdd7e26e4c0cb47c94 Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Mon, 4 May 2026 23:31:55 +0200 Subject: [PATCH 14/22] cfengine format tests/acceptance/00_basics/macros/ Signed-off-by: Ole Herman Schumacher Elgesem (cherry picked from commit 8a255400f416f8b4746ee9aba936716ee08116e5) --- tests/acceptance/00_basics/macros/if.cf | 143 ++++++++---------- .../acceptance/00_basics/macros/if_feature.cf | 26 ++-- .../00_basics/macros/if_feature_pam.cf | 9 +- .../00_basics/macros/if_on_first_line.cf | 10 +- .../acceptance/00_basics/macros/if_triple.cf | 42 ++--- 5 files changed, 113 insertions(+), 117 deletions(-) diff --git a/tests/acceptance/00_basics/macros/if.cf b/tests/acceptance/00_basics/macros/if.cf index 8380a45f53..95f604452a 100644 --- a/tests/acceptance/00_basics/macros/if.cf +++ b/tests/acceptance/00_basics/macros/if.cf @@ -3,167 +3,156 @@ # Test that @if works # ##################################################### - body common control { - inputs => { "../../default.sub.cf" }; - bundlesequence => { default("$(this.promise_filename)") }; - version => "1.0"; + inputs => { "../../default.sub.cf" }; + bundlesequence => { default("$(this.promise_filename)") }; + version => "1.0"; } bundle common test { @if minimum_version(3) classes: - "expected_3"; + "expected_3"; @else classes: - "not_expected_3"; + "not_expected_3"; @endif - @if minimum_version(3.7) classes: - "expected_3_7"; + "expected_3_7"; @else classes: - "not_expected_3_7"; + "not_expected_3_7"; @endif - @if minimum_version(3.6) classes: - "expected_3_6"; + "expected_3_6"; @else classes: - "not_expected_3_6"; + "not_expected_3_6"; @endif - @if minimum_version(2.100) classes: - "expected_2_100"; + "expected_2_100"; @else classes: - "not_xpected_2_100"; + "not_xpected_2_100"; @endif - @if minimum_version(300.700) classes: - "not_expected_300_700"; + "not_expected_300_700"; @else classes: - "expected_300_700"; + "expected_300_700"; @endif - @if maximum_version(3.0) - classes: - "not_expected_3_0"; + classes: + "not_expected_3_0"; @else - classes: - "expected_3_0"; + classes: + "expected_3_0"; @endif - @if maximum_version(4) - classes: - "expected_4"; + classes: + "expected_4"; @else - classes: - "not_expected_4"; + classes: + "not_expected_4"; @endif - @if maximum_version(4.0.0) - classes: - "expected_4_0_0"; + classes: + "expected_4_0_0"; @else - classes: - "not_expected_4_0_0"; + classes: + "not_expected_4_0_0"; @endif - @if between_versions(3.15.0, 4.0.0) - classes: - "expected_3_15_0_4_0_0"; + classes: + "expected_3_15_0_4_0_0"; @else - classes: - "not_expected_3_15_0_4_0_0"; + classes: + "not_expected_3_15_0_4_0_0"; @endif - @if between_versions(3.11, 3.12) - classes: - "not_expected_3_11_3_12"; + classes: + "not_expected_3_11_3_12"; @else - classes: - "expected_3_11_3_12"; + classes: + "expected_3_11_3_12"; @endif - @if before_version(4) - classes: - "expected_before_version_4"; + classes: + "expected_before_version_4"; @else - classes: - "not_expected_before_version_4"; + classes: + "not_expected_before_version_4"; @endif - @if before_version(3) - classes: - "not_expected_before_version_3"; + classes: + "not_expected_before_version_3"; @else - classes: - "expected_before_version_3"; + classes: + "expected_before_version_3"; @endif - @if at_version(3) - classes: - "expected_at_version_3"; + classes: + "expected_at_version_3"; @else - classes: - "not_expected_at_version_3"; + classes: + "not_expected_at_version_3"; @endif - @if at_version(2) - classes: - "not_expected_at_version_2"; + classes: + "not_expected_at_version_2"; @else - classes: - "expected_at_version_2"; + classes: + "expected_at_version_2"; @endif - @if after_version(2) - classes: - "expected_after_version_2"; + classes: + "expected_after_version_2"; @else - classes: - "not_expected_after_version_2"; + classes: + "not_expected_after_version_2"; @endif - @if after_version(3) - classes: - "not_expected_after_version_3"; + classes: + "not_expected_after_version_3"; @else - classes: - "expected_after_version_3"; + classes: + "expected_after_version_3"; @endif } bundle agent check { vars: - "expected_classes" slist => classesmatching("expected.*"); + "expected_classes" slist => classesmatching("expected.*"); "not_expected_classes" slist => classesmatching("not_expected.*"); - "expected_length" int => length("expected_classes"); - "not_expected_length" int => length("not_expected_classes"); + "expected_length" int => length("expected_classes"); + "not_expected_length" int => length("not_expected_classes"); + classes: - "pass_expected" if => strcmp("$(expected_length)", "16"); + "pass_expected" if => strcmp("$(expected_length)", "16"); "pass_not_expected" if => strcmp("$(not_expected_length)", "0"); "ok" and => { "pass_expected", "pass_not_expected" }; + methods: ok:: "" usebundle => dcs_pass($(this.promise_filename)); + reports: DEBUG:: "Expected classes: $(expected_classes)"; "Not expected classes: $(not_expected_classes)"; "Expected length: $(expected_length)"; "Not expected length: $(not_expected_length)"; + DEBUG.pass_expected:: "pass_expected"; + DEBUG.pass_not_expected:: "pass_not_expected"; } diff --git a/tests/acceptance/00_basics/macros/if_feature.cf b/tests/acceptance/00_basics/macros/if_feature.cf index 4ad91f1d2c..e2f0d5fd7c 100644 --- a/tests/acceptance/00_basics/macros/if_feature.cf +++ b/tests/acceptance/00_basics/macros/if_feature.cf @@ -3,29 +3,26 @@ # Test that @if feature() works # ##################################################### - body common control { - inputs => { "../../default.sub.cf" }; - bundlesequence => { default("$(this.promise_filename)") }; - version => "1.0"; + inputs => { "../../default.sub.cf" }; + bundlesequence => { default("$(this.promise_filename)") }; + version => "1.0"; } bundle common test { @if feature(xml) classes: - "xml" expression => "any"; + "xml" expression => "any"; @endif - @if feature(yaml) classes: - "yaml" expression => "any"; + "yaml" expression => "any"; @endif - @if feature(unknown_123) classes: - "not_expected" expression => "any"; + "not_expected" expression => "any"; @endif } @@ -34,14 +31,19 @@ bundle agent check vars: !feature_yaml.!feature_xml:: "result" string => ""; + feature_yaml.!feature_xml:: "result" string => "yaml"; + !feature_yaml.feature_xml:: "result" string => "xml"; + feature_yaml.feature_xml:: "result" string => "yaml,xml"; + methods: - "" usebundle => dcs_passif_expected("$(result)", - "not_expected", - $(this.promise_filename)); + "" + usebundle => dcs_passif_expected( + "$(result)", "not_expected", $(this.promise_filename) + ); } diff --git a/tests/acceptance/00_basics/macros/if_feature_pam.cf b/tests/acceptance/00_basics/macros/if_feature_pam.cf index 1f8c3a6ab5..89d8ef756e 100644 --- a/tests/acceptance/00_basics/macros/if_feature_pam.cf +++ b/tests/acceptance/00_basics/macros/if_feature_pam.cf @@ -3,12 +3,11 @@ # Test that @if feature() and class guard works for pam # ##################################################### - body common control { - inputs => { "../../default.sub.cf" }; - bundlesequence => { default("$(this.promise_filename)") }; - version => "1.0"; + inputs => { "../../default.sub.cf" }; + bundlesequence => { default("$(this.promise_filename)") }; + version => "1.0"; } bundle common test @@ -24,11 +23,13 @@ bundle agent check @if feature(pam) feature_pam:: "$(this.promise_filename) Pass"; + !feature_pam:: "$(this.promise_filename) FAIL"; @else !feature_pam:: "$(this.promise_filename) Pass"; + feature_pam:: "$(this.promise_filename) FAIL"; @endif diff --git a/tests/acceptance/00_basics/macros/if_on_first_line.cf b/tests/acceptance/00_basics/macros/if_on_first_line.cf index 741db4b500..7284d2ab56 100644 --- a/tests/acceptance/00_basics/macros/if_on_first_line.cf +++ b/tests/acceptance/00_basics/macros/if_on_first_line.cf @@ -8,15 +8,13 @@ body common control { - inputs => { "../../default.sub.cf" }; - bundlesequence => { default("$(this.promise_filename)") }; - version => "1.0"; + inputs => { "../../default.sub.cf" }; + bundlesequence => { default("$(this.promise_filename)") }; + version => "1.0"; } bundle agent check { methods: - "" usebundle => dcs_passif_expected("any", - "", - $(this.promise_filename)); + "" usebundle => dcs_passif_expected("any", "", $(this.promise_filename)); } diff --git a/tests/acceptance/00_basics/macros/if_triple.cf b/tests/acceptance/00_basics/macros/if_triple.cf index a9ae8a5b48..6c21ef31d1 100644 --- a/tests/acceptance/00_basics/macros/if_triple.cf +++ b/tests/acceptance/00_basics/macros/if_triple.cf @@ -2,39 +2,45 @@ # # Test that @if works with patch level ##################################################### - body common control { - inputs => { "../../default.sub.cf" }; - bundlesequence => { default("$(this.promise_filename)") }; + inputs => { "../../default.sub.cf" }; + bundlesequence => { default("$(this.promise_filename)") }; } bundle agent init { files: - "$(G.testdir)$(const.dirsep)test.cf" - create => "true", - edit_template => "$(this.promise_filename).sub.template", - template_method => "mustache"; + "$(G.testdir)$(const.dirsep)test.cf" + create => "true", + edit_template => "$(this.promise_filename).sub.template", + template_method => "mustache"; } bundle agent test { meta: - "test_skip_needs_work" string => "windows"; + "test_skip_needs_work" string => "windows"; } bundle agent check { methods: - # 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)$(const.dirsep)test.cf", - $(this.promise_filename)); + # 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)$(const.dirsep)test.cf", + $(this.promise_filename) + ); } From 37b623fc4e2c39530912d7e2eb1eff978e2c1e1f Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Wed, 6 May 2026 13:51:17 +0200 Subject: [PATCH 15/22] tests: Added comment to empty policy file for cf-execd code test cfengine lint generally considers empty files to be a problem, because they could be the result of a failed transfer, failed write, or similar. Thus, adding a comment here to avoid having an empty .cf file. Signed-off-by: Ole Herman Schumacher Elgesem (cherry picked from commit 3abc099529840a30223f85e77489734dc2b4a698) --- tests/unit/data/body_executor_control_empty.cf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/data/body_executor_control_empty.cf b/tests/unit/data/body_executor_control_empty.cf index 8b13789179..314b71f668 100644 --- a/tests/unit/data/body_executor_control_empty.cf +++ b/tests/unit/data/body_executor_control_empty.cf @@ -1 +1 @@ - +# No configuration for cf-execd here From 34d4108265462953c796e04ec8cc20d86588f3cf Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Wed, 6 May 2026 14:02:22 +0200 Subject: [PATCH 16/22] tests: Changed ifvarclass to if in several tests and examples Didn't change all of them - left the ones which seem like the test is for testing ifvarclass specifically. Signed-off-by: Ole Herman Schumacher Elgesem (cherry picked from commit 7bbf5af2599e92cf4c20bc42d52e16baaf70e318) --- contrib/masterfiles/git-failsafe.cf | 2 +- examples/classfilterdata_array_of_objects.cf | 12 +++--- examples/classfilterdata_object_of_objects.cf | 12 +++--- .../classfilterdata_collecting.cf | 12 +++--- ...ving_classexpression_from_datacontainer.cf | 2 +- tests/acceptance/dcs.sub.cf | 40 +++++++++---------- 6 files changed, 40 insertions(+), 40 deletions(-) diff --git a/contrib/masterfiles/git-failsafe.cf b/contrib/masterfiles/git-failsafe.cf index 672a3e0301..a03600493f 100644 --- a/contrib/masterfiles/git-failsafe.cf +++ b/contrib/masterfiles/git-failsafe.cf @@ -247,7 +247,7 @@ bundle agent git_update perms => u_m("755"), depth_search => u_recurse_basedir("inf"), action => u_immediate, - ifvarclass => "hpux"; + if => "hpux"; "/usr/local/bin" comment => "Ensure cfengine binaries were copied to /usr/local/bin", diff --git a/examples/classfilterdata_array_of_objects.cf b/examples/classfilterdata_array_of_objects.cf index 224cde4924..6dbd9caebc 100644 --- a/examples/classfilterdata_array_of_objects.cf +++ b/examples/classfilterdata_array_of_objects.cf @@ -7,13 +7,13 @@ bundle agent __main__ vars: "original" data => '[ - { "file": "/tmp/foo", "ifvarclass": "role_1" }, - { "file": "/tmp/bar", "ifvarclass": "role_2" }, - { "file": "/tmp/baz", "ifvarclass": "(role_1|role_2)" } + { "file": "/tmp/foo", "if": "role_1" }, + { "file": "/tmp/bar", "if": "role_2" }, + { "file": "/tmp/baz", "if": "(role_1|role_2)" } ]'; "filtered" - data => classfilterdata("original", "array_of_objects", "ifvarclass"); + data => classfilterdata("original", "array_of_objects", "if"); reports: "Filtered data: $(with)" @@ -26,11 +26,11 @@ bundle agent __main__ #@ R: Filtered data: [ #@ { #@ "file": "/tmp/bar", -#@ "ifvarclass": "role_2" +#@ "if": "role_2" #@ }, #@ { #@ "file": "/tmp/baz", -#@ "ifvarclass": "(role_1|role_2)" +#@ "if": "(role_1|role_2)" #@ } #@ ] #@ ``` diff --git a/examples/classfilterdata_object_of_objects.cf b/examples/classfilterdata_object_of_objects.cf index 69ea750dc9..d0ae0db6ea 100644 --- a/examples/classfilterdata_object_of_objects.cf +++ b/examples/classfilterdata_object_of_objects.cf @@ -7,13 +7,13 @@ bundle agent __main__ vars: "original" data => '{ - "/tmp/foo": { "ifvarclass": "role_1" }, - "/tmp/bar": { "ifvarclass": "role_2" }, - "/tmp/baz": { "ifvarclass": "(role_1|role_2)" } + "/tmp/foo": { "if": "role_1" }, + "/tmp/bar": { "if": "role_2" }, + "/tmp/baz": { "if": "(role_1|role_2)" } }'; "filtered" - data => classfilterdata("original", "object_of_objects", "ifvarclass"); + data => classfilterdata("original", "object_of_objects", "if"); reports: "Filtered data: $(with)" @@ -25,10 +25,10 @@ bundle agent __main__ #@ ``` #@ R: Filtered data: { #@ "/tmp/bar": { -#@ "ifvarclass": "role_2" +#@ "if": "role_2" #@ }, #@ "/tmp/baz": { -#@ "ifvarclass": "(role_1|role_2)" +#@ "if": "(role_1|role_2)" #@ } #@ } #@ ``` diff --git a/tests/acceptance/01_vars/02_functions/classfilterdata_collecting.cf b/tests/acceptance/01_vars/02_functions/classfilterdata_collecting.cf index dba9671cdf..d40d5a4aa8 100644 --- a/tests/acceptance/01_vars/02_functions/classfilterdata_collecting.cf +++ b/tests/acceptance/01_vars/02_functions/classfilterdata_collecting.cf @@ -14,21 +14,21 @@ bundle agent init "mode": "755", "owner": "root", "group": "root", - "ifvarclass": "role_1" + "if": "role_1" }, { "file": "/tmp/bar", "mode": "600", "owner": "root", "group": "root", - "ifvarclass": "role_2" + "if": "role_2" }, { "file": "/tmp/baz", "mode": "644", "owner": "root", "group": "root", - "ifvarclass": "(role_1|role_2)" + "if": "(role_1|role_2)" } ]'; } @@ -44,7 +44,7 @@ bundle agent test vars: "filtered" - data => classfilterdata(readjson("$(G.testfile).json"), "auto", "ifvarclass"); + data => classfilterdata(readjson("$(G.testfile).json"), "auto", "if"); } bundle agent check @@ -57,14 +57,14 @@ bundle agent check "mode": "600", "owner": "root", "group": "root", - "ifvarclass": "role_2" + "if": "role_2" }, { "file": "/tmp/baz", "mode": "644", "owner": "root", "group": "root", - "ifvarclass": "(role_1|role_2)" + "if": "(role_1|role_2)" } ]'); "actual" diff --git a/tests/acceptance/02_classes/01_basic/if_resolving_classexpression_from_datacontainer.cf b/tests/acceptance/02_classes/01_basic/if_resolving_classexpression_from_datacontainer.cf index bdaf17203e..ba14969dd7 100644 --- a/tests/acceptance/02_classes/01_basic/if_resolving_classexpression_from_datacontainer.cf +++ b/tests/acceptance/02_classes/01_basic/if_resolving_classexpression_from_datacontainer.cf @@ -11,7 +11,7 @@ bundle agent test { meta: "description" -> { "CFE-3319" } - string => "Test that if/ifvarclass can check class expressions from within a data container"; + string => "Test that if can check class expressions from within a data container"; vars: diff --git a/tests/acceptance/dcs.sub.cf b/tests/acceptance/dcs.sub.cf index 15bba3cd3d..757943343b 100644 --- a/tests/acceptance/dcs.sub.cf +++ b/tests/acceptance/dcs.sub.cf @@ -116,16 +116,16 @@ bundle common G vars: # General commands. "$(cmds)" string => "$(paths[$(paths_indices)])$(const.dirsep)$(cmds)$(exeext)", - ifvarclass => canonify("$(paths_indices)_$(cmds)$(exeext)"); + if => canonify("$(paths_indices)_$(cmds)$(exeext)"); # Special cases. "$(sbin_cmds)" string => "$(paths[$(paths_indices)])$(const.dirsep)$(sbin_cmds)$(exeext)", - ifvarclass => canonify("$(paths_indices)_$(sbin_cmds)$(exeext)"); + if => canonify("$(paths_indices)_$(sbin_cmds)$(exeext)"); # gmake has higher priority, so should come last. "make" string => "$(paths[$(paths_indices)])$(const.dirsep)make$(exeext)", - ifvarclass => canonify("$(paths_indices)_make$(exeext)"); + if => canonify("$(paths_indices)_make$(exeext)"); "make" string => "$(paths[$(paths_indices)])$(const.dirsep)gmake$(exeext)", - ifvarclass => canonify("$(paths_indices)_gmake$(exeext)"); + if => canonify("$(paths_indices)_gmake$(exeext)"); # on solaris, gsed works more like GNU sed, such as having `-i` option solaris:: @@ -247,7 +247,7 @@ bundle agent test_run(filename) AUTO:: "any" usebundle => "$(default.tests)", - ifvarclass => canonify("have_test_run_$(default.tests)"); + if => canonify("have_test_run_$(default.tests)"); reports: !AUTO:: @@ -460,15 +460,15 @@ bundle agent dcs_report_generic_classes(x) reports: DEBUG:: - "class '$(x)_$(choices)' was defined" ifvarclass => '$(x)_$(choices)'; - "class '$(x)_$(choices)' was NOT defined" ifvarclass => '!$(x)_$(choices)'; + "class '$(x)_$(choices)' was defined" if => '$(x)_$(choices)'; + "class '$(x)_$(choices)' was NOT defined" if => '!$(x)_$(choices)'; } bundle agent dcs_generic_classes_to_string(x) { vars: "choices" slist => { "repaired", "failed", "denied", "timeout", "kept" }; - "s[$(choices)]" string => "$(x)_$(choices)", ifvarclass => '$(x)_$(choices)'; + "s[$(choices)]" string => "$(x)_$(choices)", if => '$(x)_$(choices)'; "found_unsorted" slist => getvalues(s); "found" slist => sort(found_unsorted, "lex"); "found_str" string => format("%S", found); @@ -792,13 +792,13 @@ reports: bundle agent dcs_passif(classname, test) { reports: - "$(test) Pass" ifvarclass => $(classname); - "$(test) FAIL" ifvarclass => not($(classname)); + "$(test) Pass" if => $(classname); + "$(test) FAIL" if => not($(classname)); EXTRA:: - "$(this.bundle): passing based on class '$(classname)'" ifvarclass => $(classname); + "$(this.bundle): passing based on class '$(classname)'" if => $(classname); DEBUG:: - "$(this.bundle): failing based on class '$(classname)'" ifvarclass => not($(classname)); + "$(this.bundle): failing based on class '$(classname)'" if => not($(classname)); } bundle agent dcs_pass(test) @@ -872,17 +872,17 @@ bundle agent dcs_passif_expected(expected, not_expected, test) reports: DEBUG:: "$(this.bundle): bad: $(ex) was NOT defined" - ifvarclass => "!$(ex)"; + if => "!$(ex)"; "$(this.bundle): bad: $(notex) WAS defined" - ifvarclass => "$(notex)"; + if => "$(notex)"; EXTRA:: "$(this.bundle): good: $(ex) WAS defined" - ifvarclass => "$(ex)"; + if => "$(ex)"; "$(this.bundle): good: $(notex) was NOT defined" - ifvarclass => "!$(notex)"; + if => "!$(notex)"; } ####################################################### @@ -906,17 +906,17 @@ bundle agent dcs_passif_output(wanted, unwanted, command, test) reports: DEBUG:: "$(this.bundle): bad: '$(wanted)' was NOT found in the output of '$(command)'" - ifvarclass => "!__passif_output_wanted"; + if => "!__passif_output_wanted"; "$(this.bundle): bad: '$(unwanted)' WAS found in the output of '$(command)'" - ifvarclass => "__passif_output_unwanted"; + if => "__passif_output_unwanted"; EXTRA:: "$(this.bundle): good: '$(wanted)' WAS found in the output of '$(command)'" - ifvarclass => "__passif_output_wanted"; + if => "__passif_output_wanted"; "$(this.bundle): good: '$(unwanted)' was NOT found in the output of '$(command)'" - ifvarclass => "!__passif_output_unwanted"; + if => "!__passif_output_unwanted"; DEBUG:: "$(this.bundle): the output of command '$(command)' was: '$(subout)'"; From cf18b19ece9b79044faad762b7648dcfc2006a1d Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Wed, 6 May 2026 14:14:16 +0200 Subject: [PATCH 17/22] tests: Renamed vars_multiple_types to .x.cf Signed-off-by: Ole Herman Schumacher Elgesem (cherry picked from commit f5d8e6aad2f6c2ad39cc95c0135c0742f83a9d22) --- .../data/{vars_multiple_types.cf => vars_multiple_types.x.cf} | 0 tests/unit/policy_test.c | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename tests/unit/data/{vars_multiple_types.cf => vars_multiple_types.x.cf} (100%) diff --git a/tests/unit/data/vars_multiple_types.cf b/tests/unit/data/vars_multiple_types.x.cf similarity index 100% rename from tests/unit/data/vars_multiple_types.cf rename to tests/unit/data/vars_multiple_types.x.cf diff --git a/tests/unit/policy_test.c b/tests/unit/policy_test.c index 11311d0c2c..26ffea99ce 100644 --- a/tests/unit/policy_test.c +++ b/tests/unit/policy_test.c @@ -138,7 +138,7 @@ static void test_body_control_no_arguments(void) static void test_vars_multiple_types(void) { - Seq *errs = LoadAndCheck("vars_multiple_types.cf"); + Seq *errs = LoadAndCheck("vars_multiple_types.x.cf"); assert_int_equal(1, errs->length); SeqDestroy(errs); From 1b4cf391bdaf1db6ba39ea19d01b4a552448f311 Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Wed, 6 May 2026 14:23:40 +0200 Subject: [PATCH 18/22] tests: Removed unused test file The test using this file was removed in: ef10f3be4dd591d5de5008dff29444bba6bb458c 13 years ago. Signed-off-by: Ole Herman Schumacher Elgesem (cherry picked from commit 3af40f0fa0b2168d44965aeb9f2ff1bae99bbab0) --- tests/unit/data/constraint_lval_invalid.cf | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 tests/unit/data/constraint_lval_invalid.cf diff --git a/tests/unit/data/constraint_lval_invalid.cf b/tests/unit/data/constraint_lval_invalid.cf deleted file mode 100644 index 588f84ec38..0000000000 --- a/tests/unit/data/constraint_lval_invalid.cf +++ /dev/null @@ -1,7 +0,0 @@ -bundle agent test -{ - files: - "$(G.testdir)/shouldnotexist" - create => "true", - nonexistent_attribute => "abc"; -} From cd6378148c48be542cccf9a4d65211c9c02ba10b Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Wed, 6 May 2026 16:04:05 +0200 Subject: [PATCH 19/22] tests: Renamed wrong-bundle-type.cf.sub to .sub.x.cf Signed-off-by: Ole Herman Schumacher Elgesem (cherry picked from commit 6390696ac92397bbb7663a7306d7009f70119ce7) --- tests/acceptance/00_basics/04_bundles/wrong-bundle-type.cf | 2 +- .../{wrong-bundle-type.cf.sub => wrong-bundle-type.sub.x.cf} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename tests/acceptance/00_basics/04_bundles/{wrong-bundle-type.cf.sub => wrong-bundle-type.sub.x.cf} (100%) diff --git a/tests/acceptance/00_basics/04_bundles/wrong-bundle-type.cf b/tests/acceptance/00_basics/04_bundles/wrong-bundle-type.cf index 34f8381459..891fec99e5 100644 --- a/tests/acceptance/00_basics/04_bundles/wrong-bundle-type.cf +++ b/tests/acceptance/00_basics/04_bundles/wrong-bundle-type.cf @@ -16,7 +16,7 @@ bundle agent init bundle agent test { vars: - "subout" string => execresult("${sys.cf_agent} -Kf ${this.promise_filename}.sub", "noshell"); + "subout" string => execresult("${sys.cf_agent} -Kf $(this.promise_dirname)/wrong-bundle-type.sub.x.cf", "noshell"); } bundle agent check diff --git a/tests/acceptance/00_basics/04_bundles/wrong-bundle-type.cf.sub b/tests/acceptance/00_basics/04_bundles/wrong-bundle-type.sub.x.cf similarity index 100% rename from tests/acceptance/00_basics/04_bundles/wrong-bundle-type.cf.sub rename to tests/acceptance/00_basics/04_bundles/wrong-bundle-type.sub.x.cf From 6fc37594651a6f703ad114b3086769e4dc650cf6 Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Wed, 6 May 2026 16:04:29 +0200 Subject: [PATCH 20/22] examples: Made sense of augment.cf example Signed-off-by: Ole Herman Schumacher Elgesem (cherry picked from commit a23ea1ea1cbf85b3105a9242d3c067a9fb95e890) --- examples/augment.cf | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/examples/augment.cf b/examples/augment.cf index 87a476e956..3bedd7fba7 100644 --- a/examples/augment.cf +++ b/examples/augment.cf @@ -2,8 +2,9 @@ bundle common def { vars: # Only define this variable if it is not yet defined. - "example_augment_string_override" - unless => isvariable("example_augment_string_override"); + "example_augment_string" + string => "fallback value when not defined in def.json", + unless => isvariable("example_augment_string"); # Define this variable regardless if it has been set in def.json "example_augment_list_override" @@ -18,16 +19,16 @@ bundle agent main reports: "Def var: '$(def_vars)'"; - "def.example_augment_string_override = '$(def.example_augment_string_override)'"; + "def.example_augment_string = '$(def.example_augment_string)'"; "def.example_augment_list_override = '$(def.example_augment_list_override)'"; "def.example_augment_structured_override[key1] = '$(def.example_augment_structured_override[key1])'"; } #+begin_src example_output #@ ``` #@ R: Def var: 'default:def.example_augment_structured_override' -#@ R: Def var: 'default:def.example_augment_string_override' +#@ R: Def var: 'default:def.example_augment_string' #@ R: Def var: 'default:def.example_augment_list_override' -#@ R: def.example_augment_string_override = 'defined in def.json' +#@ R: def.example_augment_string = 'defined in def.json' #@ R: def.example_augment_list_override = 'defined' #@ R: def.example_augment_list_override = 'in' #@ R: def.example_augment_list_override = 'bundle' From a223a33197b38b04c737af1326a838fb729bb6cf Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Wed, 20 May 2026 01:14:06 +0200 Subject: [PATCH 21/22] Ran make pluck (for 3.27) Signed-off-by: Ole Herman Schumacher Elgesem --- tests/acceptance/plucked.sub.cf | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/tests/acceptance/plucked.sub.cf b/tests/acceptance/plucked.sub.cf index 1d13802d9b..e7fa7eb99e 100644 --- a/tests/acceptance/plucked.sub.cf +++ b/tests/acceptance/plucked.sub.cf @@ -760,25 +760,33 @@ bundle edit_line set_variable_values_ini(tab, sectionName) # Be careful if the index string contains funny chars "cindex[$(index)]" string => canonify("$(index)"); + "_escaped_section" string => escape("$(sectionName)"); classes: "edit_$(cindex[$(index)])" not => strcmp("$($(tab)[$(sectionName)][$(index)])","dontchange"), comment => "Create conditions to make changes"; + "section_$(sectionName)_exists" + expression => regline("^\[$(_escaped_section)\]", "$(edit.filename)"), + if => fileexists("$(edit.filename)"), + comment => "Check if the section header already exists in the file"; + field_edits: # If the line is there, but commented out, first uncomment it "#+\s*$(index)\s*=.*" select_region => INI_section(escape("$(sectionName)")), edit_field => col("\s*=\s*","1","$(index)","set"), - if => "edit_$(cindex[$(index)])"; + if => and("edit_$(cindex[$(index)])", + canonify("section_$(sectionName)_exists")); # match a line starting like the key something "\s*$(index)\s*=.*" edit_field => col("\s*=\s*","2","$($(tab)[$(sectionName)][$(index)])","set"), select_region => INI_section(escape("$(sectionName)")), classes => results("bundle", "set_variable_values_ini_not_$(cindex[$(index)])"), - if => "edit_$(cindex[$(index)])"; + if => and("edit_$(cindex[$(index)])", + canonify("section_$(sectionName)_exists")); insert_lines: "[$(sectionName)]" @@ -787,7 +795,16 @@ bundle edit_line set_variable_values_ini(tab, sectionName) "$(index)=$($(tab)[$(sectionName)][$(index)])" select_region => INI_section(escape("$(sectionName)")), - if => "!(set_variable_values_ini_not_$(cindex[$(index)])_kept|set_variable_values_ini_not_$(cindex[$(index)])_repaired).edit_$(cindex[$(index)])"; + if => and("!(set_variable_values_ini_not_$(cindex[$(index)])_kept|set_variable_values_ini_not_$(cindex[$(index)])_repaired)", + "edit_$(cindex[$(index)])", + canonify("section_$(sectionName)_exists")), + handle => "insert_key_in_existing_section_$(sectionName)_$(cindex[$(index)])"; + + "$(index)=$($(tab)[$(sectionName)][$(index)])" + location => after("^\[$(_escaped_section)\]"), + if => and("edit_$(cindex[$(index)])", + not(canonify("section_$(sectionName)_exists"))), + handle => "insert_key_in_new_section_$(sectionName)_$(cindex[$(index)])"; } From 802f0f7f91b1ad3d3b8b5bddeb62fa45634b5a9a Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 14 Apr 2026 16:39:04 -0500 Subject: [PATCH 22/22] fix: ci/install.sh should also generate a hostkey with cf-key Ticket: none Changelog: none (cherry picked from commit a4689efa9fb7f9fe3b26f08df179097387bc3ed1) --- ci/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/install.sh b/ci/install.sh index 79dbeb14fc..5a53c025ce 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -18,3 +18,4 @@ if [ ! -n "$TERMUX_VERSION" ]; then fi $GAINROOT make install +$GAINROOT /var/cfengine/bin/cf-key # to generate the hostkey