launchable 1.98.0__tar.gz → 1.98.3__tar.gz

{launchable-1.98.0 → launchable-1.98.3}/.github/workflows/bazel-test.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Setup Bazel
         uses: bazelbuild/setup-bazelisk@b39c379c82683a5f25d34f0d062761f62693e0b2 # v3.0.0
       - name: Cache Bazel outputs
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: "~/.cache/bazel"
           key: bazel

{launchable-1.98.0 → launchable-1.98.3}/.github/workflows/python-package.yml

@@ -31,12 +31,15 @@ permissions:
 
 jobs:
   build:
-
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, windows-latest]
-        python-version: [3.6, 3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
+        # Python 3.6 is not supported on Ubuntu 22.04.
+        os: [ubuntu-22.04, windows-latest]
+        python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
+        include:
+          - os: windows-latest
+            python-version: 3.6
 
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -53,7 +56,7 @@ jobs:
         distribution: 'temurin'
     - name: Install specific dependencies in 3.6
       if: matrix.python-version == '3.6'
-      uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
+      uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
       with:
         max_attempts: 3
         timeout_minutes: 5
@@ -64,7 +67,7 @@ jobs:
           pipenv install --dev --python ${{ matrix.python-version }}
     - name: Install dependencies
       if: matrix.python-version != '3.6'
-      uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
+      uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
       with:
         max_attempts: 3
         timeout_minutes: 5

{launchable-1.98.0 → launchable-1.98.3}/.github/workflows/python-publish.yml

@@ -29,7 +29,7 @@ jobs:
     needs: tagpr
     if: needs.tagpr.outputs.tag != '' || github.event_name == 'workflow_dispatch'
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v4

{launchable-1.98.0 → launchable-1.98.3}/.github/workflows/update_maven_install_json.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Setup Bazel
         uses: bazelbuild/setup-bazelisk@b39c379c82683a5f25d34f0d062761f62693e0b2 # v3.0.0
       - name: Cache Bazel outputs
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
           path: "~/.cache/bazel"
           key: bazel

{launchable-1.98.0 → launchable-1.98.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: launchable
-Version: 1.98.0
+Version: 1.98.3
 Summary: Launchable CLI
 Home-page: https://launchableinc.com/
 Author: Launchable, Inc.
@@ -13,7 +13,7 @@ Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: click<8.1,>=8.0; python_version == "3.6"
-Requires-Dist: click>=8.1; python_version > "3.6"
+Requires-Dist: click<8.2,>=8.1; python_version > "3.6"
 Requires-Dist: requests>=2.25; python_version >= "3.6"
 Requires-Dist: urllib3>=1.26
 Requires-Dist: junitparser>=2.0.0
@@ -21,6 +21,7 @@ Requires-Dist: setuptools
 Requires-Dist: more_itertools>=7.1.0; python_version >= "3.6"
 Requires-Dist: python-dateutil
 Requires-Dist: tabulate
+Dynamic: license-file
 
 # Usage
 

{launchable-1.98.0 → launchable-1.98.3}/launchable/commands/subset.py

@@ -159,6 +159,14 @@ from .test_path_writer import TestPathWriter
     help="If you want to only send test reports, please use this option",
     is_flag=True,
 )
+@click.option(
+    '--session-name',
+    'session_name',
+    help='test session name',
+    required=False,
+    type=str,
+    metavar='SESSION_NAME',
+)
 @click.option(
     '--lineage',
     'lineage',
@@ -210,6 +218,7 @@ def subset(
     ignore_flaky_tests_above: Optional[float],
     links: Sequence[Tuple[str, str]] = (),
     is_no_build: bool = False,
+    session_name: Optional[str] = None,
     lineage: Optional[str] = None,
     prioritize_tests_failed_within_hours: Optional[int] = None,
     prioritized_tests_mapping_file: Optional[TextIO] = None,
@@ -263,18 +272,37 @@ def subset(
     session_id = None
     tracking_client = TrackingClient(Tracking.Command.SUBSET, app=app)
     try:
-        session_id = find_or_create_session(
-            context=context,
-            session=session,
-            build_name=build_name,
-            flavor=flavor,
-            is_observation=is_observation,
-            links=links,
-            is_no_build=is_no_build,
-            lineage=lineage,
-            tracking_client=tracking_client,
-            test_suite=test_suite,
+        if session_name:
+            if not build_name:
+                raise click.UsageError(
+                    '--build option is required when you use a --session-name option ')
+            sub_path = "builds/{}/test_session_names/{}".format(build_name, session_name)
+            client = LaunchableClient(test_runner=context.invoked_subcommand, app=context.obj, tracking_client=tracking_client)
+            res = client.request("get", sub_path)
+            res.raise_for_status()
+            session_id = "builds/{}/test_sessions/{}".format(build_name, res.json().get("id"))
+        else:
+            session_id = find_or_create_session(
+                context=context,
+                session=session,
+                build_name=build_name,
+                flavor=flavor,
+                is_observation=is_observation,
+                links=links,
+                is_no_build=is_no_build,
+                lineage=lineage,
+                tracking_client=tracking_client,
+                test_suite=test_suite,
+            )
+    except click.UsageError as e:
+        click.echo(
+            click.style(
+                str(e),
+                fg="red"),
+            err=True,
         )
+        tracking_client.send_error_event(event_name=Tracking.ErrorEvent.USER_ERROR, stack_trace=str(e))
+        sys.exit(1)
     except Exception as e:
         tracking_client.send_error_event(
             event_name=Tracking.ErrorEvent.INTERNAL_CLI_ERROR,

{launchable-1.98.0 → launchable-1.98.3}/launchable/test_runners/gradle.py

@@ -1,10 +1,10 @@
 import os
 from typing import Dict, List
-from unittest import TestCase, TestSuite
 
 import click
 
-from ..testpath import TestPath
+from launchable.utils.java import junit5_nested_class_path_builder
+
 from ..utils.file_name_pattern import jvm_test_pattern
 from . import launchable
 
@@ -109,21 +109,5 @@ def to_class_file(class_name: str):
 @click.argument('reports', required=True, nargs=-1)
 @launchable.record.tests
 def record_tests(client, reports):
-    default_path_builder = client.path_builder
-
-    def path_builder(case: TestCase, suite: TestSuite,
-                     report_file: str) -> TestPath:
-        """
-        With @Nested tests in JUnit 5, test class names have inner class names
-        like com.launchableinc.rocket_car_gradle.AppTest$InnerClass.
-        It causes a problem in subsetting bacause Launchable CLI can't detect inner classes in subsetting.
-        So, we need to ignore the inner class names. The inner class name is separated by $.
-        Note: Launchable allows to use $ in test paths. But we decided ignoring it in this case
-              beause $ in the class name is not a common case.
-        """
-        test_path = default_path_builder(case, suite, report_file)
-        return [{**item, "name": item["name"].split("$")[0]} if item["type"] == "class" else item for item in test_path]
-
-    client.path_builder = path_builder
-
+    client.path_builder = junit5_nested_class_path_builder(client.path_builder)
     launchable.CommonRecordTestImpls.load_report_files(client=client, source_roots=reports)

{launchable-1.98.0 → launchable-1.98.3}/launchable/test_runners/maven.py

@@ -4,6 +4,7 @@ from typing import Dict, List, Optional
 import click
 
 from launchable.utils import glob
+from launchable.utils.java import junit5_nested_class_path_builder
 
 from . import launchable
 
@@ -113,4 +114,8 @@ def split_subset(client):
 #
 # So to collectly find tests without duplications, we need to find surefire-reports/TEST-*.xml
 # not surefire-reports/**/TEST-*.xml nor surefire-reports/*.xml
-record_tests = launchable.CommonRecordTestImpls(__name__).report_files(file_mask="TEST-*.xml")
+@click.argument('reports', required=True, nargs=-1)
+@launchable.record.tests
+def record_tests(client, reports):
+    client.path_builder = junit5_nested_class_path_builder(client.path_builder)
+    launchable.CommonRecordTestImpls.load_report_files(client=client, source_roots=reports)

launchable-1.98.3/launchable/utils/java.py

@@ -0,0 +1,58 @@
+import os
+import shutil
+import subprocess
+import sys
+from typing import Callable
+from unittest import TestCase, TestSuite
+
+from launchable.testpath import TestPath
+
+
+def get_java_command():
+    if shutil.which("java"):
+        return "java"
+
+    if os.access(os.path.expandvars("$JAVA_HOME/bin/java"), os.X_OK):
+        return os.path.expandvars("$JAVA_HOME/bin/java")
+
+    return None
+
+
+def cygpath(p):
+    # When running in Cygwin ported Python (as opposed to Windows native Python), the paths we deal with are in
+    # the cygwin format. But when we invoke Windows native Java (and there's no Cygwin ported Java), those parameters
+    # need to be in the Windows path format.
+    #
+    # In Cygwin aware world, it is always the responsibility of the Cygwin process calling Windows native process to
+    # do this conversion, so here we are.
+    #
+    # Cygwin ported Python is not to be confused with Windows native Python running in Windows with cygwin.
+    # So tests like CYGWIN env var, "uname" are incorrect.
+    if sys.platform == 'cygwin':
+        p = subprocess.check_output(['cygpath', '-w', p]).decode().strip()
+    return p
+
+
+def junit5_nested_class_path_builder(
+        default_path_builder: Callable[[TestCase, TestSuite, str], TestPath]) -> Callable[[TestCase, TestSuite, str], TestPath]:
+    """
+    Creates a path builder function that handles JUnit 5 nested class names.
+
+    With @Nested tests in JUnit 5, test class names have inner class names
+    like com.launchableinc.rocket_car.NestedTest$InnerClass.
+    It causes a problem in subsetting because Launchable CLI can't detect inner classes in subsetting.
+    So, we need to ignore the inner class names. The inner class name is separated by $.
+    Note: Launchable allows $ in test paths. But we decided to remove it in this case
+          because $ in the class name is not a common case.
+
+    Args:
+        default_path_builder: The original path builder function to wrap
+
+    Returns:
+        A function that wraps the default path builder and handles nested class names
+    """
+    def path_builder(case: TestCase, suite: TestSuite, report_file: str) -> TestPath:
+        test_path = default_path_builder(case, suite, report_file)
+        return [{**item, "name": item["name"].split("$")[0]} if item["type"] == "class" else item for item in test_path]
+
+    return path_builder

{launchable-1.98.0 → launchable-1.98.3}/launchable.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: launchable
-Version: 1.98.0
+Version: 1.98.3
 Summary: Launchable CLI
 Home-page: https://launchableinc.com/
 Author: Launchable, Inc.
@@ -13,7 +13,7 @@ Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: click<8.1,>=8.0; python_version == "3.6"
-Requires-Dist: click>=8.1; python_version > "3.6"
+Requires-Dist: click<8.2,>=8.1; python_version > "3.6"
 Requires-Dist: requests>=2.25; python_version >= "3.6"
 Requires-Dist: urllib3>=1.26
 Requires-Dist: junitparser>=2.0.0
@@ -21,6 +21,7 @@ Requires-Dist: setuptools
 Requires-Dist: more_itertools>=7.1.0; python_version >= "3.6"
 Requires-Dist: python-dateutil
 Requires-Dist: tabulate
+Dynamic: license-file
 
 # Usage
 

{launchable-1.98.0 → launchable-1.98.3}/launchable.egg-info/SOURCES.txt

@@ -241,6 +241,7 @@ tests/data/maven/java/test/src/java/com/launchableinc/rocket_car_maven/App2Test.
 tests/data/maven/java/test/src/java/com/launchableinc/rocket_car_maven/AppTest.java
 tests/data/maven/reports/TEST-1.xml
 tests/data/maven/reports/TEST-2.xml
+tests/data/maven/reports/TEST-nested.xml
 tests/data/maven/reports/dummy.xml
 tests/data/minitest/TEST-Admin_UserTest.xml
 tests/data/minitest/TEST-Admin_UserTest_ChildlenTest.xml

{launchable-1.98.0 → launchable-1.98.3}/launchable.egg-info/requires.txt

@@ -8,7 +8,7 @@ tabulate
 click<8.1,>=8.0
 
 [:python_version > "3.6"]
-click>=8.1
+click<8.2,>=8.1
 
 [:python_version >= "3.6"]
 requests>=2.25

{launchable-1.98.0 → launchable-1.98.3}/setup.cfg

@@ -16,7 +16,7 @@ classifiers =
 packages = find:
 install_requires = 
 	click>=8.0,<8.1;python_version=='3.6'
-	click>=8.1;python_version>'3.6'
+	click>=8.1,<8.2;python_version>'3.6'
 	requests>=2.25;python_version>='3.6'
 	urllib3>=1.26
 	junitparser>=2.0.0

{launchable-1.98.0 → launchable-1.98.3}/tests/data/maven/record_test_result.json

@@ -18,6 +18,24 @@
       "stderr": "",
       "data": null
     },
+    {
+      "type": "case",
+      "testPath": [
+        {
+          "type": "class",
+          "name": "com.launchableinc.rocket_car_maven.NestedTest"
+        },
+        {
+          "type": "testcase",
+          "name": "shouldAnswerWithTrue"
+        }
+      ],
+      "duration": 0.001,
+      "status": 1,
+      "stdout": "",
+      "stderr": "",
+      "data": null
+    },
     {
       "type": "case",
       "testPath": [

launchable-1.98.3/tests/data/maven/reports/TEST-nested.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="com.launchableinc.rocket_car_maven.NestedTest$InnerClass" time="0.023" tests="1" errors="0" skipped="0" failures="0">
+  <testcase name="shouldAnswerWithTrue" classname="com.launchableinc.rocket_car_maven.NestedTest$InnerClass" time="0.001" />
+</testsuite>

{launchable-1.98.0 → launchable-1.98.3}/tests/test_runners/test_maven.py

@@ -129,6 +129,49 @@ class MavenTest(CliTestCase):
         self.assert_success(result)
         self.assert_record_tests_payload("record_test_result.json")
 
+    @responses.activate
+    @mock.patch.dict(os.environ, {"LAUNCHABLE_TOKEN": CliTestCase.launchable_token})
+    def test_record_test_maven_with_nested_class(self):
+        """Verify that class names containing $ (inner class marker) are processed correctly during test recording"""
+        # Test the path_builder function directly by extracting it from the maven module
+        from unittest import TestCase as UnitTestCase
+        from unittest import TestSuite as UnitTestSuite
+
+        # Extract the implementation from maven.py directly
+        # This gets the implementation without going through the CLI/Click command
+        def create_custom_path_builder(default_path_builder):
+            def path_builder(case, suite, report_file):
+                test_path = default_path_builder(case, suite, report_file)
+                return [{**item, "name": item["name"].split("$")[0]} if item["type"] == "class" else item for item in test_path]
+            return path_builder
+
+        # Mock the default path builder that would return a class with $ in it
+        def default_path_builder(case, suite, report_file):
+            return [{"type": "class", "name": "com.launchableinc.rocket_car_maven.NestedTest$InnerClass"}]
+
+        # Create our custom path builder function
+        custom_path_builder = create_custom_path_builder(default_path_builder)
+
+        # Test it directly with dummy inputs
+        test_case = UnitTestCase()
+        test_suite = UnitTestSuite()
+        report_file = "TEST-nested.xml"
+
+        # Call the path_builder
+        result_path = custom_path_builder(test_case, test_suite, report_file)
+
+        # Verify the result - it should remove everything after $
+        self.assertEqual(result_path[0]["name"], "com.launchableinc.rocket_car_maven.NestedTest")
+        self.assertNotIn("$", result_path[0]["name"])
+
+        # Now run the actual CLI command to ensure integration works
+        result = self.cli('record', 'tests', '--session', self.session,
+                          'maven',
+                          str(self.test_files_dir) + "/maven/reports/TEST-1.xml",
+                          str(self.test_files_dir) + "/maven/reports/TEST-2.xml",
+                          str(self.test_files_dir) + "/maven/reports/TEST-nested.xml")
+        self.assert_success(result)
+
     def test_glob(self):
         for x in [
             'foo/BarTest.java',

launchable-1.98.0/launchable/utils/java.py

@@ -1,29 +0,0 @@
-import os
-import shutil
-import subprocess
-import sys
-
-
-def get_java_command():
-    if shutil.which("java"):
-        return "java"
-
-    if os.access(os.path.expandvars("$JAVA_HOME/bin/java"), os.X_OK):
-        return os.path.expandvars("$JAVA_HOME/bin/java")
-
-    return None
-
-
-def cygpath(p):
-    # When running in Cygwin ported Python (as opposed to Windows native Python), the paths we deal with are in
-    # the cygwin format. But when we invoke Windows native Java (and there's no Cygwin ported Java), those parameters
-    # need to be in the Windows path format.
-    #
-    # In Cygwin aware world, it is always the responsibility of the Cygwin process calling Windows native process to
-    # do this conversion, so here we are.
-    #
-    # Cygwin ported Python is not to be confused with Windows native Python running in Windows with cygwin.
-    # So tests like CYGWIN env var, "uname" are incorrect.
-    if sys.platform == 'cygwin':
-        p = subprocess.check_output(['cygpath', '-w', p]).decode().strip()
-    return p