Skip to content

Renaming #3153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
olehermanse wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Renaming #3153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/acceptance/00_basics/def.json/control_common_bundlesequence_end.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

body common control
{
inputs => { "../../default.cf.sub" };
inputs => { "../../default.sub.cf" };
bundlesequence => { default("$(this.promise_filename)") };
version => "1.0";
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/00_basics/def.json/inputs.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

body common control
{
inputs => { "../../default.cf.sub" };
inputs => { "../../default.sub.cf" };
bundlesequence => { default("$(this.promise_filename)") };
version => "1.0";
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/09_services/unsafe/running_repaired.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ vars:

body common control
{
inputs => { "../../dcs.cf.sub",
inputs => { "../../dcs.sub.cf",
"../../../../$(sys.local_libdir)/stdlib.cf",
"service_common.cf.sub"
};
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/17_packages/01_init/unsafe/timed/001-prepare-repositories.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

body common control
{
inputs => { "../../../../dcs.cf.sub",
inputs => { "../../../../dcs.sub.cf",
"../../../../../../$(sys.local_libdir)/files.cf",
"../../../../../../$(sys.local_libdir)/commands.cf",
"../../../packages-info.cf.sub",
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/17_packages/10_new/unsafe/the_great_package_test.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

body common control
{
inputs => { "../../../dcs.cf.sub",
inputs => { "../../../dcs.sub.cf",
"../../../../../controls/def.cf",
"../../../../../$(sys.local_libdir)/packages.cf",
"../../../../../$(sys.local_libdir)/commands.cf",
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/17_packages/10_new/unsafe/the_great_package_test_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def header(test_count):

body common control
{
inputs => { "../../../dcs.cf.sub",
inputs => { "../../../dcs.sub.cf",
"../../../../../controls/def.cf",
"../../../../../$(sys.local_libdir)/packages.cf",
"../../../../../$(sys.local_libdir)/commands.cf",
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/17_packages/11_old/unsafe/11_packagesmatching.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
body common control
{
inputs => { "../../packages-info.cf.sub",
"../../../dcs.cf.sub",
"../../../dcs.sub.cf",
"../../../../../$(sys.local_libdir)/stdlib.cf",
"../../../../../$(sys.local_libdir)/packages.cf"
};
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/17_packages/11_old/unsafe/12_packagesmatching.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ body common control
{
inputs => { "../../packages-info.cf.sub",
"../../meta_skip.cf.sub",
"../../../dcs.cf.sub",
"../../../dcs.sub.cf",
"../../../../../inventory/any.cf",
"../../../../../$(sys.local_libdir)/stdlib.cf",
"../../../../../$(sys.local_libdir)/packages.cf",
Expand Down
3 changes: 1 addition & 2 deletions tests/acceptance/17_packages/11_old/unsafe/named_multi_pkg_absent.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ bundle common test_meta
body common control
{
inputs => {
"../../../dcs.cf.sub",
"../../../dcs.sub.cf",
"../../../../../$(sys.local_libdir)/stdlib.cf",
"../../../../../$(sys.local_libdir)/packages.cf",
"../../packages-info.cf.sub",
Expand Down Expand Up @@ -132,4 +132,3 @@ body classes succesfully_executed(class)
kept_returncodes => { "0" };
promise_kept => { "$(class)" };
}

2 changes: 1 addition & 1 deletion tests/acceptance/17_packages/11_old/unsafe/named_multi_pkg_present.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ bundle common test_meta
body common control
{
inputs => {
"../../../dcs.cf.sub",
"../../../dcs.sub.cf",
"../../../../../$(sys.local_libdir)/stdlib.cf",
"../../../../../$(sys.local_libdir)/packages.cf",
"../../packages-info.cf.sub",
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/17_packages/11_old/unsafe/named_multi_pkg_upgrade.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
body common control
{
inputs => {
"../../../dcs.cf.sub",
"../../../dcs.sub.cf",
"../../../../../$(sys.local_libdir)/stdlib.cf",
"../../../../../$(sys.local_libdir)/packages.cf",
"../../packages-info.cf.sub",
Expand Down
3 changes: 1 addition & 2 deletions tests/acceptance/17_packages/11_old/unsafe/named_pkg_absent.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ bundle common test_meta
body common control
{
inputs => {
"../../../dcs.cf.sub",
"../../../dcs.sub.cf",
"../../../../../$(sys.local_libdir)/stdlib.cf",
"../../../../../$(sys.local_libdir)/packages.cf",
"../../packages-info.cf.sub",
Expand Down Expand Up @@ -109,4 +109,3 @@ body classes succesfully_executed(class)
kept_returncodes => { "0" };
promise_kept => { "$(class)" };
}

4 changes: 1 addition & 3 deletions tests/acceptance/17_packages/11_old/unsafe/named_pkg_file_present.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
body common control
{
inputs => {
"../../../dcs.cf.sub",
"../../../dcs.sub.cf",
"../../../../../$(sys.local_libdir)/stdlib.cf",
"../../../../../$(sys.local_libdir)/packages.cf",
"../../packages-info.cf.sub",
Expand Down Expand Up @@ -96,5 +96,3 @@ bundle agent check
!ok::
"$(this.promise_filename) FAIL";
}


4 changes: 1 addition & 3 deletions tests/acceptance/17_packages/11_old/unsafe/named_pkg_file_upgrade.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
body common control
{
inputs => {
"../../../dcs.cf.sub",
"../../../dcs.sub.cf",
"../../../../../$(sys.local_libdir)/stdlib.cf",
"../../../../../$(sys.local_libdir)/packages.cf",
"../../packages-info.cf.sub",
Expand Down Expand Up @@ -92,5 +92,3 @@ bundle agent check
!ok::
"$(this.promise_filename) FAIL";
}


2 changes: 1 addition & 1 deletion tests/acceptance/17_packages/11_old/unsafe/named_pkg_present.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ bundle common test_meta
body common control
{
inputs => {
"../../../dcs.cf.sub",
"../../../dcs.sub.cf",
"../../../../../$(sys.local_libdir)/stdlib.cf",
"../../../../../$(sys.local_libdir)/packages.cf",
"../../packages-info.cf.sub",
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/17_packages/11_old/unsafe/named_pkg_upgrade.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
body common control
{
inputs => {
"../../../dcs.cf.sub",
"../../../dcs.sub.cf",
"../../../../../$(sys.local_libdir)/stdlib.cf",
"../../../../../$(sys.local_libdir)/packages.cf",
"../../packages-info.cf.sub",
Expand Down
4 changes: 1 addition & 3 deletions tests/acceptance/17_packages/11_old/unsafe/named_versioned_pkg_present.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
body common control
{
inputs => {
"../../../dcs.cf.sub",
"../../../dcs.sub.cf",
"../../../../../$(sys.local_libdir)/stdlib.cf",
"../../../../../$(sys.local_libdir)/packages.cf",
"../../packages-info.cf.sub",
Expand Down Expand Up @@ -105,5 +105,3 @@ body classes succesfully_executed(class)
kept_returncodes => { "0" };
promise_kept => { "$(class)" };
}


2 changes: 1 addition & 1 deletion tests/acceptance/17_packages/11_old/unsafe/named_versioned_pkg_upgrade.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
body common control
{
inputs => {
"../../../dcs.cf.sub",
"../../../dcs.sub.cf",
"../../../../../$(sys.local_libdir)/stdlib.cf",
"../../../../../$(sys.local_libdir)/packages.cf",
"../../packages-info.cf.sub",
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/17_packages/11_old/unsafe/package-inventory.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ bundle common test_meta

body common control
{
inputs => { "../../../dcs.cf.sub",
inputs => { "../../../dcs.sub.cf",
"../../../../../$(sys.local_libdir)/stdlib.cf",
"../../../../../$(sys.local_libdir)/packages.cf",
"../../../../../inventory/any.cf",
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/17_packages/11_old/unsafe/staging/named_pkg_same_version_kept.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
body common control
{
inputs => {
"../../../default.cf.sub",
"../../../default.sub.cf",
"../../../../../lib/3.6/packages.cf",
"../../packages-info.cf.sub",
};
Expand Down
5 changes: 1 addition & 4 deletions tests/acceptance/17_packages/11_old/unsafe/staging/named_versioned_pkg_absent.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
body common control
{
inputs => {
"../../../default.cf.sub",
"../../../default.sub.cf",
"../../../../../lib/3.6/packages.cf",
"../../packages-info.cf.sub",
};
Expand Down Expand Up @@ -121,6 +121,3 @@ body classes succesfully_executed(class)
kept_returncodes => { "0" };
promise_kept => { "$(class)" };
}



2 changes: 1 addition & 1 deletion tests/acceptance/17_packages/11_old/unsafe/timed/inventory_packages_update_frequency.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

body common control
{
inputs => { "../../../../dcs.cf.sub",
inputs => { "../../../../dcs.sub.cf",
"../../../../../../inventory/any.cf",
"../../../../../../$(sys.local_libdir)/stdlib.cf",
"../../../../../../$(sys.local_libdir)/packages.cf"
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/17_packages/12_new/timed/installed-list-cached.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

body common control
{
inputs => { "../../../default.cf.sub" };
inputs => { "../../../default.sub.cf" };
bundlesequence => { default($(this.promise_filename)) };
}

Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/17_packages/12_new/timed/installed-list-cached.cf.sub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

body common control
{
inputs => { "../../../default.cf.sub" };
inputs => { "../../../default.sub.cf" };
bundlesequence => { default($(this.promise_filename)) };

package_module => "test_module";
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/17_packages/12_new/timed/local-updates-list-cached.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

body common control
{
inputs => { "../../../default.cf.sub" };
inputs => { "../../../default.sub.cf" };
bundlesequence => { default($(this.promise_filename)) };
}

Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/17_packages/12_new/timed/local-updates-list-cached.cf.sub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

body common control
{
inputs => { "../../../default.cf.sub" };
inputs => { "../../../default.sub.cf" };
bundlesequence => { default($(this.promise_filename)) };

package_module => "test_module";
Expand Down
3 changes: 1 addition & 2 deletions tests/acceptance/17_packages/12_new/timed/packagesmatching.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

body common control
{
inputs => { "../../../default.cf.sub" };
inputs => { "../../../default.sub.cf" };
bundlesequence => { default($(this.promise_filename)) };

package_inventory => { test_module };
Expand Down Expand Up @@ -84,4 +84,3 @@ bundle agent check
test_pass_3.!ok_pass3::
"$(this.promise_filename) FAIL";
}

2 changes: 1 addition & 1 deletion tests/acceptance/17_packages/12_new/timed/updates-list-cached.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

body common control
{
inputs => { "../../../default.cf.sub" };
inputs => { "../../../default.sub.cf" };
bundlesequence => { default($(this.promise_filename)) };
}

Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/17_packages/12_new/timed/updates-list-cached.cf.sub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

body common control
{
inputs => { "../../../default.cf.sub" };
inputs => { "../../../default.sub.cf" };
bundlesequence => { default($(this.promise_filename)) };

package_module => "test_module";
Expand Down
4 changes: 2 additions & 2 deletions tests/acceptance/17_packages/multiline_yum_check_update.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ body common control
{
cfengine_3_7::
inputs => {
"../dcs.cf.sub",
"../dcs.sub.cf",
"../../../lib/stdlib.cf",
"../../../lib/packages.cf",
};

!cfengine_3_7::
inputs => { "../dcs.cf.sub",
inputs => { "../dcs.sub.cf",
"../../../$(sys.local_libdir)/stdlib.cf",
"../../../$(sys.local_libdir)/packages.cf",
};
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/30_custom_promise_types/05_cp_using_library.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#####################################################
body common control
{
inputs => { "../default.cf.sub" };
inputs => { "../default.sub.cf" };
bundlesequence => { default("$(this.promise_filename)") };
version => "1.0";
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/30_custom_promise_types/06_cp_with_classes.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#####################################################
body common control
{
inputs => { "../default.cf.sub" };
inputs => { "../default.sub.cf" };
bundlesequence => { default("$(this.promise_filename)") };
version => "1.0";
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/30_custom_promise_types/07_python_library.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#####################################################
body common control
{
inputs => { "../default.cf.sub" };
inputs => { "../default.sub.cf" };
bundlesequence => { default("$(this.promise_filename)") };
version => "1.0";
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/30_custom_promise_types/08_slist_attrs.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#####################################################
body common control
{
inputs => { "../default.cf.sub" };
inputs => { "../default.sub.cf" };
bundlesequence => { default("$(this.promise_filename)") };
version => "1.0";
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/30_custom_promise_types/09_log_level.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#####################################################
body common control
{
inputs => { "../default.cf.sub" };
inputs => { "../default.sub.cf" };
bundlesequence => { default("$(this.promise_filename)") };
version => "1.0";
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/30_custom_promise_types/09_log_level.cf.sub
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
body common control
{
inputs => { "../default.cf.sub" };
inputs => { "../default.sub.cf" };
bundlesequence => { default("$(this.promise_filename)") };
version => "1.0";
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/30_custom_promise_types/10_log_level_bad_module.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#####################################################
body common control
{
inputs => { "../default.cf.sub" };
inputs => { "../default.sub.cf" };
bundlesequence => { default("$(this.promise_filename)") };
version => "1.0";
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/30_custom_promise_types/10_log_level_bad_module.cf.sub
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
body common control
{
inputs => { "../default.cf.sub" };
inputs => { "../default.sub.cf" };
bundlesequence => { default("$(this.promise_filename)") };
version => "1.0";
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/30_custom_promise_types/11_handle.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#####################################################
body common control
{
inputs => { "../default.cf.sub" };
inputs => { "../default.sub.cf" };
bundlesequence => { default("$(this.promise_filename)") };
version => "1.0";
}
Expand Down
Loading
Loading