Description: Fix compat with newer subunit 1.4.4
Author: Thomas Goirand <zigo@debian.org>
Bug-Debian: https://bugs.debian.org/1117424
Forwarded: https://review.opendev.org/c/openstack/os-testr/+/964787
Last-Update: 2025-10-24

--- python-os-testr-3.0.0.orig/os_testr/subunit_trace.py
+++ python-os-testr-3.0.0/os_testr/subunit_trace.py
@@ -364,15 +364,16 @@ def trace(stdin, stdout, print_failures=
     summary = testtools.StreamSummary()
     result = testtools.CopyStreamResult([outcomes, summary])
     result = testtools.StreamResultRouter(result)
-    cat = subunit.test_results.CatFiles(stdout)
+    from subunit.test_results import CatFiles
+    cat = CatFiles(stdout)
     result.add_rule(cat, 'test_id', test_id=None)
-    start_time = datetime.datetime.utcnow()
+    start_time = datetime.datetime.now(datetime.timezone.utc)
     result.startTestRun()
     try:
         stream.run(result)
     finally:
         result.stopTestRun()
-    stop_time = datetime.datetime.utcnow()
+    stop_time = datetime.datetime.now(datetime.timezone.utc)
     elapsed_time = stop_time - start_time
 
     if count_tests('status', '.*') == 0: