ansible-core 2.15.4rc1__py3-none-any.whl → 2.16.0b2__py3-none-any.whl

ansible_test/_internal/commands/units/__init__.py

@@ -253,7 +253,6 @@ def command_units(args: UnitsConfig) -> None:
 
         cmd = [
             'pytest',
-            '--forked',
             '-r', 'a',
             '-n', str(args.num_workers) if args.num_workers else 'auto',
             '--color', 'yes' if args.color else 'no',
@@ -275,6 +274,8 @@ def command_units(args: UnitsConfig) -> None:
         if data_context().content.collection:
             plugins.append('ansible_pytest_collections')
 
+        plugins.append('ansible_forked')
+
         if plugins:
             env['PYTHONPATH'] += ':%s' % os.path.join(ANSIBLE_TEST_TARGET_ROOT, 'pytest/plugins')
             env['PYTEST_PLUGINS'] = ','.join(plugins)

ansible_test/_internal/config.py

@@ -8,7 +8,6 @@ import sys
 import typing as t
 
 from .util import (
-    display,
     verify_sys_executable,
     version_to_str,
     type_guard,
@@ -136,12 +135,6 @@ class EnvironmentConfig(CommonConfig):
 
         data_context().register_payload_callback(host_callback)
 
-        if args.docker_no_pull:
-            display.warning('The --docker-no-pull option is deprecated and has no effect. It will be removed in a future version of ansible-test.')
-
-        if args.no_pip_check:
-            display.warning('The --no-pip-check option is deprecated and has no effect. It will be removed in a future version of ansible-test.')
-
     @property
     def controller(self) -> ControllerHostConfig:
         """Host configuration for the controller."""

ansible_test/_internal/containers.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 
 import collections.abc as c
 import contextlib
-import enum
 import json
 import random
 import time
@@ -46,6 +45,7 @@ from .docker_util import (
     get_docker_container_id,
     get_docker_host_ip,
     get_podman_host_ip,
+    get_session_container_name,
     require_docker,
     detect_host_properties,
 )
@@ -101,14 +101,6 @@ class HostType:
     managed = 'managed'
 
 
-class CleanupMode(enum.Enum):
-    """How container cleanup should be handled."""
-
-    YES = enum.auto()
-    NO = enum.auto()
-    INFO = enum.auto()
-
-
 def run_support_container(
     args: EnvironmentConfig,
     context: str,
@@ -117,8 +109,7 @@ def run_support_container(
     ports: list[int],
     aliases: t.Optional[list[str]] = None,
     start: bool = True,
-    allow_existing: bool = False,
-    cleanup: t.Optional[CleanupMode] = None,
+    cleanup: bool = True,
     cmd: t.Optional[list[str]] = None,
     env: t.Optional[dict[str, str]] = None,
     options: t.Optional[list[str]] = None,
@@ -128,6 +119,8 @@ def run_support_container(
     Start a container used to support tests, but not run them.
     Containers created this way will be accessible from tests.
     """
+    name = get_session_container_name(args, name)
+
     if args.prime_containers:
         docker_pull(args, image)
         return None
@@ -165,46 +158,13 @@ def run_support_container(
 
     options.extend(['--ulimit', 'nofile=%s' % max_open_files])
 
-    support_container_id = None
-
-    if allow_existing:
-        try:
-            container = docker_inspect(args, name)
-        except ContainerNotFoundError:
-            container = None
-
-        if container:
-            support_container_id = container.id
-
-            if not container.running:
-                display.info('Ignoring existing "%s" container which is not running.' % name, verbosity=1)
-                support_container_id = None
-            elif not container.image:
-                display.info('Ignoring existing "%s" container which has the wrong image.' % name, verbosity=1)
-                support_container_id = None
-            elif publish_ports and not all(port and len(port) == 1 for port in [container.get_tcp_port(port) for port in ports]):
-                display.info('Ignoring existing "%s" container which does not have the required published ports.' % name, verbosity=1)
-                support_container_id = None
-
-            if not support_container_id:
-                docker_rm(args, name)
-
     if args.dev_systemd_debug:
         options.extend(('--env', 'SYSTEMD_LOG_LEVEL=debug'))
 
-    if support_container_id:
-        display.info('Using existing "%s" container.' % name)
-        running = True
-        existing = True
-    else:
-        display.info('Starting new "%s" container.' % name)
-        docker_pull(args, image)
-        support_container_id = run_container(args, image, name, options, create_only=not start, cmd=cmd)
-        running = start
-        existing = False
-
-    if cleanup is None:
-        cleanup = CleanupMode.INFO if existing else CleanupMode.YES
+    display.info('Starting new "%s" container.' % name)
+    docker_pull(args, image)
+    support_container_id = run_container(args, image, name, options, create_only=not start, cmd=cmd)
+    running = start
 
     descriptor = ContainerDescriptor(
         image,
@@ -215,7 +175,6 @@ def run_support_container(
         aliases,
         publish_ports,
         running,
-        existing,
         cleanup,
         env,
     )
@@ -694,8 +653,7 @@ class ContainerDescriptor:
         aliases: list[str],
         publish_ports: bool,
         running: bool,
-        existing: bool,
-        cleanup: CleanupMode,
+        cleanup: bool,
         env: t.Optional[dict[str, str]],
     ) -> None:
         self.image = image
@@ -706,7 +664,6 @@ class ContainerDescriptor:
         self.aliases = aliases
         self.publish_ports = publish_ports
         self.running = running
-        self.existing = existing
         self.cleanup = cleanup
         self.env = env
         self.details: t.Optional[SupportContainer] = None
@@ -805,10 +762,8 @@ def wait_for_file(
 def cleanup_containers(args: EnvironmentConfig) -> None:
     """Clean up containers."""
     for container in support_containers.values():
-        if container.cleanup == CleanupMode.YES:
-            docker_rm(args, container.container_id)
-        elif container.cleanup == CleanupMode.INFO:
-            display.notice(f'Remember to run `{require_docker().command} rm -f {container.name}` when finished testing.')
+        if container.cleanup:
+            docker_rm(args, container.name)
 
 
 def create_hosts_entries(context: dict[str, ContainerAccess]) -> list[str]:

ansible_test/_internal/core_ci.py

@@ -28,7 +28,6 @@ from .io import (
 from .util import (
     ApplicationError,
     display,
-    ANSIBLE_TEST_TARGET_ROOT,
     mutex,
 )
 
@@ -292,18 +291,12 @@ class AnsibleCoreCI:
         """Start instance."""
         display.info(f'Initializing new {self.label} instance using: {self._uri}', verbosity=1)
 
-        if self.platform == 'windows':
-            winrm_config = read_text_file(os.path.join(ANSIBLE_TEST_TARGET_ROOT, 'setup', 'ConfigureRemotingForAnsible.ps1'))
-        else:
-            winrm_config = None
-
         data = dict(
             config=dict(
                 platform=self.platform,
                 version=self.version,
                 architecture=self.arch,
                 public_key=self.ssh_key.pub_contents,
-                winrm_config=winrm_config,
             )
         )
 

ansible_test/_internal/coverage_util.py

@@ -69,7 +69,8 @@ class CoverageVersion:
 
 COVERAGE_VERSIONS = (
     # IMPORTANT: Keep this in sync with the ansible-test.txt requirements file.
-    CoverageVersion('6.5.0', 7, (3, 7), (3, 11)),
+    CoverageVersion('7.3.2', 7, (3, 8), (3, 12)),
+    CoverageVersion('6.5.0', 7, (3, 7), (3, 7)),
     CoverageVersion('4.5.4', 0, (2, 6), (3, 6)),
 )
 """
@@ -250,7 +251,9 @@ def generate_ansible_coverage_config() -> str:
     coverage_config = '''
 [run]
 branch = True
-concurrency = multiprocessing
+concurrency =
+    multiprocessing
+    thread
 parallel = True
 
 omit =
@@ -271,7 +274,9 @@ def generate_collection_coverage_config(args: TestConfig) -> str:
     coverage_config = '''
 [run]
 branch = True
-concurrency = multiprocessing
+concurrency =
+    multiprocessing
+    thread
 parallel = True
 disable_warnings =
     no-data-collected

ansible_test/_internal/delegation.py

@@ -328,7 +328,6 @@ def filter_options(
 ) -> c.Iterable[str]:
     """Return an iterable that filters out unwanted CLI options and injects new ones as requested."""
     replace: list[tuple[str, int, t.Optional[t.Union[bool, str, list[str]]]]] = [
-        ('--docker-no-pull', 0, False),
         ('--truncate', 1, str(args.truncate)),
         ('--color', 1, 'yes' if args.color else 'no'),
         ('--redact', 0, False),

ansible_test/_internal/diff.py

@@ -143,7 +143,7 @@ class DiffParser:
                     traceback.format_exc(),
                 )
 
-                raise ApplicationError(message.strip())
+                raise ApplicationError(message.strip()) from None
 
             self.previous_line = self.line
 

ansible_test/_internal/docker_util.py

@@ -300,7 +300,7 @@ def detect_host_properties(args: CommonConfig) -> ContainerHostProperties:
     options = ['--volume', '/sys/fs/cgroup:/probe:ro']
     cmd = ['sh', '-c', ' && echo "-" && '.join(multi_line_commands)]
 
-    stdout = run_utility_container(args, f'ansible-test-probe-{args.session_name}', cmd, options)[0]
+    stdout = run_utility_container(args, 'ansible-test-probe', cmd, options)[0]
 
     if args.explain:
         return ContainerHostProperties(
@@ -336,7 +336,7 @@ def detect_host_properties(args: CommonConfig) -> ContainerHostProperties:
         cmd = ['sh', '-c', 'ulimit -Hn']
 
         try:
-            stdout = run_utility_container(args, f'ansible-test-ulimit-{args.session_name}', cmd, options)[0]
+            stdout = run_utility_container(args, 'ansible-test-ulimit', cmd, options)[0]
         except SubprocessError as ex:
             display.warning(str(ex))
         else:
@@ -402,6 +402,11 @@ def detect_host_properties(args: CommonConfig) -> ContainerHostProperties:
     return properties
 
 
+def get_session_container_name(args: CommonConfig, name: str) -> str:
+    """Return the given container name with the current test session name applied to it."""
+    return f'{name}-{args.session_name}'
+
+
 def run_utility_container(
     args: CommonConfig,
     name: str,
@@ -410,6 +415,8 @@ def run_utility_container(
     data: t.Optional[str] = None,
 ) -> tuple[t.Optional[str], t.Optional[str]]:
     """Run the specified command using the ansible-test utility container, returning stdout and stderr."""
+    name = get_session_container_name(args, name)
+
     options = options + [
         '--name', name,
         '--rm',

ansible_test/_internal/host_profiles.py

@@ -99,7 +99,6 @@ from .ansible_util import (
 )
 
 from .containers import (
-    CleanupMode,
     HostType,
     get_container_database,
     run_support_container,
@@ -447,7 +446,7 @@ class DockerProfile(ControllerHostProfile[DockerConfig], SshTargetHostProfile[Do
     @property
     def label(self) -> str:
         """Label to apply to resources related to this profile."""
-        return f'{"controller" if self.controller else "target"}-{self.args.session_name}'
+        return f'{"controller" if self.controller else "target"}'
 
     def provision(self) -> None:
         """Provision the host before delegation."""
@@ -462,7 +461,7 @@ class DockerProfile(ControllerHostProfile[DockerConfig], SshTargetHostProfile[Do
             ports=[22],
             publish_ports=not self.controller,  # connections to the controller over SSH are not required
             options=init_config.options,
-            cleanup=CleanupMode.NO,
+            cleanup=False,
             cmd=self.build_init_command(init_config, init_probe),
         )
 
@@ -807,6 +806,7 @@ class DockerProfile(ControllerHostProfile[DockerConfig], SshTargetHostProfile[Do
           - Avoid hanging indefinitely or for an unreasonably long time.
 
         NOTE: The container must have a POSIX-compliant default shell "sh" with a non-builtin "sleep" command.
+              The "sleep" command is invoked through "env" to avoid using a shell builtin "sleep" (if present).
         """
         command = ''
 
@@ -814,7 +814,7 @@ class DockerProfile(ControllerHostProfile[DockerConfig], SshTargetHostProfile[Do
             command += f'{init_config.command} && '
 
         if sleep or init_config.command_privileged:
-            command += 'sleep 60 ; '
+            command += 'env sleep 60 ; '
 
         if not command:
             return None
@@ -838,7 +838,7 @@ class DockerProfile(ControllerHostProfile[DockerConfig], SshTargetHostProfile[Do
         """Check the cgroup v1 systemd hierarchy to verify it is writeable for our container."""
         probe_script = (read_text_file(os.path.join(ANSIBLE_TEST_TARGET_ROOT, 'setup', 'check_systemd_cgroup_v1.sh'))
                         .replace('@MARKER@', self.MARKER)
-                        .replace('@LABEL@', self.label))
+                        .replace('@LABEL@', f'{self.label}-{self.args.session_name}'))
 
         cmd = ['sh']
 
@@ -853,7 +853,7 @@ class DockerProfile(ControllerHostProfile[DockerConfig], SshTargetHostProfile[Do
 
     def create_systemd_cgroup_v1(self) -> str:
         """Create a unique ansible-test cgroup in the v1 systemd hierarchy and return its path."""
-        self.cgroup_path = f'/sys/fs/cgroup/systemd/ansible-test-{self.label}'
+        self.cgroup_path = f'/sys/fs/cgroup/systemd/ansible-test-{self.label}-{self.args.session_name}'
 
         # Privileged mode is required to create the cgroup directories on some hosts, such as Fedora 36 and RHEL 9.0.
         # The mkdir command will fail with "Permission denied" otherwise.

ansible_test/_internal/http.py

@@ -126,7 +126,7 @@ class HttpResponse:
         try:
             return json.loads(self.response)
         except ValueError:
-            raise HttpError(self.status_code, 'Cannot parse response to %s %s as JSON:\n%s' % (self.method, self.url, self.response))
+            raise HttpError(self.status_code, 'Cannot parse response to %s %s as JSON:\n%s' % (self.method, self.url, self.response)) from None
 
 
 class HttpError(ApplicationError):

ansible_test/_internal/junit_xml.py

@@ -15,7 +15,7 @@ from xml.dom import minidom
 from xml.etree import ElementTree as ET
 
 
-@dataclasses.dataclass  # type: ignore[misc]  # https://github.com/python/mypy/issues/5374
+@dataclasses.dataclass
 class TestResult(metaclass=abc.ABCMeta):
     """Base class for the result of a test case."""
 

ansible_test/_internal/pypi_proxy.py

@@ -76,7 +76,7 @@ def run_pypi_proxy(args: EnvironmentConfig, targets_use_pypi: bool) -> None:
         args=args,
         context='__pypi_proxy__',
         image=image,
-        name=f'pypi-test-container-{args.session_name}',
+        name='pypi-test-container',
         ports=[port],
     )
 

ansible_test/_internal/python_requirements.py

@@ -297,7 +297,7 @@ def run_pip(
                 connection.run([python.path], data=script, capture=True)
             except SubprocessError as ex:
                 if 'pip is unavailable:' in ex.stdout + ex.stderr:
-                    raise PipUnavailableError(python)
+                    raise PipUnavailableError(python) from None
 
             raise
 
@@ -441,8 +441,8 @@ def get_venv_packages(python: PythonConfig) -> dict[str, str]:
     #       See: https://github.com/ansible/base-test-container/blob/main/files/installer.py
 
     default_packages = dict(
-        pip='21.3.1',
-        setuptools='60.8.2',
+        pip='23.1.2',
+        setuptools='67.7.2',
         wheel='0.37.1',
     )
 
@@ -452,11 +452,6 @@ def get_venv_packages(python: PythonConfig) -> dict[str, str]:
             setuptools='44.1.1',  # 45.0.0 requires Python 3.5+
             wheel=None,
         ),
-        '3.5': dict(
-            pip='20.3.4',  # 21.0 requires Python 3.6+
-            setuptools='50.3.2',  # 51.0.0 requires Python 3.6+
-            wheel=None,
-        ),
         '3.6': dict(
             pip='21.3.1',  # 22.0 requires Python 3.7+
             setuptools='59.6.0',  # 59.7.0 requires Python 3.7+

ansible_test/_internal/util.py

@@ -31,11 +31,6 @@ from termios import TIOCGWINSZ
 # CAUTION: Avoid third-party imports in this module whenever possible.
 #          Any third-party imports occurring here will result in an error if they are vendored by ansible-core.
 
-try:
-    from typing_extensions import TypeGuard  # TypeGuard was added in Python 3.10
-except ImportError:
-    TypeGuard = None
-
 from .locale_util import (
     LOCALE_WARNING,
     CONFIGURED_LOCALE,
@@ -1155,7 +1150,7 @@ def verify_sys_executable(path: str) -> t.Optional[str]:
     return expected_executable
 
 
-def type_guard(sequence: c.Sequence[t.Any], guard_type: t.Type[C]) -> TypeGuard[c.Sequence[C]]:
+def type_guard(sequence: c.Sequence[t.Any], guard_type: t.Type[C]) -> t.TypeGuard[c.Sequence[C]]:
     """
     Raises an exception if any item in the given sequence does not match the specified guard type.
     Use with assert so that type checkers are aware of the type guard.

ansible_test/_util/controller/sanity/code-smell/no-get-exception.json

@@ -2,6 +2,10 @@
     "extensions": [
         ".py"
     ],
+    "prefixes": [
+        "lib/ansible/",
+        "plugins/"
+    ],
     "ignore_self": true,
     "output": "path-line-column-message"
 }

ansible_test/_util/controller/sanity/code-smell/replace-urlopen.json

@@ -2,6 +2,10 @@
     "extensions": [
         ".py"
     ],
+    "prefixes": [
+        "lib/ansible/",
+        "plugins/"
+    ],
     "ignore_self": true,
     "output": "path-line-column-message"
 }

ansible_test/_util/controller/sanity/code-smell/use-compat-six.json

@@ -2,5 +2,9 @@
     "extensions": [
         ".py"
     ],
+    "prefixes": [
+        "lib/ansible/",
+        "plugins/"
+    ],
     "output": "path-line-column-message"
 }

ansible_test/_util/controller/sanity/mypy/ansible-core.ini

@@ -34,6 +34,9 @@ ignore_missing_imports = True
 [mypy-md5.*]
 ignore_missing_imports = True
 
+[mypy-imp.*]
+ignore_missing_imports = True
+
 [mypy-scp.*]
 ignore_missing_imports = True
 

ansible_test/_util/controller/sanity/pylint/config/ansible-test-target.cfg

@@ -57,3 +57,5 @@ preferred-modules =
 # Listing them here makes it possible to enable the import-error check.
 ignored-modules =
     py,
+    pytest,
+    _pytest.runner,

ansible_test/_util/controller/sanity/pylint/config/ansible-test.cfg

@@ -7,7 +7,6 @@ disable=
     deprecated-module,  # results vary by Python version
     duplicate-code,  # consistent results require running with --jobs 1 and testing all files
     import-outside-toplevel,  # common pattern in ansible related code
-    raise-missing-from,  # Python 2.x does not support raise from
     broad-exception-raised,  # many exceptions with no need for a custom type
     too-few-public-methods,
     too-many-public-methods,

ansible_test/_util/controller/sanity/pylint/config/collection.cfg

@@ -30,6 +30,7 @@ disable=
     consider-using-max-builtin,
     consider-using-min-builtin,
     cyclic-import,  # consistent results require running with --jobs 1 and testing all files
+    deprecated-comment,  # custom plugin only used by ansible-core, not collections
     deprecated-method,  # results vary by Python version
     deprecated-module,  # results vary by Python version
     duplicate-code,  # consistent results require running with --jobs 1 and testing all files