Rename test modules to not collide

Author: thegreyd

Makefile

@@ -24,8 +24,8 @@ unit:
 	uv run -m pytest --verbose --color=yes artcommon/tests/
 	uv run -m pytest --verbose --color=yes doozer/tests/
 	uv run -m pytest --verbose --color=yes elliott/tests/
-	uv run -m pytest --verbose --color=yes pyartcd/tests/
-	uv run -m pytest --verbose --color=yes ocp-build-data-validator/tests/
+	uv run -m pytest --verbose --color=yes pyartcd/tests_pyartcd/
+	uv run -m pytest --verbose --color=yes ocp-build-data-validator/tests_validator/
 
 functional-elliott:
 	uv run -m pytest --verbose --color=yes elliott/functional_tests/

ocp-build-data-validator/tests/__init__.py renamed to elliott/__init__.py

@@ -17,12 +17,12 @@
 import requests
 from artcommonlib import logutil
 from artcommonlib.model import Missing
-from requests_gssapi import HTTPSPNEGOAuth
-from tenacity import retry, stop_after_attempt, wait_fixed
 
 # ours
 from elliottlib import constants, exceptions
 from elliottlib.util import total_size
+from requests_gssapi import HTTPSPNEGOAuth
+from tenacity import retry, stop_after_attempt, wait_fixed
 
 logger = logutil.get_logger(__name__)
 

elliott/elliottlib/brew.py

@@ -5,12 +5,11 @@
 from artcommonlib.assembly import assembly_metadata_config, assembly_rhcos_config
 from artcommonlib.build_util import find_latest_builds
 from artcommonlib.model import Model
-from koji import ClientSession
-
 from elliottlib.brew import get_build_objects
 from elliottlib.imagecfg import ImageMetadata
 from elliottlib.rpmcfg import RPMMetadata
 from elliottlib.util import parse_nvr, strip_epoch, to_nvre
+from koji import ClientSession
 
 
 class BuildFinder:

elliott/elliottlib/build_finder.py

@@ -16,6 +16,11 @@
 import bugzilla
 import requests
 from artcommonlib import exectools, logutil
+from elliottlib import constants, errata, exceptions, util
+from elliottlib.cli import cli_opts
+from elliottlib.errata_async import AsyncErrataAPI
+from elliottlib.metadata import Metadata
+from elliottlib.util import chunk, isolate_timestamp_in_release
 from errata_tool import Erratum
 from errata_tool.bug import Bug as ErrataBug
 from errata_tool.jira_issue import JiraIssue as ErrataJira
@@ -24,12 +29,6 @@
 from requests_gssapi import HTTPSPNEGOAuth
 from tenacity import retry, stop_after_attempt, wait_fixed
 
-from elliottlib import constants, errata, exceptions, util
-from elliottlib.cli import cli_opts
-from elliottlib.errata_async import AsyncErrataAPI
-from elliottlib.metadata import Metadata
-from elliottlib.util import chunk, isolate_timestamp_in_release
-
 logger = logutil.get_logger(__name__)
 
 

elliott/elliottlib/bzutil.py

@@ -20,15 +20,13 @@
 
 # 3rd party
 import click
-from artcommonlib import rhcos
-from artcommonlib.format_util import green_prefix, green_print, red_prefix, red_print, yellow_prefix, yellow_print
-from errata_tool import ErrataException
-
 import elliottlib.brew
 import elliottlib.bzutil
 import elliottlib.constants
 import elliottlib.errata
 import elliottlib.exceptions
+from artcommonlib import rhcos
+from artcommonlib.format_util import green_prefix, green_print, red_prefix, red_print, yellow_prefix, yellow_print
 
 # ours
 from elliottlib import Runtime, util
@@ -73,6 +71,7 @@
 from elliottlib.cli.verify_cvp_cli import verify_cvp_cli
 from elliottlib.exceptions import ElliottFatalError
 from elliottlib.util import pbar_header, progress_func
+from errata_tool import ErrataException
 
 # -----------------------------------------------------------------------------
 # Constants and defaults

elliott/elliottlib/cli/__main__.py

@@ -3,9 +3,8 @@
 import click
 from artcommonlib import logutil
 from artcommonlib.format_util import green_prefix
-from errata_tool import ErrataException, Erratum
-
 from elliottlib.cli.common import cli
+from errata_tool import ErrataException, Erratum
 
 LOGGER = logutil.get_logger(__name__)
 supported_update_fields = [

elliott/elliottlib/cli/advisory_commons_cli.py

@@ -2,13 +2,12 @@
 
 import click
 import requests
-from errata_tool import Erratum
-from requests_gssapi import HTTPSPNEGOAuth
-
 from elliottlib.cli.common import cli
 from elliottlib.constants import errata_drop_url
 from elliottlib.errata import remove_blocking_advisories_depends, remove_dependent_advisories, unset_advisory_batch
 from elliottlib.exceptions import ElliottFatalError
+from errata_tool import Erratum
+from requests_gssapi import HTTPSPNEGOAuth
 
 
 @cli.command("advisory-drop", short_help="Drop advisory")

elliott/elliottlib/cli/advisory_drop_cli.py

@@ -1,5 +1,4 @@
 import click
-
 from elliottlib import Runtime, errata
 from elliottlib.cli.common import cli, find_default_advisory
 

elliott/elliottlib/cli/advisory_images_cli.py

@@ -1,6 +1,5 @@
 import click
 from artcommonlib import logutil
-
 from elliottlib import Runtime
 from elliottlib.bzutil import Bug, get_jira_bz_bug_ids
 from elliottlib.cli.common import cli, find_default_advisory, use_default_advisory_option

elliott/elliottlib/cli/attach_bugs_cli.py

@@ -6,15 +6,14 @@
 import click
 from artcommonlib import arch_util
 from artcommonlib.rpm_utils import parse_nvr
-from errata_tool import Erratum
-
 from elliottlib import constants
 from elliottlib.bzutil import Bug, BugTracker, get_highest_security_impact, is_first_fix_any, sort_cve_bugs
 from elliottlib.cli.common import cli, click_coroutine, find_default_advisory, use_default_advisory_option
 from elliottlib.errata import is_security_advisory
 from elliottlib.errata_async import AsyncErrataAPI, AsyncErrataUtils
 from elliottlib.runtime import Runtime
 from elliottlib.util import get_advisory_boilerplate
+from errata_tool import Erratum
 
 LOGGER = logging.getLogger(__name__)
 

elliott/elliottlib/cli/attach_cve_flaws_cli.py

@@ -1,8 +1,7 @@
 import click
 from artcommonlib.format_util import green_prefix
-from errata_tool import ErrataException, Erratum
-
 from elliottlib.cli.common import cli, find_default_advisory, use_default_advisory_option
+from errata_tool import ErrataException, Erratum
 
 
 @cli.command("change-state", short_help="Change ADVISORY state")

elliott/elliottlib/cli/change_state_cli.py

@@ -6,7 +6,6 @@
 from artcommonlib import dotconfig
 from artcommonlib.constants import SHIPMENT_DATA_URL_TEMPLATE
 from artcommonlib.format_util import green_prefix, red_prefix, yellow_print
-
 from elliottlib import Runtime, __version__, constants, errata
 from elliottlib.cli import cli_opts
 

elliott/elliottlib/cli/common.py

@@ -4,7 +4,6 @@
 from artcommonlib import logutil
 from artcommonlib.assembly import AssemblyTypes
 from artcommonlib.format_util import green_prefix
-
 from elliottlib import errata
 from elliottlib.cli.common import cli, click_coroutine
 from elliottlib.cli.create_placeholder_cli import create_placeholder_cli

elliott/elliottlib/cli/create_cli.py

@@ -1,9 +1,8 @@
 import click
 from artcommonlib import logutil
-from errata_tool import Erratum
-
 from elliottlib.cli.common import cli, find_default_advisory, use_default_advisory_option
 from elliottlib.exceptions import ElliottFatalError
+from errata_tool import Erratum
 
 LOGGER = logutil.get_logger(__name__)
 

elliott/elliottlib/cli/create_placeholder_cli.py

@@ -1,13 +1,12 @@
 import click
+import elliottlib
 from artcommonlib import logutil
 from artcommonlib.format_util import green_prefix
-from errata_tool import Erratum
-
-import elliottlib
 from elliottlib.bzutil import BugTracker
 from elliottlib.cli.common import cli
 from elliottlib.exceptions import ElliottFatalError
 from elliottlib.util import exit_unauthorized, validate_email_address, validate_release_date
+from errata_tool import Erratum
 
 LOGGER = logutil.get_logger(__name__)
 

elliott/elliottlib/cli/create_textonly_cli.py

@@ -4,7 +4,6 @@
 
 import click
 from artcommonlib.format_util import green_prefix
-
 from elliottlib import Runtime, constants
 from elliottlib.bzutil import BugTracker
 from elliottlib.cli.common import cli

elliott/elliottlib/cli/find_bugs_blocker_cli.py

@@ -8,16 +8,16 @@
 from artcommonlib.rhcos import get_container_configs
 from artcommonlib.rpm_utils import parse_nvr
 from doozerlib.cli.get_nightlies import find_rc_nightlies
-from prettytable import PrettyTable
-from semver.version import Version
-
 from elliottlib import Runtime, constants, errata
 from elliottlib.bzutil import BugzillaBug, BugzillaBugTracker, JIRABug, JIRABugTracker
 from elliottlib.cli.common import cli, click_coroutine
 from elliottlib.cli.find_builds_cli import _fetch_builds_by_kind_rpm
 from elliottlib.cli.get_golang_report_cli import golang_report_for_version
 from elliottlib.exceptions import ElliottFatalError
 from elliottlib.util import get_golang_container_nvrs, get_golang_rpm_nvrs, get_nvrs_from_release
+from prettytable import PrettyTable
+from semver.version import Version
+
 from pyartcd import constants as pyartcd_constants
 from pyartcd.util import get_release_name_for_assembly, load_releases_config
 

elliott/elliottlib/cli/find_bugs_golang_cli.py

@@ -9,14 +9,13 @@
 from artcommonlib.format_util import green_print
 from bugzilla import Bugzilla
 from bugzilla.bug import Bug
-from jira import JIRA, Issue
-from tenacity import retry, stop_after_attempt
-
 from elliottlib import Runtime, constants, early_kernel
 from elliottlib.bzutil import JIRABugTracker
 from elliottlib.cli.common import cli, click_coroutine
 from elliottlib.config_model import KernelBugSweepConfig
 from elliottlib.exceptions import ElliottFatalError
+from jira import JIRA, Issue
+from tenacity import retry, stop_after_attempt
 
 LOGGER = logging.getLogger(__name__)
 

elliott/elliottlib/cli/find_bugs_kernel_cli.py

@@ -7,14 +7,13 @@
 import koji
 from artcommonlib.assembly import AssemblyTypes
 from artcommonlib.format_util import green_print
-from jira import JIRA, Issue
-from tenacity import retry, stop_after_attempt, wait_fixed
-
 from elliottlib import Runtime, early_kernel
 from elliottlib.bzutil import JIRABugTracker
 from elliottlib.cli.common import cli
 from elliottlib.config_model import KernelBugSweepConfig
 from elliottlib.exceptions import ElliottFatalError
+from jira import JIRA, Issue
+from tenacity import retry, stop_after_attempt, wait_fixed
 
 LOGGER = logging.getLogger(__name__)
 

elliott/elliottlib/cli/find_bugs_kernel_clones_cli.py

@@ -3,7 +3,6 @@
 
 import click
 from artcommonlib import logutil
-
 from elliottlib import Runtime
 from elliottlib.cli.common import cli
 from elliottlib.cli.find_bugs_sweep_cli import FindBugsMode

elliott/elliottlib/cli/find_bugs_qe_cli.py

@@ -8,7 +8,6 @@
 from artcommonlib import arch_util, logutil
 from artcommonlib.assembly import assembly_issues_config
 from artcommonlib.format_util import green_prefix, green_print
-
 from elliottlib import Runtime, bzutil, constants, errata
 from elliottlib.bzutil import Bug, BugTracker, JIRABug
 from elliottlib.cli import common

elliott/elliottlib/cli/find_bugs_sweep_cli.py

@@ -17,8 +17,6 @@
 from artcommonlib.release_util import isolate_el_version_in_release
 from artcommonlib.rhcos import get_build_id_from_rhcos_pullspec, get_container_configs
 from artcommonlib.rpm_utils import parse_nvr
-from errata_tool import ErrataException
-
 from elliottlib import Runtime, brew, errata
 from elliottlib.build_finder import BuildFinder
 from elliottlib.cli.common import cli, click_coroutine, find_default_advisory, use_default_advisory_option
@@ -33,6 +31,7 @@
     pbar_header,
     progress_func,
 )
+from errata_tool import ErrataException
 
 LOGGER = logutil.get_logger(__name__)
 

elliott/elliottlib/cli/find_builds_cli.py

@@ -1,7 +1,6 @@
 import click
 from artcommonlib import logutil
 from artcommonlib.konflux.konflux_build_record import ArtifactType, Engine, KonfluxBuildOutcome, KonfluxBuildRecord
-
 from elliottlib.cli.common import cli, click_coroutine, pass_runtime
 from elliottlib.runtime import Runtime
 

elliott/elliottlib/cli/find_konflux_builds_cli.py

@@ -7,7 +7,6 @@
 from artcommonlib import exectools
 from artcommonlib.arch_util import brew_arch_for_go_arch
 from artcommonlib.assembly import AssemblyTypes, assembly_rhcos_config, assembly_type
-
 from elliottlib import brew, rhcos
 from elliottlib.build_finder import BuildFinder
 from elliottlib.cli.common import cli, click_coroutine

elliott/elliottlib/cli/find_unconsumed_rpms.py

@@ -6,7 +6,6 @@
 from artcommonlib.format_util import green_print
 from artcommonlib.release_util import split_el_suffix_in_release
 from artcommonlib.rpm_utils import parse_nvr
-
 from elliottlib.cli.common import cli
 
 _LOGGER = logutil.get_logger(__name__)

elliott/elliottlib/cli/get_golang_report_cli.py

@@ -2,7 +2,6 @@
 from artcommonlib import format_util, logutil, rhcos
 from artcommonlib.format_util import green_print
 from artcommonlib.rpm_utils import parse_nvr
-
 from elliottlib import errata, util
 from elliottlib.cli.common import cli, click_coroutine, find_default_advisory, use_default_advisory_option
 

elliott/elliottlib/cli/get_golang_versions_cli.py

@@ -14,12 +14,11 @@
     KonfluxClient,
 )
 from doozerlib.constants import KONFLUX_DEFAULT_NAMESPACE, KONFLUX_UI_HOST
-from kubernetes.dynamic import exceptions
-
 from elliottlib.cli.common import cli, click_coroutine
 from elliottlib.cli.snapshot_cli import GetSnapshotCli
 from elliottlib.runtime import Runtime
 from elliottlib.shipment_model import Shipment, ShipmentConfig, ShipmentEnv
+from kubernetes.dynamic import exceptions
 
 yaml = new_roundtrip_yaml_handler()
 

elliott/elliottlib/cli/konflux_release_cli.py

@@ -7,7 +7,6 @@
 from artcommonlib import util as art_util
 from doozerlib.backend.konflux_client import KonfluxClient
 from doozerlib.constants import KONFLUX_DEFAULT_NAMESPACE
-
 from elliottlib.cli.common import click_coroutine
 from elliottlib.cli.konflux_release_cli import konflux_release_cli
 from elliottlib.runtime import Runtime

elliott/elliottlib/cli/konflux_release_watch_cli.py

@@ -2,7 +2,6 @@
 
 import click
 from artcommonlib import logutil
-
 from elliottlib import errata
 from elliottlib.cli.common import cli, move_builds
 from elliottlib.util import ensure_erratatool_auth

elliott/elliottlib/cli/move_builds_cli.py

@@ -13,7 +13,6 @@
 from artcommonlib.rpm_utils import parse_nvr
 from doozerlib.brew import get_build_objects
 from doozerlib.rhcos import RHCOSBuildFinder
-
 from elliottlib import Runtime
 from elliottlib.cli.common import cli, click_coroutine
 

elliott/elliottlib/cli/pin_builds_cli.py

@@ -1,12 +1,11 @@
 import click
 from artcommonlib import logutil
 from artcommonlib.format_util import green_prefix
-from errata_tool import ErrataException
-
 from elliottlib import errata
 from elliottlib.bzutil import BugzillaBugTracker, JIRABugTracker, get_jira_bz_bug_ids
 from elliottlib.cli.common import cli, find_default_advisory, use_default_advisory_option
 from elliottlib.exceptions import ElliottFatalError
+from errata_tool import ErrataException
 
 LOGGER = logutil.get_logger(__name__)
 

elliott/elliottlib/cli/remove_bugs_cli.py

@@ -2,11 +2,10 @@
 
 import click
 from artcommonlib import logutil
-from errata_tool import ErrataException
-
 from elliottlib import Runtime, errata
 from elliottlib.cli.common import cli, find_default_advisory, use_default_advisory_option
 from elliottlib.util import ensure_erratatool_auth
+from errata_tool import ErrataException
 
 LOGGER = logutil.get_logger(__name__)