ansible-test - Avoid use of deprecated utcnow (#80750)

The timestamps are only used by ansible-test, not the junit callback, so this change only impacts ansible-test.
pull/80764/head
Matt Clay 2 years ago committed by GitHub
parent 905131fc76
commit fd341265d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,2 @@
minor_changes:
- ansible-test - Use ``datetime.datetime.now`` with ``tz`` specified instead of ``datetime.datetime.utcnow``.

@ -144,6 +144,10 @@ class TestSuite:
system_out: str | None = None system_out: str | None = None
system_err: str | None = None system_err: str | None = None
def __post_init__(self):
if self.timestamp and self.timestamp.tzinfo != datetime.timezone.utc:
raise ValueError(f'timestamp.tzinfo must be {datetime.timezone.utc!r}')
@property @property
def disabled(self) -> int: def disabled(self) -> int:
"""The number of disabled test cases.""" """The number of disabled test cases."""
@ -187,7 +191,7 @@ class TestSuite:
skipped=self.skipped, skipped=self.skipped,
tests=self.tests, tests=self.tests,
time=self.time, time=self.time,
timestamp=self.timestamp.isoformat(timespec='seconds') if self.timestamp else None, timestamp=self.timestamp.replace(tzinfo=None).isoformat(timespec='seconds') if self.timestamp else None,
) )
def get_xml_element(self) -> ET.Element: def get_xml_element(self) -> ET.Element:

@ -85,7 +85,7 @@ def show_dump_env(args: EnvConfig) -> None:
), ),
git=get_ci_provider().get_git_details(args), git=get_ci_provider().get_git_details(args),
platform=dict( platform=dict(
datetime=datetime.datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%SZ'), datetime=datetime.datetime.now(tz=datetime.timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ'),
platform=platform.platform(), platform=platform.platform(),
uname=platform.uname(), uname=platform.uname(),
), ),

@ -566,7 +566,7 @@ def command_integration_filtered(
coverage_manager.teardown() coverage_manager.teardown()
result_name = '%s-%s.json' % ( result_name = '%s-%s.json' % (
args.command, re.sub(r'[^0-9]', '-', str(datetime.datetime.utcnow().replace(microsecond=0)))) args.command, re.sub(r'[^0-9]', '-', str(datetime.datetime.now(tz=datetime.timezone.utc).replace(microsecond=0, tzinfo=None))))
data = dict( data = dict(
targets=results, targets=results,

@ -170,7 +170,7 @@ def cloud_init(args: IntegrationConfig, targets: tuple[IntegrationTarget, ...])
if not args.explain and results: if not args.explain and results:
result_name = '%s-%s.json' % ( result_name = '%s-%s.json' % (
args.command, re.sub(r'[^0-9]', '-', str(datetime.datetime.utcnow().replace(microsecond=0)))) args.command, re.sub(r'[^0-9]', '-', str(datetime.datetime.now(tz=datetime.timezone.utc).replace(microsecond=0, tzinfo=None))))
data = dict( data = dict(
clouds=results, clouds=results,

@ -156,19 +156,19 @@ class PylintTest(SanitySingleVersion):
except CollectionDetailError as ex: except CollectionDetailError as ex:
display.warning('Skipping pylint collection version checks since collection detail loading failed: %s' % ex.reason) display.warning('Skipping pylint collection version checks since collection detail loading failed: %s' % ex.reason)
test_start = datetime.datetime.utcnow() test_start = datetime.datetime.now(tz=datetime.timezone.utc)
for context, context_paths in sorted(contexts): for context, context_paths in sorted(contexts):
if not context_paths: if not context_paths:
continue continue
context_start = datetime.datetime.utcnow() context_start = datetime.datetime.now(tz=datetime.timezone.utc)
messages += self.pylint(args, context, context_paths, plugin_dir, plugin_names, python, collection_detail) messages += self.pylint(args, context, context_paths, plugin_dir, plugin_names, python, collection_detail)
context_end = datetime.datetime.utcnow() context_end = datetime.datetime.now(tz=datetime.timezone.utc)
context_times.append('%s: %d (%s)' % (context, len(context_paths), context_end - context_start)) context_times.append('%s: %d (%s)' % (context, len(context_paths), context_end - context_start))
test_end = datetime.datetime.utcnow() test_end = datetime.datetime.now(tz=datetime.timezone.utc)
for context_time in context_times: for context_time in context_times:
display.info(context_time, verbosity=4) display.info(context_time, verbosity=4)

@ -114,7 +114,7 @@ class TestResult:
junit_xml.TestSuite( junit_xml.TestSuite(
name='ansible-test', name='ansible-test',
cases=[test_case], cases=[test_case],
timestamp=datetime.datetime.utcnow(), timestamp=datetime.datetime.now(tz=datetime.timezone.utc),
), ),
], ],
) )
@ -153,13 +153,11 @@ One or more of the following situations may be responsible:
output += '\n\nConsult the console log for additional details on where the timeout occurred.' output += '\n\nConsult the console log for additional details on where the timeout occurred.'
timestamp = datetime.datetime.utcnow()
suites = junit_xml.TestSuites( suites = junit_xml.TestSuites(
suites=[ suites=[
junit_xml.TestSuite( junit_xml.TestSuite(
name='ansible-test', name='ansible-test',
timestamp=timestamp, timestamp=datetime.datetime.now(tz=datetime.timezone.utc),
cases=[ cases=[
junit_xml.TestCase( junit_xml.TestCase(
name='timeout', name='timeout',

Loading…
Cancel
Save