launchable 1.87.1__tar.gz → 1.87.2__tar.gz

{launchable-1.87.1 → launchable-1.87.2}/.github/workflows/bazel-test.yml

@@ -16,7 +16,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
       - name: Set up JDK 8
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:

{launchable-1.87.1 → launchable-1.87.2}/.github/workflows/python-package.yml

@@ -39,7 +39,7 @@ jobs:
         python-version: [3.6, 3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
 
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
       with:
         fetch-depth: 0
     - name: Set up Python ${{ matrix.python-version }}

{launchable-1.87.1 → launchable-1.87.2}/.github/workflows/python-publish.yml

@@ -19,7 +19,7 @@ jobs:
     outputs:
       tag: ${{ steps.run-tagpr.outputs.tag }}
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
     - id: run-tagpr
       uses: Songmu/tagpr@4c8e0c433614e5915a7049413885246b854dfd4e # v1.2.0
       env:

{launchable-1.87.1 → launchable-1.87.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: launchable
-Version: 1.87.1
+Version: 1.87.2
 Summary: Launchable CLI
 Home-page: https://launchableinc.com/
 Author: Launchable, Inc.

{launchable-1.87.1 → launchable-1.87.2}/launchable/test_runners/launchable.py

@@ -104,33 +104,37 @@ class CommonRecordTestImpls:
 
         @click.argument('source_roots', required=True, nargs=-1)
         def record_tests(client, source_roots):
-            # client type: RecordTests in def launchable.commands.record.tests.tests
-            # Accept both file names and GLOB patterns
-            # Simple globs like '*.xml' can be dealt with by shell, but
-            # not all shells consistently deal with advanced GLOBS like '**'
-            # so it's worth supporting it here.
-            for root in source_roots:
-                match = False
-                for t in glob.iglob(root, recursive=True):
-                    match = True
-                    if os.path.isdir(t):
-                        client.scan(t, file_mask)
-                    else:
-                        client.report(t)
-
-                if not match:
-                    # By following the shell convention, if the file doesn't exist or GLOB doesn't match anything,
-                    # raise it as an error. Note this can happen for reasons other than a configuration error.
-                    # For example, if a build catastrophically failed and no
-                    # tests got run.
-                    click.echo("No matches found: {}".format(root), err=True)
-                    # intentionally exiting with zero
-                    return
-
-            client.run()
+            CommonRecordTestImpls.load_report_files(client=client, source_roots=source_roots, file_mask=file_mask)
 
         return wrap(record_tests, record_tests_cmd, self.cmdname)
 
+    @classmethod
+    def load_report_files(cls, client, source_roots, file_mask="*.xml"):
+        # client type: RecordTests in def launchable.commands.record.tests.tests
+        # Accept both file names and GLOB patterns
+        # Simple globs like '*.xml' can be dealt with by shell, but
+        # not all shells consistently deal with advanced GLOBS like '**'
+        # so it's worth supporting it here.
+        for root in source_roots:
+            match = False
+            for t in glob.iglob(root, recursive=True):
+                match = True
+                if os.path.isdir(t):
+                    client.scan(t, file_mask)
+                else:
+                    client.report(t)
+
+            if not match:
+                # By following the shell convention, if the file doesn't exist or GLOB doesn't match anything,
+                # raise it as an error. Note this can happen for reasons other than a configuration error.
+                # For example, if a build catastrophically failed and no
+                # tests got run.
+                click.echo("No matches found: {}".format(root), err=True)
+                # intentionally exiting with zero
+                return
+
+        client.run()
+
 
 class CommonSplitSubsetImpls:
     def __init__(

launchable-1.87.2/launchable/test_runners/minitest.py

@@ -0,0 +1,33 @@
+import glob
+import os
+from . import launchable
+from junitparser import TestCase, TestSuite  # type: ignore
+from ..testpath import TestPath
+import click
+
+subset = launchable.CommonSubsetImpls(__name__).scan_files('*_test.rb')
+split_subset = launchable.CommonSplitSubsetImpls(__name__).split_subset()
+
+TEST_PATH_ORDER = {"file": 1, "class": 2, "testcase": 3}
+
+
+@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:
+        test_path = default_path_builder(case, suite, report_file)
+        if not any(item.get("type") == "class" for item in test_path):
+            # mintiest-ci sets a class name in name attribute in testsuite tag.
+            # https://github.com/CircleCI-Public/minitest-ci/blob/v3.4.0/lib/minitest/ci_plugin.rb#L86-L87
+            # https://github.com/CircleCI-Public/minitest-ci/blob/v3.4.0/lib/minitest/ci_plugin.rb#L132
+            classname = suite._elem.attrib.get("name")
+            if classname:
+                test_path.append({"type": "class", "name": classname})
+                test_path = sorted(test_path, key=lambda x: TEST_PATH_ORDER[x["type"]])
+        return test_path
+
+    client.path_builder = path_builder
+
+    launchable.CommonRecordTestImpls.load_report_files(client=client, source_roots=reports)

{launchable-1.87.1 → launchable-1.87.2}/launchable/test_runners/nunit.py

@@ -154,20 +154,8 @@ split_subset = launchable.CommonSplitSubsetImpls(__name__, formatter=lambda x: '
 @click.argument('report_xml', required=True, nargs=-1)
 @launchable.record.tests
 def record_tests(client, report_xml):
-    # TODO: copied from ctest -- promote this pattern
-    for root in report_xml:
-        match = False
-        for t in glob.iglob(root, recursive=True):
-            match = True
-            if os.path.isdir(t):
-                client.scan(t, "*.xml")
-            else:
-                client.report(t)
-        if not match:
-            click.echo("No matches found: {}".format(root), err=True)
-
     client.parse_func = nunit_parse_func
-    client.run()
+    launchable.CommonRecordTestImpls.load_report_files(client=client, source_roots=report_xml)
 
 
 """

{launchable-1.87.1 → launchable-1.87.2}/launchable.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: launchable
-Version: 1.87.1
+Version: 1.87.2
 Summary: Launchable CLI
 Home-page: https://launchableinc.com/
 Author: Launchable, Inc.

{launchable-1.87.1 → launchable-1.87.2}/tests/data/minitest/record_test_result.json

@@ -7,6 +7,10 @@
         {
           "type": "testcase",
           "name": "test_should_save_user_with_name"
+        },
+        {
+          "type": "class",
+          "name": "UserCopyTest"
         }
       ],
       "duration": 1.602778,
@@ -22,6 +26,10 @@
         {
           "type": "testcase",
           "name": "test_should_not_save_user_without_name"
+        },
+        {
+          "type": "class",
+          "name": "UserCopyTest"
         }
       ],
       "duration": 1.606243,
@@ -37,6 +45,10 @@
         {
           "type": "testcase",
           "name": "test_should_not_save_user_without_name"
+        },
+        {
+          "type": "class",
+          "name": "Admin::UserTest"
         }
       ],
       "duration": 1.611738,
@@ -52,6 +64,10 @@
         {
           "type": "testcase",
           "name": "test_should_save_user_with_name"
+        },
+        {
+          "type": "class",
+          "name": "Admin::UserTest"
         }
       ],
       "duration": 1.607029,
@@ -67,6 +83,10 @@
         {
           "type": "testcase",
           "name": "test_should_not_save_user_without_name_2"
+        },
+        {
+          "type": "class",
+          "name": "UserTest"
         }
       ],
       "duration": 1.614255,
@@ -82,6 +102,10 @@
         {
           "type": "testcase",
           "name": "test_should_save_user_with_name"
+        },
+        {
+          "type": "class",
+          "name": "UserControllerTest"
         }
       ],
       "duration": 1.617726,
@@ -97,7 +121,8 @@
         {
           "type": "testcase",
           "name": "test_should_not_save_user_without_name"
-        }
+        },
+        { "type": "class", "name": "UserControllerTest" }
       ],
       "duration": 1.611985,
       "status": 1,
@@ -109,7 +134,8 @@
       "type": "case",
       "testPath": [
         { "type": "file", "name": "test/models/admin/user_test.rb" },
-        { "type": "testcase", "name": "test_child" }
+        { "type": "testcase", "name": "test_child" },
+        { "type": "class", "name": "Admin::UserTest::ChildlenTest" }
       ],
       "duration": 1.599567,
       "status": 1,

{launchable-1.87.1 → launchable-1.87.2}/tests/data/minitest/record_test_result_chunk1.json

@@ -7,7 +7,8 @@
         {
           "type": "testcase",
           "name": "test_should_save_user_with_name"
-        }
+        },
+        { "type": "class", "name": "UserCopyTest" }
       ],
       "duration": 1.602778,
       "status": 1,
@@ -23,7 +24,8 @@
         {
           "type": "testcase",
           "name": "test_should_not_save_user_without_name"
-        }
+        },
+        { "type": "class", "name": "UserCopyTest" }
       ],
       "duration": 1.606243,
       "status": 1,
@@ -39,7 +41,8 @@
         {
           "type": "testcase",
           "name": "test_should_not_save_user_without_name"
-        }
+        },
+        { "type": "class", "name": "Admin::UserTest" }
       ],
       "duration": 1.611738,
       "status": 1,
@@ -55,7 +58,8 @@
         {
           "type": "testcase",
           "name": "test_should_save_user_with_name"
-        }
+        },
+        { "type": "class", "name": "Admin::UserTest" }
       ],
       "duration": 1.607029,
       "status": 1,
@@ -71,7 +75,8 @@
         {
           "type": "testcase",
           "name": "test_should_not_save_user_without_name_2"
-        }
+        },
+        { "type": "class", "name": "UserTest" }
       ],
       "duration": 1.614255,
       "status": 1,

{launchable-1.87.1 → launchable-1.87.2}/tests/data/minitest/record_test_result_chunk2.json

@@ -7,7 +7,8 @@
         {
           "type": "testcase",
           "name": "test_should_save_user_with_name"
-        }
+        },
+        { "type": "class", "name": "UserControllerTest" }
       ],
       "duration": 1.617726,
       "status": 1,
@@ -23,7 +24,8 @@
         {
           "type": "testcase",
           "name": "test_should_not_save_user_without_name"
-        }
+        },
+        { "type": "class", "name": "UserControllerTest" }
       ],
       "duration": 1.611985,
       "status": 1,
@@ -36,7 +38,8 @@
       "type": "case",
       "testPath": [
         { "type": "file", "name": "test/models/admin/user_test.rb" },
-        { "type": "testcase", "name": "test_child" }
+        { "type": "testcase", "name": "test_child" },
+        { "type": "class", "name": "Admin::UserTest::ChildlenTest" }
       ],
       "duration": 1.599567,
       "status": 1,

{launchable-1.87.1 → launchable-1.87.2}/tests/test_runners/test_minitest.py

@@ -20,6 +20,27 @@ class MinitestTest(CliTestCase):
         self.assert_success(result)
         self.assert_record_tests_payload('record_test_result.json')
 
+    # For testing https://github.com/launchableinc/cli/pull/846/files#r1591707246.
+    @responses.activate
+    @mock.patch.dict(os.environ, {"LAUNCHABLE_TOKEN": CliTestCase.launchable_token})
+    def test_record_test_minitest_test_path_order(self):
+        with tempfile.TemporaryDirectory() as tempdir:
+            test_path_file = os.path.join(tempdir, 'tests.xml')
+            with open(test_path_file, 'w') as f:
+                f.write("""<?xml version="1.0" encoding="UTF-8"?>
+<testsuite time='1.614255' skipped='0' failures='0' errors='0' name="UserTest" assertions='1' tests='1' timestamp="2020-12-23T13:10:01+09:00">
+  <testcase time='1.614255' file="test/models/open_class_user_test.rb" name="test_should_not_save_user_without_name_2" assertions='1'>
+  </testcase>
+</testsuite>""")  # noqa: E501
+            result = self.cli('record', 'tests', '--session', self.session, 'minitest', test_path_file)
+            self.assert_success(result)
+            payload = json.loads(gzip.decompress(self.find_request('/events').request.body).decode())
+            self.assertEqual(
+                payload['events'][0]['testPath'],
+                [{'type': 'file', 'name': 'test/models/open_class_user_test.rb'},
+                 {'type': 'class', 'name': 'UserTest'},
+                 {'type': 'testcase', 'name': 'test_should_not_save_user_without_name_2'}])
+
     @responses.activate
     @mock.patch.dict(os.environ, {"LAUNCHABLE_TOKEN": CliTestCase.launchable_token})
     def test_record_test_minitest_chunked(self):

launchable-1.87.1/launchable/test_runners/minitest.py

@@ -1,5 +0,0 @@
-from . import launchable
-
-subset = launchable.CommonSubsetImpls(__name__).scan_files('*_test.rb')
-split_subset = launchable.CommonSplitSubsetImpls(__name__).split_subset()
-record_tests = launchable.CommonRecordTestImpls(__name__).report_files()