smart-tests-cli 2.16.4__tar.gz → 2.16.5__tar.gz

{smart_tests_cli-2.16.4 → smart_tests_cli-2.16.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smart-tests-cli
-Version: 2.16.4
+Version: 2.16.5
 Summary: Smart Tests CLI
 Author-email: CloudBees <support@cloudbees.com>
 License: Apache Software License v2

{smart_tests_cli-2.16.4 → smart_tests_cli-2.16.5}/smart_tests/commands/record/case_event.py

@@ -1,13 +1,9 @@
-import datetime
 import sys
+import uuid
 from typing import Any, Callable, Dict, Generator, List, Optional, Tuple
 
-import dateutil.parser
-from dateutil.tz import tzlocal
 from junitparser import Error, Failure, IntAttr, Skipped, TestCase, TestSuite
 
-from smart_tests.utils.common_tz import COMMON_TIMEZONES  # type: ignore
-
 from ...testpath import FilePathNormalizer, TestPath
 
 POSSIBLE_RESULTS = (Failure, Error, Skipped)
@@ -18,6 +14,13 @@ POSSIBLE_RESULTS = (Failure, Error, Skipped)
 RERUN_TAGS = ("rerunFailure", "rerunError")
 FLAKY_TAGS = ("flakyFailure", "flakyError")
 
+# Internal-only key tagging which original <testcase> an event came from (see
+# from_case_and_suite). Used by summarize_case_events to group retry/flaky attempts of the
+# SAME testcase without relying on testPath (which can be lossy, e.g. Maven's nested-class
+# $-stripping, or missing/extra attributes from the raw runner's free-form TestPathComponent).
+# Must be stripped before a payload is uploaded (see tests.py's payload()).
+BATCH_ID_KEY = "testcaseBatchId"
+
 CaseEventType = Dict[str, Any]
 CaseEventGenerator = Generator[CaseEventType, None, None]
 
@@ -197,17 +200,23 @@ class CaseEvent:
 
         test_path = path_canonicalizer(path_builder(case, suite, report_file))
         data = data_builder(case)
+        # One id per original <testcase>, shared by every attempt derived from it here, so
+        # summarize_case_events can group retries correctly without relying on test_path.
+        batch_id = uuid.uuid4()
 
         return [
-            CaseEvent.create(
-                test_path=test_path,
-                duration_secs=attempt_duration,
-                status=attempt_status,
-                stdout=attempt_stdout,
-                stderr=attempt_stderr,
-                timestamp=suite.timestamp,
-                data=data,
-            )
+            {
+                **CaseEvent.create(
+                    test_path=test_path,
+                    duration_secs=attempt_duration,
+                    status=attempt_status,
+                    stdout=attempt_stdout,
+                    stderr=attempt_stderr,
+                    timestamp=suite.timestamp,
+                    data=data,
+                ),
+                BATCH_ID_KEY: batch_id,
+            }
             for attempt_status, attempt_stdout, attempt_stderr, attempt_duration in attempts
         ]
 
@@ -215,22 +224,13 @@ class CaseEvent:
     def create(cls, test_path: TestPath, duration_secs: float, status,
                stdout: str | None = None, stderr: str | None = None,
                timestamp: str | None = None, data: Dict | None = None) -> Dict:
-        def _timestamp(ts: str | None = None):
-            if ts is None:
-                return datetime.datetime.now(datetime.timezone.utc).isoformat()
-            try:
-                date = dateutil.parser.parse(timestr=ts, tzinfos=COMMON_TIMEZONES)
-                if date.tzinfo is None:
-                    return date.replace(tzinfo=tzlocal()).isoformat()
-                return date.isoformat()
-            except Exception:
-                return datetime.datetime.now(datetime.timezone.utc).isoformat()
-
         """
         Builds a JSON representation of CaseEvent from arbitrary set of values
 
         status:    TEST_FAILED or TEST_PASSED
-        timestamp: ISO-8601 formatted date
+        timestamp: the raw <testsuite timestamp> string, sent unresolved. The server owns timezone
+                   resolution (see mothership TestTimestampResolver); the CLI holds no framework-TZ
+                   knowledge. None when the runner emits no suite timestamp.
         data:      arbitrary data to be submitted to the server. reserved for future enhancement.
         """
         return {
@@ -240,7 +240,7 @@ class CaseEvent:
             "status": status,
             "stdout": stdout or "",
             "stderr": stderr or "",
-            "createdAt": _timestamp(timestamp),
+            "junitSuiteTimestamp": timestamp,
             "data": data
         }
 

{smart_tests_cli-2.16.4 → smart_tests_cli-2.16.5}/smart_tests/commands/record/tests.py

@@ -6,7 +6,7 @@ import xml.etree.ElementTree as ET
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from pathlib import Path
 from time import time_ns
-from typing import Annotated, Callable, Dict, Generator, Iterable, List, Tuple, Union
+from typing import Annotated, Any, Callable, Dict, Generator, Iterable, List, Tuple, Union
 
 import click
 from dateutil.parser import ParserError, parse
@@ -32,7 +32,7 @@ from ...utils.fail_fast_mode import (FailFastModeValidateParams, fail_fast_mode_
                                      set_fail_fast_mode, warn_and_exit_if_fail_fast_mode)
 from ...utils.logger import Logger
 from ...utils.smart_tests_client import SmartTestsClient
-from .case_event import CaseEvent, CaseEventGenerator, CaseEventType, DataBuilder, TestPathBuilder
+from .case_event import BATCH_ID_KEY, CaseEvent, CaseEventGenerator, CaseEventType, DataBuilder, TestPathBuilder
 
 # Together with the workers sending events, this stays within urllib3's default pool size (10 connections per host)
 MAX_RAW_FILE_UPLOAD_WORKERS = 5
@@ -45,6 +45,18 @@ GROUP_NAME_RULE = re.compile("^[a-zA-Z0-9][a-zA-Z0-9_-]*$")
 RESERVED_GROUP_NAMES = ["group", "groups", "nogroup", "nogroups"]
 
 
+def _agent_utc_offset() -> str:
+    """The recording agent's current UTC offset as an ISO string (e.g. '+09:00', '+00:00').
+
+    Sent once per 'record tests' request so the server can resolve naive suite timestamps. Parseable
+    by the server's ZoneOffset.of(...).
+    """
+    offset = datetime.datetime.now().astimezone().strftime("%z")  # e.g. '+0900', '-0700', '+0000'
+    if not offset:
+        return "+00:00"
+    return offset[:3] + ":" + offset[3:5]
+
+
 def _validate_group(value):
     if value is None:
         return ""
@@ -352,7 +364,7 @@ class RecordTests:
 
         # generator that creates the payload incrementally
         def payload(
-                cases: Generator[TestCase, None, None],
+                cases: Generator[CaseEventType, None, None],
                 test_runner, group: str,
                 test_suite_name: str,
                 flavors: Dict[str, str]) -> Tuple[Dict[str, Union[str, List, dict, bool]], List[Exception]]:
@@ -362,11 +374,15 @@ class RecordTests:
 
             while True:
                 try:
-                    cs.append(next(cases))
+                    tc = next(cases)
                 except StopIteration:
                     break
                 except Exception as ex:
                     exs.append(ex)
+                    continue
+                # internal-only; never leaves the process
+                tc.pop(BATCH_ID_KEY, None)
+                cs.append(tc)
 
             count += len(cs)
             return {
@@ -379,6 +395,9 @@ class RecordTests:
                 # testSuite and flavors are applied only when the no-build option is enabled
                 "testSuite": test_suite_name,
                 "flavors": flavors,
+                # The recording agent's UTC offset, sent once per request. Only the client knows it;
+                # the server needs it to resolve naive (offset-less) suite timestamps.
+                "agentUtcOffset": _agent_utc_offset(),
             }, exs
 
         def send(payload: Dict[str, Union[str, List]]) -> None:
@@ -505,16 +524,27 @@ def summarize_case_events(events: Iterable[CaseEventType]) -> Tuple[int, int, in
     Summarizes a stream of case events into (test_count, success_count, fail_count, duration_minutes),
     for the "Tests found / Tests passed / Tests failed" table printed after `record tests` runs.
 
-    Grouped by testPath rather than counted per event: a flaky/rerun testcase produces multiple
-    events (see CaseEvent.from_case_and_suite), but it's still a single test. A test that ever
-    passed counts as passed (even if it also failed on earlier attempts); a test that only ever
-    failed counts as failed.
+    Grouped by which original testcase an event came from, not counted per event: a flaky/rerun
+    testcase produces multiple events (see CaseEvent.from_case_and_suite), but it's still a
+    single test. A test that ever passed counts as passed (even if it also failed on earlier
+    attempts); a test that only ever failed counts as failed.
+
+    JUnit-based events carry BATCH_ID_KEY (one id per original <testcase>, see
+    from_case_and_suite), which is used as the grouping key directly. Other runners (e.g. raw)
+    build events without going through from_case_and_suite, so they never have that key; for
+    those, fall back to grouping by testPath's complete attribute set. This fallback never
+    assumes a component has "type"/"name" specifically -- TestPathComponent is an arbitrary
+    bag of string attributes (see raw's free-form testPath/testPathComponents) -- and keeps
+    every attribute, not just type/name, so two components differing only in some other
+    attribute are never treated as the same path.
     """
-    tests: Dict[Tuple, Dict[str, bool]] = {}
+    tests: Dict[Any, Dict[str, bool]] = {}
     duration = float(0)
 
     for tc in events:
-        key = tuple((p["type"], p["name"]) for p in tc.get("testPath", []))
+        key = tc.get(BATCH_ID_KEY)
+        if key is None:
+            key = tuple(tuple(sorted(p.items())) for p in tc.get("testPath", []))
         entry = tests.setdefault(key, {"passed": False, "failed": False})
         status = tc.get("status")
         if status == 1:

{smart_tests_cli-2.16.4 → smart_tests_cli-2.16.5}/smart_tests_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smart-tests-cli
-Version: 2.16.4
+Version: 2.16.5
 Summary: Smart Tests CLI
 Author-email: CloudBees <support@cloudbees.com>
 License: Apache Software License v2

smart_tests_cli-2.16.5/smart_tests_cli.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "2.16.5",
+  "distance": 0,
+  "node": "g22c5f90cd19753d0f56a681be9c2901e5034f2a2",
+  "dirty": false,
+  "branch": "main",
+  "node_date": "2026-10-29"
+}

{smart_tests_cli-2.16.4 → smart_tests_cli-2.16.5}/tests/cli_test_case.py

@@ -222,11 +222,14 @@ class CliTestCase(unittest.TestCase):
         if not payload:
             payload = self.decode_request_body(self.find_request('/events').request.body)
 
-        # Remove timestamp because it depends on the machine clock
+        # Remove the suite timestamp: goldens compared here don't assert it (it's the raw report
+        # value now; dedicated runner tests assert it directly).
         for c in payload['events']:
-            del c['createdAt']
-        # metadata includes server dependent data
+            c.pop('createdAt', None)
+            c.pop('junitSuiteTimestamp', None)
+        # metadata and the agent offset include machine/clock-dependent data
         del payload['metadata']
+        payload.pop('agentUtcOffset', None)
 
         expected = self.load_json_from_file(self.test_files_dir.joinpath(golden_image_filename))
         self.assert_json_orderless_equal(expected, payload)

smart_tests_cli-2.16.5/tests/commands/record/test_case_event.py

@@ -0,0 +1,23 @@
+import unittest
+
+from smart_tests.commands.record.case_event import CaseEvent
+
+
+class TestCaseEventTimestamp(unittest.TestCase):
+    """The CLI no longer resolves timezones: it sends the raw suite timestamp and the server
+    resolves it. These tests pin that raw-passthrough contract."""
+
+    def test_suite_timestamp_is_sent_raw_and_unresolved(self):
+        ts = "2024-06-23T12:34:56.789 PDT"
+        result = CaseEvent.create(
+            test_path=[], duration_secs=1.0, status=CaseEvent.TEST_PASSED, timestamp=ts
+        )
+        # Sent verbatim, with no client-side timezone resolution, and no resolved createdAt.
+        self.assertEqual(result["junitSuiteTimestamp"], ts)
+        self.assertNotIn("createdAt", result)
+
+    def test_absent_timestamp_is_none(self):
+        result = CaseEvent.create(
+            test_path=[], duration_secs=1.0, status=CaseEvent.TEST_PASSED, timestamp=None
+        )
+        self.assertIsNone(result["junitSuiteTimestamp"])

{smart_tests_cli-2.16.4 → smart_tests_cli-2.16.5}/tests/data/minitest/record_test_result_chunk1.json

@@ -14,7 +14,7 @@
       "status": 1,
       "stdout": "",
       "stderr": "",
-      "createdAt": "2020-12-23T13:10:01+09:00",
+      "junitSuiteTimestamp": "2020-12-23T13:10:01+09:00",
       "data": null
     },
     {
@@ -31,7 +31,7 @@
       "status": 1,
       "stdout": "",
       "stderr": "",
-      "createdAt": "2020-12-23T13:10:01+09:00",
+      "junitSuiteTimestamp": "2020-12-23T13:10:01+09:00",
       "data": null
     },
     {
@@ -48,7 +48,7 @@
       "status": 1,
       "stdout": "",
       "stderr": "",
-      "createdAt": "2020-12-23T13:10:01+09:00",
+      "junitSuiteTimestamp": "2020-12-23T13:10:01+09:00",
       "data": null
     },
     {
@@ -65,7 +65,7 @@
       "status": 1,
       "stdout": "",
       "stderr": "",
-      "createdAt": "2020-12-23T13:10:01+09:00",
+      "junitSuiteTimestamp": "2020-12-23T13:10:01+09:00",
       "data": null
     },
     {
@@ -82,7 +82,7 @@
       "status": 1,
       "stdout": "",
       "stderr": "",
-      "createdAt": "2020-12-23T13:10:01+09:00",
+      "junitSuiteTimestamp": "2020-12-23T13:10:01+09:00",
       "data": null
     }
   ],

{smart_tests_cli-2.16.4 → smart_tests_cli-2.16.5}/tests/data/minitest/record_test_result_chunk2.json

@@ -14,7 +14,7 @@
       "status": 1,
       "stdout": "",
       "stderr": "",
-      "createdAt": "2020-12-23T13:10:01+09:00",
+      "junitSuiteTimestamp": "2020-12-23T13:10:01+09:00",
       "data": null
     },
     {
@@ -31,7 +31,7 @@
       "status": 1,
       "stdout": "",
       "stderr": "",
-      "createdAt": "2020-12-23T13:10:01+09:00",
+      "junitSuiteTimestamp": "2020-12-23T13:10:01+09:00",
       "data": null
     },
     {
@@ -45,7 +45,7 @@
       "status": 1,
       "stdout": "",
       "stderr": "",
-      "createdAt": "2020-12-23T13:10:01+09:00",
+      "junitSuiteTimestamp": "2020-12-23T13:10:01+09:00",
       "data": null
     }
   ],

{smart_tests_cli-2.16.4 → smart_tests_cli-2.16.5}/tests/test_runners/test_raw.py

@@ -6,7 +6,6 @@ from unittest import mock
 
 import dateutil.parser
 import responses  # type: ignore
-from dateutil.tz import tzlocal
 
 from smart_tests.test_runners.raw import _needs_test_path_file
 from smart_tests.utils.http_client import get_base_url
@@ -229,6 +228,7 @@ class RawTest(CliTestCase):
             # Check request body
             payload = json.loads(gzip.decompress(self.find_request('/events').request.body).decode())
             del payload['metadata']
+            payload.pop('agentUtcOffset', None)
             self.assert_json_orderless_equal(payload, {
                 'events': [
                     {
@@ -240,7 +240,7 @@ class RawTest(CliTestCase):
                         'status': 1,
                         'stdout': 'This is stdout',
                         'stderr': 'This is stderr',
-                        'createdAt': test_ruby_timestamp.replace(tzinfo=tzlocal()).isoformat(),
+                        'junitSuiteTimestamp': str(test_ruby_timestamp),
                         'data': None,
                         'type': 'case',
                     },
@@ -253,7 +253,7 @@ class RawTest(CliTestCase):
                         'status': 1,
                         'stdout': 'This is stdout',
                         'stderr': 'This is stderr',
-                        'createdAt': test_go_timestamp.replace(tzinfo=tzlocal()).isoformat(),
+                        'junitSuiteTimestamp': str(test_go_timestamp),
                         'data': None,
                         'type': 'case',
                     },
@@ -267,7 +267,7 @@ class RawTest(CliTestCase):
                         'status': 1,
                         'stdout': 'This is stdout',
                         'stderr': 'This is stderr',
-                        'createdAt': test_java_timestamp.replace(tzinfo=tzlocal()).isoformat(),
+                        'junitSuiteTimestamp': str(test_java_timestamp),
                         'data': None,
                         'type': 'case',
                     },
@@ -280,7 +280,7 @@ class RawTest(CliTestCase):
                         'status': 1,
                         'stdout': 'This is stdout',
                         'stderr': 'This is stderr',
-                        'createdAt': test_python_timestamp.replace(tzinfo=tzlocal()).isoformat(),
+                        'junitSuiteTimestamp': str(test_python_timestamp),
                         'data': {"lineNumber": 5},
                         'type': 'case',
                     },
@@ -333,6 +333,7 @@ class RawTest(CliTestCase):
             # Check request body
             payload = json.loads(gzip.decompress(self.find_request('/events').request.body).decode())
             del payload['metadata']
+            payload.pop('agentUtcOffset', None)
             self.assert_json_orderless_equal(payload, {
                 'events': [
                     {
@@ -344,7 +345,7 @@ class RawTest(CliTestCase):
                         'status': 1,
                         'stdout': '',
                         'stderr': '',
-                        'createdAt': timestamp1.replace(tzinfo=tzlocal()).isoformat(),
+                        'junitSuiteTimestamp': str(timestamp1),
                         'data': None,
                         'type': 'case',
                     },
@@ -357,7 +358,7 @@ class RawTest(CliTestCase):
                         'status': 1,
                         'stdout': '',
                         'stderr': '',
-                        'createdAt': timestamp2.replace(tzinfo=tzlocal()).isoformat(),
+                        'junitSuiteTimestamp': str(timestamp2),
                         'data': None,
                         'type': 'case',
                     },

smart_tests_cli-2.16.4/smart_tests_cli.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "2.16.4",
-  "distance": 0,
-  "node": "gbb714cee4322e037748a9dcff0e515afdf6edfb7",
-  "dirty": false,
-  "branch": "main",
-  "node_date": "2026-10-26"
-}

smart_tests_cli-2.16.4/tests/commands/record/test_case_event.py

@@ -1,37 +0,0 @@
-import unittest
-from io import StringIO
-from unittest import mock
-
-from smart_tests.commands.record.case_event import CaseEvent
-
-UNKNOWN_TIMEZONE_WARNING = "UnknownTimezoneWarning"
-
-
-class TestCaseEventTimestamp(unittest.TestCase):
-    def test_timestamp_with_known_abbreviation(self):
-        # Use a known abbreviation from COMMON_TIMEZONES
-        ts = "2024-06-23T12:34:56.789 PDT"  # PDT is in COMMON_TIMEZONES
-        with mock.patch('sys.stderr', new=StringIO()) as stderr:
-            result = CaseEvent.create(
-                test_path=[], duration_secs=1.0, status=CaseEvent.TEST_PASSED, timestamp=ts
-            )
-            # Should parse to ISO format with correct offset
-            self.assertEqual(result["createdAt"], "2024-06-23T12:34:56.789000-07:00")
-            # Should NOT output a warning to stderr
-            self.assertNotIn(UNKNOWN_TIMEZONE_WARNING, stderr.getvalue())
-
-    def test_timestamp_with_unknown_abbreviation(self):
-        # Use an unknown abbreviation
-        ts = "2024-06-23T12:34:56.789 XYZ"  # XYZ is not in COMMON_TIMEZONES
-        with mock.patch('sys.stderr', new=StringIO()) as stderr:
-            result = CaseEvent.create(
-                test_path=[], duration_secs=1.0, status=CaseEvent.TEST_PASSED, timestamp=ts
-            )
-            # Should output a warning to stderr
-            self.assertIn(UNKNOWN_TIMEZONE_WARNING, stderr.getvalue())
-            # The createdAt may still start with the input timestamp, but should not have a timezone offset
-            # We check that the prefix matches the input timestamp because
-            # `dateutil.parser` will use the system's default timezone if it
-            # encounters an unknown timezone abbreviation (e.g., 'XYZ'), resulting in
-            # a timestamp like '2024-06-23T12:34:56.789000+09:00'.
-            self.assertTrue(result["createdAt"].startswith("2024-06-23T12:34:56.789"))