From 8ec05197400d198372d40a522102235536089a63 Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Mon, 24 Jan 2022 12:30:53 -0600 Subject: [PATCH] Move ansiblelint.testing.RunFromText import into test code (#1827) --- src/ansiblelint/rules/ComparisonToEmptyStringRule.py | 3 ++- src/ansiblelint/rules/FQCNBuiltinsRule.py | 3 ++- src/ansiblelint/rules/IgnoreErrorsRule.py | 3 ++- src/ansiblelint/rules/MissingFilePermissionsRule.py | 3 ++- src/ansiblelint/rules/NoLogPasswordsRule.py | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/ansiblelint/rules/ComparisonToEmptyStringRule.py b/src/ansiblelint/rules/ComparisonToEmptyStringRule.py index da89415eb6..57e42ac0b6 100644 --- a/src/ansiblelint/rules/ComparisonToEmptyStringRule.py +++ b/src/ansiblelint/rules/ComparisonToEmptyStringRule.py @@ -6,7 +6,6 @@ from typing import TYPE_CHECKING, Any, Dict, Union from ansiblelint.rules import AnsibleLintRule -from ansiblelint.testing import RunFromText from ansiblelint.yaml_utils import nested_items_path if TYPE_CHECKING: @@ -53,6 +52,8 @@ def matchtask( import pytest + from ansiblelint.testing import RunFromText # pylint: disable=ungrouped-imports + SUCCESS_PLAY = ''' - hosts: all tasks: diff --git a/src/ansiblelint/rules/FQCNBuiltinsRule.py b/src/ansiblelint/rules/FQCNBuiltinsRule.py index 520e180485..3d43381bce 100644 --- a/src/ansiblelint/rules/FQCNBuiltinsRule.py +++ b/src/ansiblelint/rules/FQCNBuiltinsRule.py @@ -4,7 +4,6 @@ from ansiblelint.file_utils import Lintable from ansiblelint.rules import AnsibleLintRule -from ansiblelint.testing import RunFromText builtins = [ "add_host", @@ -98,6 +97,8 @@ def matchtask( import pytest + from ansiblelint.testing import RunFromText # pylint: disable=ungrouped-imports + SUCCESS_PLAY = ''' - hosts: localhost tasks: diff --git a/src/ansiblelint/rules/IgnoreErrorsRule.py b/src/ansiblelint/rules/IgnoreErrorsRule.py index 78cdb48177..c275ad2e5a 100644 --- a/src/ansiblelint/rules/IgnoreErrorsRule.py +++ b/src/ansiblelint/rules/IgnoreErrorsRule.py @@ -3,7 +3,6 @@ from typing import TYPE_CHECKING, Any, Dict, Union from ansiblelint.rules import AnsibleLintRule -from ansiblelint.testing import RunFromText if TYPE_CHECKING: from typing import Optional @@ -44,6 +43,8 @@ def matchtask( if "pytest" in sys.modules: import pytest + from ansiblelint.testing import RunFromText # pylint: disable=ungrouped-imports + IGNORE_ERRORS_TRUE = ''' - hosts: all tasks: diff --git a/src/ansiblelint/rules/MissingFilePermissionsRule.py b/src/ansiblelint/rules/MissingFilePermissionsRule.py index 512f0b0c75..42997877a8 100644 --- a/src/ansiblelint/rules/MissingFilePermissionsRule.py +++ b/src/ansiblelint/rules/MissingFilePermissionsRule.py @@ -22,7 +22,6 @@ from typing import TYPE_CHECKING, Any, Dict, Set, Union from ansiblelint.rules import AnsibleLintRule -from ansiblelint.testing import RunFromText if TYPE_CHECKING: from typing import Optional @@ -126,6 +125,8 @@ def matchtask( if "pytest" in sys.modules: # noqa: C901 import pytest + from ansiblelint.testing import RunFromText # pylint: disable=ungrouped-imports + SUCCESS_PERMISSIONS_PRESENT = ''' - hosts: all tasks: diff --git a/src/ansiblelint/rules/NoLogPasswordsRule.py b/src/ansiblelint/rules/NoLogPasswordsRule.py index 6be0fbaa86..66ec86865d 100644 --- a/src/ansiblelint/rules/NoLogPasswordsRule.py +++ b/src/ansiblelint/rules/NoLogPasswordsRule.py @@ -17,7 +17,6 @@ from typing import TYPE_CHECKING, Any, Dict, Union from ansiblelint.rules import AnsibleLintRule -from ansiblelint.testing import RunFromText from ansiblelint.utils import convert_to_boolean if TYPE_CHECKING: @@ -73,6 +72,8 @@ def matchtask( if "pytest" in sys.modules: import pytest + from ansiblelint.testing import RunFromText # pylint: disable=ungrouped-imports + NO_LOG_UNUSED = ''' - hosts: all tasks: