Skip to content

Test file cleanups guided by cfengine lint #6110

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

Merged
olehermanse merged 5 commits into from
May 5, 2026
Merged

Test file cleanups guided by cfengine lint #6110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
60b6978
Added test for invalid syntax in macros
olehermanse May 4, 2026
d93f71f
testall: Skipped .sub.x.cf files
olehermanse May 4, 2026
0c3420a
Renamed failsafe test sub policy file
olehermanse May 4, 2026
96d35e7
Cleaned up macro tests
olehermanse May 4, 2026
8a25540
cfengine format tests/acceptance/00_basics/macros/
olehermanse May 4, 2026
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
210 changes: 66 additions & 144 deletions tests/acceptance/00_basics/macros/if.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,234 +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";
}

@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
5 changes: 3 additions & 2 deletions tests/acceptance/00_basics/macros/if_eof_without_endif.x.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
######################################################
#
# Test that @if works
# Test that @if without @endif errors (1)
#
#####################################################

Expand All @@ -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
5 changes: 3 additions & 2 deletions tests/acceptance/00_basics/macros/if_eof_without_endif2.x.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
######################################################
#
# Test that @if works
# Test that @if without @endif errors (2)
#
#####################################################

Expand All @@ -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
Loading
Loading