summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Clay <matt@mystile.com>2023-05-10 17:07:35 -0700
committerGitHub <noreply@github.com>2023-05-10 17:07:35 -0700
commit69d9b689fee2ded84b4db1a9c28bbc6869396074 (patch)
tree57f25f77cca948f085020a8406e039b0fdc73677
parenta0638a205ba885f9d8fbed33c5304e746d4f60ed (diff)
downloadansible-69d9b689fee2ded84b4db1a9c28bbc6869396074.tar.gz
[stable-2.12] ansible-test - Avoid use of deprecated utcnow (#80750) (#80760)
The timestamps are only used by ansible-test, not the junit callback, so this change only impacts ansible-test. (cherry picked from commit fd341265d001d4e6545ffb2b7d154340cb1f1931)
-rw-r--r--changelogs/fragments/ansible-test-utcnow.yml2
-rw-r--r--lib/ansible/utils/_junit_xml.py6
-rw-r--r--test/lib/ansible_test/_internal/commands/env/__init__.py2
-rw-r--r--test/lib/ansible_test/_internal/commands/integration/__init__.py2
-rw-r--r--test/lib/ansible_test/_internal/commands/integration/cloud/__init__.py2
-rw-r--r--test/lib/ansible_test/_internal/commands/sanity/pylint.py8
-rw-r--r--test/lib/ansible_test/_internal/test.py6
7 files changed, 16 insertions, 12 deletions
diff --git a/changelogs/fragments/ansible-test-utcnow.yml b/changelogs/fragments/ansible-test-utcnow.yml
new file mode 100644
index 0000000000..0781a0cb48
--- /dev/null
+++ b/changelogs/fragments/ansible-test-utcnow.yml
@@ -0,0 +1,2 @@
+minor_changes:
+ - ansible-test - Use ``datetime.datetime.now`` with ``tz`` specified instead of ``datetime.datetime.utcnow``.
diff --git a/lib/ansible/utils/_junit_xml.py b/lib/ansible/utils/_junit_xml.py
index a21fed4cbf..75907221fb 100644
--- a/lib/ansible/utils/_junit_xml.py
+++ b/lib/ansible/utils/_junit_xml.py
@@ -139,6 +139,10 @@ class TestSuite:
system_out: t.Optional[str] = None
system_err: t.Optional[str] = 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
def disabled(self) -> int:
"""The number of disabled test cases."""
@@ -182,7 +186,7 @@ class TestSuite:
skipped=self.skipped,
tests=self.tests,
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:
diff --git a/test/lib/ansible_test/_internal/commands/env/__init__.py b/test/lib/ansible_test/_internal/commands/env/__init__.py
index 41a1d52090..967f091faa 100644
--- a/test/lib/ansible_test/_internal/commands/env/__init__.py
+++ b/test/lib/ansible_test/_internal/commands/env/__init__.py
@@ -85,7 +85,7 @@ def show_dump_env(args): # type: (EnvConfig) -> None
),
git=get_ci_provider().get_git_details(args),
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(),
uname=platform.uname(),
),
diff --git a/test/lib/ansible_test/_internal/commands/integration/__init__.py b/test/lib/ansible_test/_internal/commands/integration/__init__.py
index 21e68037d3..bdaed8252a 100644
--- a/test/lib/ansible_test/_internal/commands/integration/__init__.py
+++ b/test/lib/ansible_test/_internal/commands/integration/__init__.py
@@ -565,7 +565,7 @@ def command_integration_filtered(
coverage_manager.teardown()
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(
targets=results,
diff --git a/test/lib/ansible_test/_internal/commands/integration/cloud/__init__.py b/test/lib/ansible_test/_internal/commands/integration/cloud/__init__.py
index 92540bc3bf..ca5f833800 100644
--- a/test/lib/ansible_test/_internal/commands/integration/cloud/__init__.py
+++ b/test/lib/ansible_test/_internal/commands/integration/cloud/__init__.py
@@ -170,7 +170,7 @@ def cloud_init(args, targets): # type: (IntegrationConfig, t.Tuple[IntegrationT
if not args.explain and results:
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(
clouds=results,
diff --git a/test/lib/ansible_test/_internal/commands/sanity/pylint.py b/test/lib/ansible_test/_internal/commands/sanity/pylint.py
index f5061fec76..dd0e7fa7cf 100644
--- a/test/lib/ansible_test/_internal/commands/sanity/pylint.py
+++ b/test/lib/ansible_test/_internal/commands/sanity/pylint.py
@@ -154,19 +154,19 @@ class PylintTest(SanitySingleVersion):
except CollectionDetailError as ex:
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):
if not context_paths:
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)
- 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))
- test_end = datetime.datetime.utcnow()
+ test_end = datetime.datetime.now(tz=datetime.timezone.utc)
for context_time in context_times:
display.info(context_time, verbosity=4)
diff --git a/test/lib/ansible_test/_internal/test.py b/test/lib/ansible_test/_internal/test.py
index c955ebcfb4..2eac09c601 100644
--- a/test/lib/ansible_test/_internal/test.py
+++ b/test/lib/ansible_test/_internal/test.py
@@ -112,7 +112,7 @@ class TestResult:
junit_xml.TestSuite(
name='ansible-test',
cases=[test_case],
- timestamp=datetime.datetime.utcnow(),
+ timestamp=datetime.datetime.now(tz=datetime.timezone.utc),
),
],
)
@@ -150,13 +150,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.'
- timestamp = datetime.datetime.utcnow()
-
suites = junit_xml.TestSuites(
suites=[
junit_xml.TestSuite(
name='ansible-test',
- timestamp=timestamp,
+ timestamp=datetime.datetime.now(tz=datetime.timezone.utc),
cases=[
junit_xml.TestCase(
name='timeout',