Skip to content

Commit 365f0dd

Browse files
Add error handling for container image properties (#22146)
Refactor container image properties retrieval with error handling.
1 parent b3db4fa commit 365f0dd

1 file changed

Lines changed: 11 additions & 7 deletions

File tree

pytest_fixtures/core/reporting.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
from robottelo.config import setting_is_set, settings
88
from robottelo.hosts import get_sat_rhel_version
9+
from robottelo.logging import logger
910
from robottelo.utils.ohsnap import container_image_properties
1011

1112
FMT_XUNIT_TIME = '%Y-%m-%dT%H:%M:%S'
@@ -51,13 +52,16 @@ def pytest_sessionstart(session):
5152
xml.add_global_property("SatelliteVersion", sat_version)
5253
xml.add_global_property("SnapVersion", snap_version)
5354
xml.add_global_property("BaseOS", rhel_version)
54-
if settings.server.deploy_arguments.deploy_container:
55-
for name, value in container_image_properties(
56-
settings.ohsnap,
57-
sat_version,
58-
snap_version,
59-
):
60-
xml.add_global_property(name, value)
55+
try:
56+
if settings.server.deploy_arguments.get('deploy_container'):
57+
for name, value in container_image_properties(
58+
settings.ohsnap,
59+
sat_version,
60+
snap_version,
61+
):
62+
xml.add_global_property(name, value)
63+
except Exception:
64+
logger.warning('Failed to fetch container image properties for JUnit XML')
6165

6266

6367
@pytest.fixture(autouse=False, scope='session')

0 commit comments

Comments
 (0)