cfengine 0.14.0__tar.gz → 0.15.0__tar.gz

cfengine-0.15.0/.github/workflows/lint-policy-in-other-repos.yml

@@ -0,0 +1,47 @@
+# This workflow checks that linting works on real policy in other repos
+# and ensures we fix errors in policy before merging new linting rules
+# to CFEngine CLI
+
+name: Lint policy in other repos
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+  workflow_dispatch:
+permissions:
+  contents: read
+jobs:
+  lint:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout cfengine-cli
+        uses: actions/checkout@v4
+        with:
+          path: cfengine-cli
+      - name: Checkout masterfiles
+        uses: actions/checkout@v4
+        with:
+          repository: cfengine/masterfiles
+          path: masterfiles
+      - name: Checkout modules
+        uses: actions/checkout@v4
+        with:
+          repository: cfengine/modules
+          path: modules
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+      - name: Install dependencies
+        working-directory: cfengine-cli
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install uv
+          make install
+      - name: Run cfengine lint
+        working-directory: cfengine-cli
+        run: |
+          uv run cfengine lint --strict no ../masterfiles
+          uv run cfengine lint --strict no ../modules
+        # TODO: Add documentation and core when ready

{cfengine-0.14.0 → cfengine-0.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cfengine
-Version: 0.14.0
+Version: 0.15.0
 Summary: Human-oriented CLI for interacting with CFEngine tools
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007

{cfengine-0.14.0 → cfengine-0.15.0}/src/cfengine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cfengine
-Version: 0.14.0
+Version: 0.15.0
 Summary: Human-oriented CLI for interacting with CFEngine tools
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007

{cfengine-0.14.0 → cfengine-0.15.0}/src/cfengine.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ README.md
 pyproject.toml
 uv.lock
 .github/dependabot.yml
+.github/workflows/lint-policy-in-other-repos.yml
 .github/workflows/make-check.yml
 .github/workflows/pypi-publish.yml
 .github/workflows/update-syntax-description.yml
@@ -29,6 +30,7 @@ src/cfengine_cli/dev.py
 src/cfengine_cli/docs.py
 src/cfengine_cli/format.py
 src/cfengine_cli/lint.py
+src/cfengine_cli/lint_csv.py
 src/cfengine_cli/main.py
 src/cfengine_cli/paths.py
 src/cfengine_cli/profile.py
@@ -74,67 +76,66 @@ tests/format/011_macros.input.cf
 tests/format/011_promises.expected.cf
 tests/format/011_promises.input.cf
 tests/lint/001_hello_world.cf
-tests/lint/002_ifvarclass.expected.txt
-tests/lint/002_ifvarclass.x.cf
-tests/lint/003_deprecated_promise_type.cf
-tests/lint/003_deprecated_promise_type.expected.txt
-tests/lint/003_deprecated_promise_type.x.cf
-tests/lint/004_bundle_name_lowercase.cf
-tests/lint/004_bundle_name_lowercase.expected.txt
-tests/lint/004_bundle_name_lowercase.x.cf
-tests/lint/005_bundle_type.cf
-tests/lint/005_bundle_type.expected.txt
-tests/lint/005_bundle_type.x.cf
-tests/lint/006_syntax_error.cf
-tests/lint/006_syntax_error.expected.txt
-tests/lint/006_syntax_error.x.cf
-tests/lint/007_empty_file.expected.txt
-tests/lint/007_empty_file.x.cf
-tests/lint/008_namespace.cf
-tests/lint/008_namespace.expected.txt
-tests/lint/008_namespace.x.cf
-tests/lint/009_bundle_shadows_function.cf
-tests/lint/009_bundle_shadows_function.expected.txt
-tests/lint/009_bundle_shadows_function.x.cf
-tests/lint/010_unknown_function_inside_vars.cf
-tests/lint/010_unknown_function_inside_vars.expected.txt
-tests/lint/010_unknown_function_inside_vars.x.cf
-tests/lint/011_mutually_exclusive_types_vars.cf
-tests/lint/011_mutually_exclusive_types_vars.expected.txt
-tests/lint/011_mutually_exclusive_types_vars.x.cf
-tests/lint/012_invalid_attributes.expected.txt
-tests/lint/012_invalid_attributes.x.cf
-tests/lint/013_function_call_arg_count.cf
-tests/lint/013_function_call_arg_count.expected.txt
-tests/lint/013_function_call_arg_count.x.cf
-tests/lint/014_num_args_body.expected.txt
-tests/lint/014_num_args_body.x.cf
-tests/lint/014_num_args_bundle.expected.txt
-tests/lint/014_num_args_bundle.x.cf
-tests/lint/014_num_args_bundle_body.cf
-tests/lint/015_variadic_func_arg_count.cf
-tests/lint/015_variadic_func_arg_count.expected.txt
-tests/lint/015_variadic_func_arg_count.x.cf
-tests/lint/016_macro_multi_def_bundle.cf
-tests/lint/016_macro_multi_def_bundle.expected.txt
-tests/lint/016_macro_multi_def_bundle.x.cf
-tests/lint/017_half_promises.cf
-tests/lint/017_half_promises.expected.txt
-tests/lint/017_half_promises.x.cf
-tests/lint/018_implies_body.cf
-tests/lint/018_implies_body.expected.txt
-tests/lint/018_implies_body.x.cf
-tests/lint/019_nested_calls.cf
-tests/lint/019_nested_calls.expected.txt
-tests/lint/019_nested_calls.x.cf
-tests/lint/020_bundle_name_expansion.cf
+tests/lint/002_deprecations.expected.txt
+tests/lint/002_deprecations.x.cf
+tests/lint/003_name_lowercase.cf
+tests/lint/003_name_lowercase.expected.txt
+tests/lint/003_name_lowercase.x.cf
+tests/lint/004_block_type.cf
+tests/lint/004_block_type.expected.txt
+tests/lint/004_block_type.x.cf
+tests/lint/005_syntax_error.cf
+tests/lint/005_syntax_error.expected.txt
+tests/lint/005_syntax_error.x.cf
+tests/lint/006_empty_file.expected.txt
+tests/lint/006_empty_file.x.cf
+tests/lint/007_namespace.cf
+tests/lint/007_namespace.expected.txt
+tests/lint/007_namespace.x.cf
+tests/lint/008_bundle_shadows_function.cf
+tests/lint/008_bundle_shadows_function.expected.txt
+tests/lint/008_bundle_shadows_function.x.cf
+tests/lint/009_unknown_function_inside_vars.cf
+tests/lint/009_unknown_function_inside_vars.expected.txt
+tests/lint/009_unknown_function_inside_vars.x.cf
+tests/lint/010_mutually_exclusive_types_vars.cf
+tests/lint/010_mutually_exclusive_types_vars.expected.txt
+tests/lint/010_mutually_exclusive_types_vars.x.cf
+tests/lint/011_invalid_attributes.expected.txt
+tests/lint/011_invalid_attributes.x.cf
+tests/lint/012_function_call_arg_count.cf
+tests/lint/012_function_call_arg_count.expected.txt
+tests/lint/012_function_call_arg_count.x.cf
+tests/lint/013_num_args_body.expected.txt
+tests/lint/013_num_args_body.x.cf
+tests/lint/013_num_args_bundle.expected.txt
+tests/lint/013_num_args_bundle.x.cf
+tests/lint/013_num_args_bundle_body.cf
+tests/lint/014_variadic_func_arg_count.cf
+tests/lint/014_variadic_func_arg_count.expected.txt
+tests/lint/014_variadic_func_arg_count.x.cf
+tests/lint/015_macro_multi_def_bundle.cf
+tests/lint/015_macro_multi_def_bundle.expected.txt
+tests/lint/015_macro_multi_def_bundle.x.cf
+tests/lint/016_half_promises.cf
+tests/lint/016_half_promises.expected.txt
+tests/lint/016_half_promises.x.cf
+tests/lint/017_implies_body.cf
+tests/lint/017_implies_body.expected.txt
+tests/lint/017_implies_body.x.cf
+tests/lint/018_nested_calls.cf
+tests/lint/018_nested_calls.expected.txt
+tests/lint/018_nested_calls.x.cf
+tests/lint/019_bundle_name_expansion.cf
 tests/shell/001-help.sh
 tests/shell/002-version.sh
 tests/shell/003-format.sh
 tests/shell/004-format-check.sh
+tests/shell/005-lint.sh
 tests/unit/__init__.py
 tests/unit/test_deps.py
 tests/unit/test_format.py
+tests/unit/test_lint_csv.py
 tests/unit/test_paths.py
 tests/unit/test_utils.py
 tests/unit/test_version.py

{cfengine-0.14.0 → cfengine-0.15.0}/src/cfengine_cli/lint.py

@@ -5,6 +5,7 @@ Currently implemented for:
 - *.cf (policy files)
 - cfbs.json (CFEngine Build project files)
 - *.json (basic JSON syntax checking)
+- *.csv (basic CSV syntax + RFC 4180 CRLF record terminator check)
 
 This is performed in 3 steps:
 1. Parsing - Read the .cf files and convert them into syntax trees
@@ -38,9 +39,10 @@ from tree_sitter import Language, Node, Parser, Tree
 from cfbs.validate import validate_config
 from cfbs.cfbs_config import CFBSConfig
 from cfbs.utils import find
+from cfengine_cli.lint_csv import check_csv_file
 from cfengine_cli.utils import UserError
 
-LINT_EXTENSIONS = (".cf", ".cf.sub", ".json")
+LINT_EXTENSIONS = (".cf", ".cf.sub", ".json", ".csv")
 DEFAULT_NAMESPACE = "default"
 VARS_TYPES = {
     "data",
@@ -50,6 +52,7 @@ VARS_TYPES = {
     "rlist",
     "slist",
     "string",
+    "str",  # deprecated shorthand for string
 }
 PROMISE_BLOCK_ATTRIBUTES = ("path", "interpreter")
 
@@ -583,7 +586,7 @@ def _lint_promise_guard(
     """Check that a promise type guard (e.g. `vars:`) for deprecation or unknown type."""
     assert _text(node) and len(_text(node)) > 1 and _text(node)[-1] == ":"
     promise_type = _text(node)[0:-1]
-    if promise_type in syntax_data.DEPRECATED_PROMISE_TYPES:
+    if state.strict and promise_type in syntax_data.DEPRECATED_PROMISE_TYPES:
         raise ValidationError(
             f"Deprecation: Promise type '{promise_type}' is deprecated {location}",
             node,
@@ -608,16 +611,33 @@ def _lint_block_type(node: Node, state: State, location: str, syntax_data: Synta
             f"Error: Bundle type must be one of ({', '.join(syntax_data.BUILTIN_BUNDLE_TYPES)}), not '{_text(node)}' {location}",
             node,
         )
+    if node.type == "promise_block_type" and _text(node) != "agent":
+        raise ValidationError(
+            f"Error: Promise type must be 'agent', not '{_text(node)}' {location}",
+            node,
+        )
 
 
 def _lint_block_name(node: Node, state: State, location: str, syntax_data: SyntaxData):
     """Check that a block name follows conventions and doesn't shadow a built-in."""
     assert node.type in ("bundle_block_name", "body_block_name", "promise_block_name")
 
-    if node.type == "bundle_block_name" and _text(node) != _text(node).lower():
+    if (
+        state.strict
+        and node.type == "bundle_block_name"
+        and _text(node) != _text(node).lower()
+    ):
         raise ValidationError(
             f"Convention: Bundle name should be lowercase {location}", node
         )
+    if (
+        state.strict
+        and node.type == "body_block_name"
+        and _text(node) != _text(node).lower()
+    ):
+        raise ValidationError(
+            f"Convention: Body name should be lowercase {location}", node
+        )
     if node.type == "promise_block_name" and _text(node) != _text(node).lower():
         raise ValidationError(
             f"Convention: Promise type should be lowercase {location}", node
@@ -763,11 +783,17 @@ def _lint_attribute_name(
     """Check an attribute name for deprecations and validity according to the
     surrounding promise type."""
     assert node.type == "attribute_name"
-    if _text(node) == "ifvarclass":
+    attribute_name = _text(node)
+    assert attribute_name == state.attribute_name
+    if state.strict and state.promise_type == "vars" and attribute_name == "str":
+        raise ValidationError(
+            f"Deprecation: Use 'string' instead of 'str' {location}", node
+        )
+    if state.strict and attribute_name == "ifvarclass":
         raise ValidationError(
             f"Deprecation: Use 'if' instead of 'ifvarclass' {location}", node
         )
-    if state.promise_type and state.attribute_name:
+    if state.promise_type and attribute_name:
         promise_type_data = syntax_data.BUILTIN_PROMISE_TYPES.get(
             state.promise_type, {}
         )
@@ -775,17 +801,17 @@ def _lint_attribute_name(
             # Custom promise type - we cannot validate attribute name here.
             return
         promise_type_attrs = promise_type_data.get("attributes", {})
-        if state.attribute_name not in promise_type_attrs:
+        if attribute_name not in promise_type_attrs:
             raise ValidationError(
-                f"Error: Invalid attribute '{state.attribute_name}' for promise type '{state.promise_type}' {location}",
+                f"Error: Invalid attribute '{attribute_name}' for promise type '{state.promise_type}' {location}",
                 node,
             )
-    if state.block_keyword == "promise" and state.attribute_name not in (
+    if state.block_keyword == "promise" and attribute_name not in (
         None,
         *PROMISE_BLOCK_ATTRIBUTES,
     ):
         raise ValidationError(
-            f"Error: Invalid attribute name '{state.attribute_name}' in '{state.block_name}' custom promise type definition {location}",
+            f"Error: Invalid attribute name '{attribute_name}' in '{state.block_name}' custom promise type definition {location}",
             node,
         )
 
@@ -1167,6 +1193,9 @@ def _lint_main(
         if filename.endswith(".json"):
             errors += _lint_json_selector(filename)
             continue
+        if filename.endswith(".csv"):
+            errors += _lint_csv(filename)
+            continue
         assert filename.endswith((".cf", ".cf.sub"))
         policy_file = PolicyFile(filename, snippet)
         r = _check_syntax(policy_file, state)
@@ -1304,6 +1333,19 @@ def _lint_json_selector(file: str) -> int:
     return _lint_json_plain(file)
 
 
+def _lint_csv(filename: str) -> int:
+    """Lint a CSV file: check that csv parses, and that record terminators
+    are CRLF (per RFC 4180)."""
+    assert os.path.isfile(filename)
+    problem = check_csv_file(filename)
+    r = 0
+    if problem is not None:
+        print(f"{filename}: {problem}")
+        r = 1
+    print(_pass_fail_filename(filename, r))
+    return r
+
+
 # ---------------------------------------------------------------------------
 # Syntax error detection (used by both linter and formatter)
 # ---------------------------------------------------------------------------

cfengine-0.15.0/src/cfengine_cli/lint_csv.py

@@ -0,0 +1,52 @@
+"""CSV file validation per RFC 4180.
+
+The grammar in RFC 4180 mandates CRLF between records. Bare \\r or \\n
+outside of quoted fields is not valid. Inside quoted fields, \\r and \\n
+are allowed as field content.
+"""
+
+import csv
+
+
+def check_csv_record_terminators(raw: str) -> str | None:
+    """Check that all record terminators in a CSV string are CRLF.
+
+    Returns None if all record terminators are CRLF, otherwise a short
+    description of the problem.
+    """
+    in_quotes = False
+    _prev = None
+    prev = None
+    for current in raw:
+        prev = _prev
+        _prev = current
+        if current == '"':
+            in_quotes = not in_quotes
+            continue
+        if in_quotes:
+            continue
+        if current == "\n" and prev != "\r":
+            return "bare LF outside quoted field"
+        if prev == "\r" and current != "\n":
+            return "bare CR outside quoted field"
+    if _prev == "\r" and not in_quotes:
+        return "bare CR outside quoted field"
+    return None
+
+
+def check_csv_file(filename: str) -> str | None:
+    """Check a CSV file: parses, has at least one non-empty record, and uses
+    CRLF record terminators.
+
+    Returns None if valid, otherwise a short description of the problem.
+    """
+    try:
+        with open(filename, newline="") as f:
+            raw = f.read()
+        with open(filename, newline="") as f:
+            rows = list(csv.reader(f, strict=True))
+    except (OSError, csv.Error) as e:
+        return str(e)
+    if not any(rows):
+        return "no records"
+    return check_csv_record_terminators(raw)

cfengine-0.15.0/tests/lint/002_deprecations.expected.txt

@@ -0,0 +1,17 @@
+
+{
+  defaults:
+  ^-------^
+Deprecation: Promise type 'defaults' is deprecated at tests/lint/002_deprecations.x.cf:3:3
+
+  vars:
+    "x" str => "value";
+        ^-^
+Deprecation: Use 'string' instead of 'str' at tests/lint/002_deprecations.x.cf:6:9
+
+    "Hello, CFEngine"
+      ifvarclass => "cfengine";
+      ^--------^
+Deprecation: Use 'if' instead of 'ifvarclass' at tests/lint/002_deprecations.x.cf:9:7
+FAIL: tests/lint/002_deprecations.x.cf (3 errors)
+Failure, 3 errors in total.

cfengine-0.14.0/tests/lint/002_ifvarclass.x.cf → cfengine-0.15.0/tests/lint/002_deprecations.x.cf

@@ -1,5 +1,9 @@
 bundle agent main
 {
+  defaults:
+    "x" string => "value";
+  vars:
+    "x" str => "value";
   reports:
     "Hello, CFEngine"
       ifvarclass => "cfengine";

cfengine-0.15.0/tests/lint/003_name_lowercase.cf

@@ -0,0 +1,16 @@
+bundle agent my_bundle
+{
+  reports:
+    "Hello";
+}
+
+body perms my_body
+{
+  owners => { "root" };
+}
+
+promise agent my_promise_type
+{
+  path => "/bin/true";
+  interpreter => "/bin/bash";
+}

cfengine-0.15.0/tests/lint/003_name_lowercase.expected.txt

@@ -0,0 +1,16 @@
+
+bundle agent MyBundle
+             ^------^
+Convention: Bundle name should be lowercase at tests/lint/003_name_lowercase.x.cf:1:14
+
+
+body perms MyBody
+           ^----^
+Convention: Body name should be lowercase at tests/lint/003_name_lowercase.x.cf:7:12
+
+
+promise agent MyPromiseType
+              ^-----------^
+Convention: Promise type should be lowercase at tests/lint/003_name_lowercase.x.cf:12:15
+FAIL: tests/lint/003_name_lowercase.x.cf (3 errors)
+Failure, 3 errors in total.

cfengine-0.15.0/tests/lint/003_name_lowercase.x.cf

@@ -0,0 +1,16 @@
+bundle agent MyBundle
+{
+  reports:
+    "Hello";
+}
+
+body perms MyBody
+{
+  owners => { "root" };
+}
+
+promise agent MyPromiseType
+{
+  path => "/bin/true";
+  interpreter => "/bin/bash";
+}

cfengine-0.15.0/tests/lint/004_block_type.cf

@@ -0,0 +1,11 @@
+bundle common my_bundle
+{
+  vars:
+    "x" string => "value";
+}
+
+promise agent my_promise_type
+{
+  path => "/bin/true";
+  interpreter => "/bin/bash";
+}

cfengine-0.15.0/tests/lint/004_block_type.expected.txt

@@ -0,0 +1,11 @@
+
+bundle notavalidtype my_bundle
+       ^-----------^
+Error: Bundle type must be one of (agent, common, edit_line, edit_xml, monitor, server), not 'notavalidtype' at tests/lint/004_block_type.x.cf:1:8
+
+
+promise server my_promise_type
+        ^----^
+Error: Promise type must be 'agent', not 'server' at tests/lint/004_block_type.x.cf:7:9
+FAIL: tests/lint/004_block_type.x.cf (2 errors)
+Failure, 2 errors in total.

cfengine-0.15.0/tests/lint/004_block_type.x.cf

@@ -0,0 +1,11 @@
+bundle notavalidtype my_bundle
+{
+  reports:
+    "Hello";
+}
+
+promise server my_promise_type
+{
+  path => "/bin/true";
+  interpreter => "/bin/bash";
+}

cfengine-0.15.0/tests/lint/005_syntax_error.expected.txt

@@ -0,0 +1,7 @@
+
+{
+  reports
+  ^-----^
+Error: Syntax error at tests/lint/005_syntax_error.x.cf:3:3
+FAIL: tests/lint/005_syntax_error.x.cf (1 error)
+Failure, 1 error in total.

cfengine-0.15.0/tests/lint/006_empty_file.expected.txt

@@ -0,0 +1,3 @@
+Error: Empty policy file 'tests/lint/006_empty_file.x.cf'
+FAIL: tests/lint/006_empty_file.x.cf (1 error)
+Failure, 1 error in total.

cfengine-0.14.0/tests/lint/008_namespace.expected.txt → cfengine-0.15.0/tests/lint/007_namespace.expected.txt

@@ -2,6 +2,6 @@
   methods:
     "x" usebundle => default:target("arg");
                      ^------------^
-Error: Call to unknown bundle 'default:target' at tests/lint/008_namespace.x.cf:15:22
-FAIL: tests/lint/008_namespace.x.cf (1 error)
+Error: Call to unknown bundle 'default:target' at tests/lint/007_namespace.x.cf:15:22
+FAIL: tests/lint/007_namespace.x.cf (1 error)
 Failure, 1 error in total.

cfengine-0.14.0/tests/lint/009_bundle_shadows_function.expected.txt → cfengine-0.15.0/tests/lint/008_bundle_shadows_function.expected.txt

@@ -1,6 +1,6 @@
 
 bundle agent isvariable
              ^--------^
-Error: Bundle 'isvariable' conflicts with built-in function with the same name at tests/lint/009_bundle_shadows_function.x.cf:1:14
-FAIL: tests/lint/009_bundle_shadows_function.x.cf (1 error)
+Error: Bundle 'isvariable' conflicts with built-in function with the same name at tests/lint/008_bundle_shadows_function.x.cf:1:14
+FAIL: tests/lint/008_bundle_shadows_function.x.cf (1 error)
 Failure, 1 error in total.

cfengine-0.14.0/tests/lint/010_unknown_function_inside_vars.expected.txt → cfengine-0.15.0/tests/lint/009_unknown_function_inside_vars.expected.txt

@@ -2,11 +2,11 @@
   vars:
     "x" string => target("arg");
                   ^----^
-Error: Call to unknown function 'target' inside 'vars'-promise at tests/lint/010_unknown_function_inside_vars.x.cf:16:19
+Error: Call to unknown function 'target' inside 'vars'-promise at tests/lint/009_unknown_function_inside_vars.x.cf:16:19
 
     "y"
       classes => isvariable("arg"),
                  ^--------^
-Error: 'isvariable' is not a defined body. Only bodies may be called with 'classes' at tests/lint/010_unknown_function_inside_vars.x.cf:18:18
-FAIL: tests/lint/010_unknown_function_inside_vars.x.cf (2 errors)
+Error: 'isvariable' is not a defined body. Only bodies may be called with 'classes' at tests/lint/009_unknown_function_inside_vars.x.cf:18:18
+FAIL: tests/lint/009_unknown_function_inside_vars.x.cf (2 errors)
 Failure, 2 errors in total.

cfengine-0.14.0/tests/lint/011_mutually_exclusive_types_vars.expected.txt → cfengine-0.15.0/tests/lint/010_mutually_exclusive_types_vars.expected.txt

@@ -2,11 +2,11 @@
       policy => "free",
       real => "0.5";
       ^--^
-Error: Mutually exclusive attribute values (slist, int, real) for a single promiser inside vars-promise at tests/lint/011_mutually_exclusive_types_vars.x.cf:4:5
+Error: Mutually exclusive attribute values (slist, int, real) for a single promiser inside vars-promise at tests/lint/010_mutually_exclusive_types_vars.x.cf:4:5
 
 
     "missing-error";
     ^--------------^
-Error: Missing value for vars promise "missing-error" at tests/lint/011_mutually_exclusive_types_vars.x.cf:16:5
-FAIL: tests/lint/011_mutually_exclusive_types_vars.x.cf (2 errors)
+Error: Missing value for vars promise "missing-error" at tests/lint/010_mutually_exclusive_types_vars.x.cf:16:5
+FAIL: tests/lint/010_mutually_exclusive_types_vars.x.cf (2 errors)
 Failure, 2 errors in total.

cfengine-0.14.0/tests/lint/012_invalid_attributes.expected.txt → cfengine-0.15.0/tests/lint/011_invalid_attributes.expected.txt

@@ -2,11 +2,11 @@
   path => "/var/cfengine/inputs/modules/promises/git.py";
   blah => "something";
   ^--^
-Error: Invalid attribute name 'blah' in 'git' custom promise type definition at tests/lint/012_invalid_attributes.x.cf:5:3
+Error: Invalid attribute name 'blah' in 'git' custom promise type definition at tests/lint/011_invalid_attributes.x.cf:5:3
 
       slist => {},
       bar => "";
       ^-^
-Error: Invalid attribute 'bar' for promise type 'vars' at tests/lint/012_invalid_attributes.x.cf:12:7
-FAIL: tests/lint/012_invalid_attributes.x.cf (2 errors)
+Error: Invalid attribute 'bar' for promise type 'vars' at tests/lint/011_invalid_attributes.x.cf:12:7
+FAIL: tests/lint/011_invalid_attributes.x.cf (2 errors)
 Failure, 2 errors in total.

cfengine-0.14.0/tests/lint/013_function_call_arg_count.expected.txt → cfengine-0.15.0/tests/lint/012_function_call_arg_count.expected.txt

@@ -2,11 +2,11 @@
   "string1"
     string => canonify();
               ^--------^
-Error: Expected 1 arguments, received 0 for function 'canonify' at tests/lint/013_function_call_arg_count.x.cf:5:15
+Error: Expected 1 arguments, received 0 for function 'canonify' at tests/lint/012_function_call_arg_count.x.cf:5:15
 
   "string3"
     string => canonify("test", "test");
               ^----------------------^
-Error: Expected 1 arguments, received 2 for function 'canonify' at tests/lint/013_function_call_arg_count.x.cf:9:15
-FAIL: tests/lint/013_function_call_arg_count.x.cf (2 errors)
+Error: Expected 1 arguments, received 2 for function 'canonify' at tests/lint/012_function_call_arg_count.x.cf:9:15
+FAIL: tests/lint/012_function_call_arg_count.x.cf (2 errors)
 Failure, 2 errors in total.

cfengine-0.14.0/tests/lint/014_num_args_body.expected.txt → cfengine-0.15.0/tests/lint/013_num_args_body.expected.txt

@@ -2,19 +2,19 @@
       create => "true",
       perms => mog("644");
                ^--------^
-Error: Expected 3 arguments, received 1 for body 'mog' at tests/lint/014_num_args_body.x.cf:13:16
-Hint: The body 'mog' is defined at tests/lint/014_num_args_body.x.cf:1:12
+Error: Expected 3 arguments, received 1 for body 'mog' at tests/lint/013_num_args_body.x.cf:13:16
+Hint: The body 'mog' is defined at tests/lint/013_num_args_body.x.cf:1:12
 
       create => "true",
       perms => mog("644", "root");
                ^----------------^
-Error: Expected 3 arguments, received 2 for body 'mog' at tests/lint/014_num_args_body.x.cf:16:16
-Hint: The body 'mog' is defined at tests/lint/014_num_args_body.x.cf:1:12
+Error: Expected 3 arguments, received 2 for body 'mog' at tests/lint/013_num_args_body.x.cf:16:16
+Hint: The body 'mog' is defined at tests/lint/013_num_args_body.x.cf:1:12
 
       create => "true",
       perms => mog("644", "root", "root", "root");
                ^--------------------------------^
-Error: Expected 3 arguments, received 4 for body 'mog' at tests/lint/014_num_args_body.x.cf:22:16
-Hint: The body 'mog' is defined at tests/lint/014_num_args_body.x.cf:1:12
-FAIL: tests/lint/014_num_args_body.x.cf (3 errors)
+Error: Expected 3 arguments, received 4 for body 'mog' at tests/lint/013_num_args_body.x.cf:22:16
+Hint: The body 'mog' is defined at tests/lint/013_num_args_body.x.cf:1:12
+FAIL: tests/lint/013_num_args_body.x.cf (3 errors)
 Failure, 3 errors in total.