Skip to content
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.

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

ansible-test - Clean up indentation and spaces #79980

Merged
merged 1 commit into from Feb 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions test/lib/ansible_test/_internal/ansible_util.py
Expand Up @@ -284,11 +284,11 @@ def get_collection_detail(python: PythonConfig) -> CollectionDetail:


def run_playbook(
args: EnvironmentConfig,
inventory_path: str,
playbook: str,
capture: bool,
variables: t.Optional[dict[str, t.Any]] = None,
args: EnvironmentConfig,
inventory_path: str,
playbook: str,
capture: bool,
variables: t.Optional[dict[str, t.Any]] = None,
) -> None:
"""Run the specified playbook using the given inventory file and playbook variables."""
playbook_path = os.path.join(ANSIBLE_TEST_DATA_ROOT, 'playbooks', playbook)
Expand Down
54 changes: 27 additions & 27 deletions test/lib/ansible_test/_internal/classification/__init__.py
Expand Up @@ -379,9 +379,9 @@ def _classify_common(self, path: str) -> t.Optional[dict[str, str]]:
if is_subdir(path, data_context().content.integration_path):
if dirname == data_context().content.integration_path:
for command in (
'integration',
'windows-integration',
'network-integration',
'integration',
'windows-integration',
'network-integration',
):
if name == command and ext == '.cfg':
return {
Expand Down Expand Up @@ -641,19 +641,19 @@ def _classify_collection(self, path: str) -> t.Optional[dict[str, str]]:

if '/' not in path:
if path in (
'.gitignore',
'COPYING',
'LICENSE',
'Makefile',
'.gitignore',
'COPYING',
'LICENSE',
'Makefile',
):
return minimal

if ext in (
'.in',
'.md',
'.rst',
'.toml',
'.txt',
'.in',
'.md',
'.rst',
'.toml',
'.txt',
):
return minimal

Expand Down Expand Up @@ -757,17 +757,17 @@ def _classify_ansible(self, path: str) -> t.Optional[dict[str, str]]:

if path.startswith('test/lib/ansible_test/_data/requirements/'):
if name in (
'integration',
'network-integration',
'windows-integration',
'integration',
'network-integration',
'windows-integration',
):
return {
name: self.integration_all_target,
}

if name in (
'sanity',
'units',
'sanity',
'units',
):
return {
name: 'all',
Expand Down Expand Up @@ -826,11 +826,11 @@ def _classify_ansible(self, path: str) -> t.Optional[dict[str, str]]:

if '/' not in path:
if path in (
'.gitattributes',
'.gitignore',
'.mailmap',
'COPYING',
'Makefile',
'.gitattributes',
'.gitignore',
'.mailmap',
'COPYING',
'Makefile',
):
return minimal

Expand All @@ -840,11 +840,11 @@ def _classify_ansible(self, path: str) -> t.Optional[dict[str, str]]:
return all_tests(self.args) # broad impact, run all tests

if ext in (
'.in',
'.md',
'.rst',
'.toml',
'.txt',
'.in',
'.md',
'.rst',
'.toml',
'.txt',
):
return minimal

Expand Down
46 changes: 23 additions & 23 deletions test/lib/ansible_test/_internal/cli/argparsing/__init__.py
Expand Up @@ -40,11 +40,11 @@ def __init__(self, *args, **kwargs) -> None:
self.registered_completions: t.Optional[list[str]] = None

def completer(
self,
prefix: str,
action: argparse.Action,
parsed_args: argparse.Namespace,
**kwargs,
self,
prefix: str,
action: argparse.Action,
parsed_args: argparse.Namespace,
**kwargs,
) -> list[str]:
"""
Return a list of completions for the specified prefix and action.
Expand All @@ -63,10 +63,10 @@ def completer(

@abc.abstractmethod
def get_completions(
self,
prefix: str,
action: argparse.Action,
parsed_args: argparse.Namespace,
self,
prefix: str,
action: argparse.Action,
parsed_args: argparse.Namespace,
) -> list[str]:
"""
Return a list of completions for the specified prefix and action.
Expand All @@ -89,9 +89,9 @@ class CompositeAction(argparse.Action, metaclass=abc.ABCMeta):
documentation_state: dict[t.Type[CompositeAction], DocumentationState] = {}

def __init__(
self,
*args,
**kwargs,
self,
*args,
**kwargs,
):
self.definition = self.create_parser()
self.documentation_state[type(self)] = documentation_state = DocumentationState()
Expand All @@ -108,11 +108,11 @@ def create_parser(self) -> NamespaceParser:
"""Return a namespace parser to parse the argument associated with this action."""

def __call__(
self,
parser,
namespace,
values,
option_string=None,
self,
parser,
namespace,
values,
option_string=None,
):
state = ParserState(mode=ParserMode.PARSE, namespaces=[namespace], remainder=values)

Expand All @@ -135,10 +135,10 @@ def __call__(
class CompositeActionCompletionFinder(RegisteredCompletionFinder):
"""Completion finder with support for composite argument parsing."""
def get_completions(
self,
prefix: str,
action: argparse.Action,
parsed_args: argparse.Namespace,
self,
prefix: str,
action: argparse.Action,
parsed_args: argparse.Namespace,
) -> list[str]:
"""Return a list of completions appropriate for the given prefix and action, taking into account the arguments that have already been parsed."""
assert isinstance(action, CompositeAction)
Expand Down Expand Up @@ -232,8 +232,8 @@ def detect_false_file_completion(value: str, mode: ParserMode) -> bool:


def complete(
completer: Parser,
state: ParserState,
completer: Parser,
state: ParserState,
) -> Completion:
"""Perform argument completion using the given completer and return the completion result."""
value = state.remainder
Expand Down
4 changes: 2 additions & 2 deletions test/lib/ansible_test/_internal/cli/commands/__init__.py
Expand Up @@ -44,8 +44,8 @@


def do_commands(
parent: argparse.ArgumentParser,
completer: CompositeActionCompletionFinder,
parent: argparse.ArgumentParser,
completer: CompositeActionCompletionFinder,
) -> None:
"""Command line parsing for all commands."""
common = argparse.ArgumentParser(add_help=False)
Expand Down
Expand Up @@ -37,9 +37,9 @@


def do_coverage(
subparsers,
parent: argparse.ArgumentParser,
completer: CompositeActionCompletionFinder,
subparsers,
parent: argparse.ArgumentParser,
completer: CompositeActionCompletionFinder,
) -> None:
"""Command line parsing for all `coverage` commands."""
coverage_common = argparse.ArgumentParser(add_help=False, parents=[parent])
Expand All @@ -61,7 +61,7 @@ def do_coverage(


def add_coverage_common(
parser: argparse.ArgumentParser,
parser: argparse.ArgumentParser,
):
"""Add common coverage arguments."""
parser.add_argument(
Expand Down
Expand Up @@ -13,9 +13,9 @@


def do_analyze(
subparsers,
parent: argparse.ArgumentParser,
completer: CompositeActionCompletionFinder,
subparsers,
parent: argparse.ArgumentParser,
completer: CompositeActionCompletionFinder,
) -> None:
"""Command line parsing for all `coverage analyze` commands."""
parser: argparse.ArgumentParser = subparsers.add_parser(
Expand Down
Expand Up @@ -29,9 +29,9 @@


def do_targets(
subparsers,
parent: argparse.ArgumentParser,
completer: CompositeActionCompletionFinder,
subparsers,
parent: argparse.ArgumentParser,
completer: CompositeActionCompletionFinder,
) -> None:
"""Command line parsing for all `coverage analyze targets` commands."""
targets = subparsers.add_parser(
Expand Down
Expand Up @@ -17,9 +17,9 @@


def do_combine(
subparsers,
parent: argparse.ArgumentParser,
completer: CompositeActionCompletionFinder,
subparsers,
parent: argparse.ArgumentParser,
completer: CompositeActionCompletionFinder,
):
"""Command line parsing for the `coverage analyze targets combine` command."""
parser: argparse.ArgumentParser = subparsers.add_parser(
Expand Down
Expand Up @@ -17,9 +17,9 @@


def do_expand(
subparsers,
parent: argparse.ArgumentParser,
completer: CompositeActionCompletionFinder,
subparsers,
parent: argparse.ArgumentParser,
completer: CompositeActionCompletionFinder,
):
"""Command line parsing for the `coverage analyze targets expand` command."""
parser: argparse.ArgumentParser = subparsers.add_parser(
Expand Down
Expand Up @@ -17,9 +17,9 @@


def do_filter(
subparsers,
parent: argparse.ArgumentParser,
completer: CompositeActionCompletionFinder,
subparsers,
parent: argparse.ArgumentParser,
completer: CompositeActionCompletionFinder,
):
"""Command line parsing for the `coverage analyze targets filter` command."""
parser: argparse.ArgumentParser = subparsers.add_parser(
Expand Down
Expand Up @@ -17,9 +17,9 @@


def do_generate(
subparsers,
parent: argparse.ArgumentParser,
completer: CompositeActionCompletionFinder,
subparsers,
parent: argparse.ArgumentParser,
completer: CompositeActionCompletionFinder,
):
"""Command line parsing for the `coverage analyze targets generate` command."""
parser: argparse.ArgumentParser = subparsers.add_parser(
Expand Down
Expand Up @@ -17,9 +17,9 @@


def do_missing(
subparsers,
parent: argparse.ArgumentParser,
completer: CompositeActionCompletionFinder,
subparsers,
parent: argparse.ArgumentParser,
completer: CompositeActionCompletionFinder,
):
"""Command line parsing for the `coverage analyze targets missing` command."""
parser: argparse.ArgumentParser = subparsers.add_parser(
Expand Down
Expand Up @@ -19,10 +19,10 @@


def do_combine(
subparsers,
parent: argparse.ArgumentParser,
add_coverage_common: c.Callable[[argparse.ArgumentParser], None],
completer: CompositeActionCompletionFinder,
subparsers,
parent: argparse.ArgumentParser,
add_coverage_common: c.Callable[[argparse.ArgumentParser], None],
completer: CompositeActionCompletionFinder,
) -> None:
"""Command line parsing for the `coverage combine` command."""
parser: argparse.ArgumentParser = subparsers.add_parser(
Expand Down
Expand Up @@ -17,9 +17,9 @@


def do_erase(
subparsers,
parent: argparse.ArgumentParser,
completer: CompositeActionCompletionFinder,
subparsers,
parent: argparse.ArgumentParser,
completer: CompositeActionCompletionFinder,
) -> None:
"""Command line parsing for the `coverage erase` command."""
parser: argparse.ArgumentParser = subparsers.add_parser(
Expand Down
8 changes: 4 additions & 4 deletions test/lib/ansible_test/_internal/cli/commands/coverage/html.py
Expand Up @@ -19,10 +19,10 @@


def do_html(
subparsers,
parent: argparse.ArgumentParser,
add_coverage_common: c.Callable[[argparse.ArgumentParser], None],
completer: CompositeActionCompletionFinder,
subparsers,
parent: argparse.ArgumentParser,
add_coverage_common: c.Callable[[argparse.ArgumentParser], None],
completer: CompositeActionCompletionFinder,
) -> None:
"""Command line parsing for the `coverage html` command."""
parser: argparse.ArgumentParser = subparsers.add_parser(
Expand Down
Expand Up @@ -19,10 +19,10 @@


def do_report(
subparsers,
parent: argparse.ArgumentParser,
add_coverage_common: c.Callable[[argparse.ArgumentParser], None],
completer: CompositeActionCompletionFinder,
subparsers,
parent: argparse.ArgumentParser,
add_coverage_common: c.Callable[[argparse.ArgumentParser], None],
completer: CompositeActionCompletionFinder,
) -> None:
"""Command line parsing for the `coverage report` command."""
parser: argparse.ArgumentParser = subparsers.add_parser(
Expand Down