From be48690e2734eb0e47c6ed5770f28af7ab40ac00 Mon Sep 17 00:00:00 2001 From: Ole Herman Schumacher Elgesem Date: Thu, 30 Apr 2026 21:43:36 +0200 Subject: [PATCH] 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 --- tests/acceptance/Makefile.am | 3 ++- tests/acceptance/README.org | 4 ++-- tests/acceptance/lib/files/edit_line_converge.cf | 2 +- tests/acceptance/lib/files/edit_line_converge_prepend.cf | 2 +- tests/acceptance/lib/files/replace_uncommented_substrings.cf | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/acceptance/Makefile.am b/tests/acceptance/Makefile.am index 9e6410d9b2..1606bc3831 100644 --- a/tests/acceptance/Makefile.am +++ b/tests/acceptance/Makefile.am @@ -2,6 +2,7 @@ ENV_FILE=testall.env copy: cp $(core_dir)/tests/acceptance/*.cf.sub . + cp $(core_dir)/tests/acceptance/*.sub.cf . env: echo export CORE=\"$(core_dir)\" > $(ENV_FILE) @@ -22,7 +23,7 @@ check-local: create-env CLEANFILES = testall.env summary.log test.log test.xml Makefile.testall #These are created by running the submakefile -CLEANFILES += dcs.cf.sub default.cf.sub plucked.cf.sub +CLEANFILES += dcs.cf.sub default.cf.sub plucked.sub.cf EXTRA_DIST = README.md diff --git a/tests/acceptance/README.org b/tests/acceptance/README.org index 05fdda230d..6d15ad35ca 100644 --- a/tests/acceptance/README.org +++ b/tests/acceptance/README.org @@ -1,10 +1,10 @@ * Writing tests against the stdlib The test framework for masterfiles piggy backs on the test framework from core. -It's important to note =plucked.cf.sub= comes from the core repository and that +It's important to note =plucked.sub.cf= comes from the core repository and that it includes bodies and bundles from the stdlib which are useful in writing tests in core. This presents a problem for writing tests in the masterfiles framework -because =plucked.cf.sub= is included and simply including the stdlib could +because =plucked.sub.cf= is included and simply including the stdlib could result in duplicate definition of bundle errors. To work around this complication you can create a subtest that includes the diff --git a/tests/acceptance/lib/files/edit_line_converge.cf b/tests/acceptance/lib/files/edit_line_converge.cf index 37ed838878..27078bd283 100644 --- a/tests/acceptance/lib/files/edit_line_converge.cf +++ b/tests/acceptance/lib/files/edit_line_converge.cf @@ -11,7 +11,7 @@ bundle common classes classes: "testing_masterfiles_policy_framework" scope => "namespace", - comment => "This class is needed so that dcs.cf.sub includes the stdlib instead of using plucked.cf.sub from core which might get out of date and cause us to not test current code from the MPF."; + comment => "This class is needed so that dcs.cf.sub includes the stdlib instead of using plucked.sub.cf from core which might get out of date and cause us to not test current code from the MPF."; } bundle agent init { diff --git a/tests/acceptance/lib/files/edit_line_converge_prepend.cf b/tests/acceptance/lib/files/edit_line_converge_prepend.cf index f34a3b8ca1..72bbcf5cc4 100644 --- a/tests/acceptance/lib/files/edit_line_converge_prepend.cf +++ b/tests/acceptance/lib/files/edit_line_converge_prepend.cf @@ -12,7 +12,7 @@ bundle common classes "testing_masterfiles_policy_framework" scope => "namespace", - comment => "This class is needed so that dcs.cf.sub includes the stdlib instead of using plucked.cf.sub from core which might get out of date and cause us to not test current code from the MPF."; + comment => "This class is needed so that dcs.cf.sub includes the stdlib instead of using plucked.sub.cf from core which might get out of date and cause us to not test current code from the MPF."; } bundle agent init diff --git a/tests/acceptance/lib/files/replace_uncommented_substrings.cf b/tests/acceptance/lib/files/replace_uncommented_substrings.cf index 4ca8ae44cc..ad3e501058 100644 --- a/tests/acceptance/lib/files/replace_uncommented_substrings.cf +++ b/tests/acceptance/lib/files/replace_uncommented_substrings.cf @@ -12,7 +12,7 @@ bundle common classes classes: "testing_masterfiles_policy_framework" - comment => "This class is needed so that dcs.cf.sub includes the stdlib instead of using plucked.cf.sub from core which might get out of date and cause us to not test current code from the MPF."; + comment => "This class is needed so that dcs.cf.sub includes the stdlib instead of using plucked.sub.cf from core which might get out of date and cause us to not test current code from the MPF."; } bundle agent test