Skip to content

Commit be48690

Browse files
committed
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 <ole@northern.tech>
1 parent b804bb2 commit be48690

5 files changed

Lines changed: 7 additions & 6 deletions

File tree

tests/acceptance/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ ENV_FILE=testall.env
22

33
copy:
44
cp $(core_dir)/tests/acceptance/*.cf.sub .
5+
cp $(core_dir)/tests/acceptance/*.sub.cf .
56

67
env:
78
echo export CORE=\"$(core_dir)\" > $(ENV_FILE)
@@ -22,7 +23,7 @@ check-local: create-env
2223

2324
CLEANFILES = testall.env summary.log test.log test.xml Makefile.testall
2425
#These are created by running the submakefile
25-
CLEANFILES += dcs.cf.sub default.cf.sub plucked.cf.sub
26+
CLEANFILES += dcs.cf.sub default.cf.sub plucked.sub.cf
2627

2728

2829
EXTRA_DIST = README.md

tests/acceptance/README.org

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
* Writing tests against the stdlib
22

33
The test framework for masterfiles piggy backs on the test framework from core.
4-
It's important to note =plucked.cf.sub= comes from the core repository and that
4+
It's important to note =plucked.sub.cf= comes from the core repository and that
55
it includes bodies and bundles from the stdlib which are useful in writing tests
66
in core. This presents a problem for writing tests in the masterfiles framework
7-
because =plucked.cf.sub= is included and simply including the stdlib could
7+
because =plucked.sub.cf= is included and simply including the stdlib could
88
result in duplicate definition of bundle errors.
99

1010
To work around this complication you can create a subtest that includes the

tests/acceptance/lib/files/edit_line_converge.cf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ bundle common classes
1111
classes:
1212
"testing_masterfiles_policy_framework"
1313
scope => "namespace",
14-
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.";
14+
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.";
1515
}
1616
bundle agent init
1717
{

tests/acceptance/lib/files/edit_line_converge_prepend.cf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bundle common classes
1212

1313
"testing_masterfiles_policy_framework"
1414
scope => "namespace",
15-
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.";
15+
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.";
1616
}
1717

1818
bundle agent init

tests/acceptance/lib/files/replace_uncommented_substrings.cf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bundle common classes
1212
classes:
1313

1414
"testing_masterfiles_policy_framework"
15-
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.";
15+
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.";
1616
}
1717

1818
bundle agent test

0 commit comments

Comments
 (0)