Merging upstream version 0.1.29.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 5 insertions, 195 deletions

diff --git a/tests/lint_tests/test_lint_changelog.py b/tests/lint_tests/test_lint_changelog.py
index 25dac0e..258c2fe 100644
--- a/tests/lint_tests/test_lint_changelog.py
+++ b/tests/lint_tests/test_lint_changelog.py
@@ -1,17 +1,11 @@
 import textwrap
-from typing import List, Optional
 
 import pytest
 
 from debputy.lsp.lsp_debian_changelog import _lint_debian_changelog
-from debputy.lsp.lsp_debian_control import _lint_debian_control
 from debputy.packages import DctrlParser
 from debputy.plugin.api.feature_set import PluginProvidedFeatureSet
-from lint_tests.lint_tutil import (
-    group_diagnostics_by_severity,
-    requires_levenshtein,
-    LintWrapper,
-)
+from lint_tests.lint_tutil import LintWrapper
 
 try:
     from lsprotocol.types import Diagnostic, DiagnosticSeverity
@@ -60,7 +54,7 @@ def test_dctrl_lint(line_linter: LintWrapper) -> None:
     
     Package: something-else
     """
-    )
+    ).splitlines(keepends=True)
 
     diagnostics = line_linter(lines)
     print(diagnostics)
@@ -73,7 +67,7 @@ def test_dctrl_lint(line_linter: LintWrapper) -> None:
 
     Package: something-else
     """
-    )
+    ).splitlines(keepends=True)
 
     diagnostics = line_linter(lines)
     print(diagnostics)
diff --git a/tests/lint_tests/test_lint_dctrl.py b/tests/lint_tests/test_lint_dctrl.py
index e9a5756..ce34d7c 100644
--- a/tests/lint_tests/test_lint_dctrl.py
+++ b/tests/lint_tests/test_lint_dctrl.py
@@ -153,6 +153,7 @@ def test_dctrl_lint_mx_value_with_typo(line_linter: LintWrapper) -> None:
 
     diagnostics = line_linter(lines)
     print(diagnostics)
+    assert diagnostics is not None
     assert len(diagnostics) == 2
     by_severity = group_diagnostics_by_severity(diagnostics)
     assert DiagnosticSeverity.Error in by_severity
diff --git a/tests/lint_tests/test_lint_debputy.py b/tests/lint_tests/test_lint_debputy.py
index 9c30392..8e405f8 100644
--- a/tests/lint_tests/test_lint_debputy.py
+++ b/tests/lint_tests/test_lint_debputy.py
@@ -1,187 +1,4 @@
-from typing import List, Optional, Callable
-
-import pytest
-
-from debputy.packages import DctrlParser
-from debputy.plugin.api.feature_set import PluginProvidedFeatureSet
-from lint_tests.lint_tutil import (
-    requires_levenshtein,
-    LintWrapper,
-)
-
-try:
-    from lsprotocol.types import Diagnostic, DiagnosticSeverity
-except ImportError:
-    pass
-
-
-@pytest.fixture
-def line_linter(
-    debputy_plugin_feature_set: PluginProvidedFeatureSet,
-    lint_dctrl_parser: DctrlParser,
-) -> LintWrapper:
-    return LintWrapper(
-        "/nowhere/debian/debputy.manifest",
-        _lint_debian_debputy_manifest,
-        debputy_plugin_feature_set,
-        lint_dctrl_parser,
-    )
-
-
-def test_debputy_lint_unknown_keys(line_linter: LintWrapper) -> None:
-    lines = textwrap.dedent(
-        """\
-    manifest-version: 0.1
-    installations:
-    - install-something:
-        sources:
-        - abc
-        - def
-    - install-docs:
-        source: foo
-        puff: true   # Unknown keyword (assuming install-docs)
-        when:
-          negated: cross-compiling
-    - install-docs:
-        source: bar
-        when: ross-compiling  # Typo of "cross-compiling"; FIXME not caught
-    packages:
-      foo:
-        blah: qwe    # Unknown keyword
-    """
-    ).splitlines(keepends=True)
-
-    diagnostics = line_linter(lines)
-    by_severity = group_diagnostics_by_severity(diagnostics)
-    # This example triggers errors only
-    assert DiagnosticSeverity.Error in by_severity
-
-    assert DiagnosticSeverity.Warning not in by_severity
-    assert DiagnosticSeverity.Hint not in by_severity
-    assert DiagnosticSeverity.Information not in by_severity
-
-    errors = by_severity[DiagnosticSeverity.Error]
-    print(errors)
-    assert len(errors) == 4
-
-    first_error, second_error, third_error, fourth_error = errors
-
-    msg = 'Unknown or unsupported key "install-something".'
-    assert first_error.message == msg
-    assert f"{first_error.range}" == "2:2-2:19"
-
-    msg = 'Unknown or unsupported key "puff".'
-    assert second_error.message == msg
-    assert f"{second_error.range}" == "8:4-8:8"
-
-    msg = 'Unknown or unsupported key "negated".'
-    assert third_error.message == msg
-    assert f"{third_error.range}" == "10:6-10:13"
-
-    msg = 'Unknown or unsupported key "blah".'
-    assert fourth_error.message == msg
-    assert f"{fourth_error.range}" == "16:4-16:8"
-
-
-@requires_levenshtein
-def test_debputy_lint_unknown_keys_spelling(line_linter: LintWrapper) -> None:
-    lines = textwrap.dedent(
-        """\
-    manifest-version: 0.1
-    installations:
-    - install-dcoss:  # typo
-        sources:
-        - abc
-        - def
-        puff: true   # Unknown keyword (assuming install-docs)
-        when:
-          nut: cross-compiling  # Typo of "not"
-    - install-docs:
-        source: bar
-        when: ross-compiling  # Typo of "cross-compiling"; FIXME not caught
-    """
-    ).splitlines(keepends=True)
-
-    diagnostics = line_linter(lines)
-    by_severity = group_diagnostics_by_severity(diagnostics)
-    # This example triggers errors only
-    assert DiagnosticSeverity.Error in by_severity
-
-    assert DiagnosticSeverity.Warning not in by_severity
-    assert DiagnosticSeverity.Hint not in by_severity
-    assert DiagnosticSeverity.Information not in by_severity
-
-    errors = by_severity[DiagnosticSeverity.Error]
-    print(errors)
-    assert len(errors) == 3
-
-    first_error, second_error, third_error = errors
-
-    msg = 'Unknown or unsupported key "install-dcoss". It looks like a typo of "install-docs".'
-    assert first_error.message == msg
-    assert f"{first_error.range}" == "2:2-2:15"
-
-    msg = 'Unknown or unsupported key "puff".'
-    assert second_error.message == msg
-    assert f"{second_error.range}" == "6:4-6:8"
-
-    msg = 'Unknown or unsupported key "nut". It looks like a typo of "not".'
-    assert third_error.message == msg
-    assert f"{third_error.range}" == "8:6-8:9"
-
-
-def test_debputy_lint_conflicting_keys(line_linter: LintWrapper) -> None:
-    lines = textwrap.dedent(
-        """\
-    manifest-version: 0.1
-    installations:
-    - install-docs:
-        sources:
-        - foo
-        - bar
-        as: baz      # Conflicts with "sources" (#85)
-    - install:
-        source: foo
-        sources:     # Conflicts with "source" (#85)
-        - bar
-        - baz
-    """
-    ).splitlines(keepends=True)
-
-    diagnostics = line_linter(lines)
-    by_severity = group_diagnostics_by_severity(diagnostics)
-    # This example triggers errors only
-    assert DiagnosticSeverity.Error in by_severity
-
-    assert DiagnosticSeverity.Warning not in by_severity
-    assert DiagnosticSeverity.Hint not in by_severity
-    assert DiagnosticSeverity.Information not in by_severity
-
-    errors = by_severity[DiagnosticSeverity.Error]
-    print(errors)
-    assert len(errors) == 4
-
-    first_error, second_error, third_error, fourth_error = errors
-
-    msg = 'The "sources" cannot be used with "as".'
-    assert first_error.message == msg
-    assert f"{first_error.range}" == "3:4-3:11"
-
-    msg = 'The "as" cannot be used with "sources".'
-    assert second_error.message == msg
-    assert f"{second_error.range}" == "6:4-6:6"
-
-    msg = 'The "source" cannot be used with "sources".'
-    assert third_error.message == msg
-    assert f"{third_error.range}" == "8:4-8:10"
-
-    msg = 'The "sources" cannot be used with "source".'
-    assert fourth_error.message == msg
-    assert f"{fourth_error.range}" == "9:4-9:11"
-
-
 import textwrap
-from typing import List, Optional, Callable
 
 import pytest
 
@@ -189,9 +6,9 @@ from debputy.lsp.lsp_debian_debputy_manifest import _lint_debian_debputy_manifes
 from debputy.packages import DctrlParser
 from debputy.plugin.api.feature_set import PluginProvidedFeatureSet
 from lint_tests.lint_tutil import (
-    group_diagnostics_by_severity,
     requires_levenshtein,
     LintWrapper,
+    group_diagnostics_by_severity,
 )
 
 try:
@@ -199,8 +16,6 @@ try:
 except ImportError:
     pass
 
-TestLintWrapper = Callable[[List[str]], Optional[List["Diagnostic"]]]
-
 
 @pytest.fixture
 def line_linter(