launchable 1.124.2__tar.gz → 1.124.3__tar.gz

{launchable-1.124.2 → launchable-1.124.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: launchable
-Version: 1.124.2
+Version: 1.124.3
 Summary: Launchable CLI
 Home-page: https://launchableinc.com/
 Author: Launchable, Inc.

{launchable-1.124.2 → launchable-1.124.3}/launchable/commands/inspect/tests.py

@@ -56,8 +56,9 @@ class TestResultAbstractDisplay(metaclass=ABCMeta):
 
 
 class TestResultJSONDisplay(TestResultAbstractDisplay):
-    def __init__(self, results: TestResults):
+    def __init__(self, results: TestResults, client: LaunchableClient):
         super().__init__(results)
+        self._client = client
 
     def display(self):
         result_json = {}
@@ -88,12 +89,20 @@ class TestResultJSONDisplay(TestResultAbstractDisplay):
                 "created_at": result._created_at
             })
 
-        org, workspace = ensure_org_workspace()
-        result_json["test_session_app_url"] = "https://app.launchableinc.com/organizations/{}/workspaces/{}/test-sessions/{}".format(  # noqa: E501
-            org, workspace, self._results._test_session_id)
-
+        result_json["test_session_app_url"] = self._get_test_session_url()
         click.echo(json.dumps(result_json, indent=2))
 
+    def _get_test_session_url(self) -> str:
+        cbp_workspace = self._client.get_cbp_workspace()
+        if cbp_workspace:
+            org_cbp_id, ws_cbp_id = cbp_workspace
+            return "https://cloudbees.io/{}/{}/smart-tests/test-sessions/{}".format(
+                org_cbp_id, ws_cbp_id, self._results._test_session_id)
+        else:
+            org, workspace = ensure_org_workspace()
+            return "https://app.launchableinc.com/organizations/{}/workspaces/{}/test-sessions/{}".format(
+                org, workspace, self._results._test_session_id)
+
 
 class TestResultTableDisplay(TestResultAbstractDisplay):
     def __init__(self, results: TestResults):
@@ -179,7 +188,7 @@ def tests(context: click.core.Context, test_session_id: int, is_json_format: boo
 
     displayer: TestResultAbstractDisplay
     if is_json_format:
-        displayer = TestResultJSONDisplay(test_results)
+        displayer = TestResultJSONDisplay(test_results, client=client)
     else:
         displayer = TestResultTableDisplay(test_results)
 

{launchable-1.124.2 → launchable-1.124.3}/launchable/commands/record/build.py

@@ -362,14 +362,18 @@ def build(
         header = ["Name", "Path", "HEAD Commit"]
         rows = [[w.name, w.dir, w.commit_hash] for w in ws]
         click.echo(tabulate(rows, header, tablefmt="github"))
-        click.echo(
-            "\nVisit https://app.launchableinc.com/organizations/{organization}/workspaces/"
-            "{workspace}/data/builds/{build_id} to view this build and its test sessions"
-            .format(
-                organization=org,
-                workspace=workspace,
-                build_id=build_id,
-            ))
+        url = _get_build_url(build_id, org, workspace)
+        click.echo("\nVisit {} to view this build and its test sessions".format(url))
+
+    def _get_build_url(build_id, org, workspace) -> str:
+        cbp_workspace = client.get_cbp_workspace()
+        if cbp_workspace:
+            org_cbp_id, ws_cbp_id = cbp_workspace
+            url = "https://cloudbees.io/{}/{}/smart-tests/data/builds/{}".format(org_cbp_id, ws_cbp_id, build_id)
+        else:
+            url = "https://app.launchableinc.com/organizations/{}/workspaces/{}/data/builds/{}".format(
+                org, workspace, build_id)
+        return url
 
     # all the logics at the high level
     if len(commits) == 0:

{launchable-1.124.2 → launchable-1.124.3}/launchable/commands/record/tests.py

@@ -657,15 +657,21 @@ def tests(
                 click.echo(click.style("\nTotal test duration is 0."
                                        "\nPlease check whether the test duration times in report files are correct.", "yellow"))
 
+            url = self._get_test_session_url()
             click.echo(
-                "\nVisit https://app.launchableinc.com/organizations/{organization}/workspaces/"
-                "{workspace}/test-sessions/{test_session_id} to view uploaded test results "
-                "(or run `launchable inspect tests --test-session-id {test_session_id}`)"
-                .format(
-                    organization=org,
-                    workspace=workspace,
-                    test_session_id=self.test_session_id,
-                ))
+                "\nVisit {} to view uploaded test results "
+                "(or run `launchable inspect tests --test-session-id {}`)".format(url, self.test_session_id))
+
+        def _get_test_session_url(self) -> str:
+            cbp_workspace = client.get_cbp_workspace()
+            if cbp_workspace:
+                org_cbp_id, ws_cbp_id = cbp_workspace
+                url = "https://cloudbees.io/{}/{}/smart-tests/test-sessions/{}".format(
+                    org_cbp_id, ws_cbp_id, self.test_session_id)
+            else:
+                url = "https://app.launchableinc.com/organizations/{}/workspaces/{}/test-sessions/{}".format(
+                    org, workspace, self.test_session_id)
+            return url
 
     context.obj = RecordTests(dry_run=context.obj.dry_run)
 

{launchable-1.124.2 → launchable-1.124.3}/launchable/commands/subset.py

@@ -223,6 +223,14 @@ LARGE_PAYLOAD_CONNECT_TIMEOUT = 60
     type=click.Choice(["one-commit", "feature-branch", "recurring"]),
     hidden=True,  # control PTS v2 test selection behavior. Non-committed, so hidden for now.
 )
+@click.option(
+    "--subset-id-file",
+    "subset_id_file",
+    help="Write the subset ID to a file",
+    metavar="FILE",
+    type=str,
+    hidden=True,
+)
 @click.pass_context
 def subset(
     context: click.core.Context,
@@ -253,6 +261,7 @@ def subset(
     is_get_tests_from_guess: bool = False,
     use_case: Optional[str] = None,
     similarity: Optional[float] = None,
+    subset_id_file: Optional[str] = None,
 ):
     app = context.obj
     tracking_client = TrackingClient(Command.SUBSET, app=app)
@@ -392,6 +401,7 @@ def subset(
             self.is_get_tests_from_guess = is_get_tests_from_guess
             self.is_output_exclusion_rules = is_output_exclusion_rules
             self.is_get_tests_from_guess = is_get_tests_from_guess
+            self.subset_id_file = subset_id_file
             super(Optimize, self).__init__(app=app)
 
         def _default_output_handler(self, output: List[TestPath], rests: List[TestPath]):
@@ -566,6 +576,17 @@ def subset(
             if not found:
                 warn_and_exit_if_fail_fast_mode("Nothing that looks like a test file in the current git repository.")
 
+        def _write_subset_id_to_file(self, subset_result: SubsetResult):
+            if not subset_result.subset_id:
+                print_error_and_die(
+                    "Subset request did not return a subset ID. Please re-run the command.",
+                    Tracking.ErrorEvent.INTERNAL_CLI_ERROR,
+                )
+
+            assert self.subset_id_file is not None  # Early type guard
+            with open(self.subset_id_file, 'w', encoding='utf-8') as f:
+                f.write(str(subset_result.subset_id) + '\n')
+
         def request_subset(self) -> SubsetResult:
             test_runner = context.invoked_subcommand
             # temporarily extend the timeout because subset API response has become slow
@@ -648,6 +669,9 @@ def subset(
                 else:
                     self.output_handler(output_subset, output_rests)
 
+            if self.subset_id_file:
+                self._write_subset_id_to_file(subset_result)
+
             # When Launchable returns an error, the cli skips showing summary
             # report
             original_subset = subset_result.subset

{launchable-1.124.2 → launchable-1.124.3}/launchable/utils/launchable_client.py

@@ -25,6 +25,7 @@ class LaunchableClient:
         self.tracking_client = tracking_client
         self.organization, self.workspace = ensure_org_workspace()
         self._workspace_state_cache: Optional[Dict[str, Union[str, bool]]] = None
+        self._cbp_workspace_cache: Optional[Tuple[str, str]] = None
 
     def request(
         self,
@@ -106,6 +107,27 @@ class LaunchableClient:
         state = self._get_workspace_state()
         return state.get('pts_v2', False)
 
+    def get_cbp_workspace(self) -> Optional[Tuple[str, str]]:
+        """
+        Returns (org_cbp_id, workspace_cbp_id) if this is a CBP workspace, else None.
+        """
+        state = self._get_workspace_state()
+        if not state.get('is_cbp_workspace', False):
+            return None
+
+        if self._cbp_workspace_cache is not None:
+            return self._cbp_workspace_cache
+
+        try:
+            res = self.request("get", "cbp-workspace")
+            res.raise_for_status()
+            data = res.json()
+            self._cbp_workspace_cache = (data['organizationCbpId'], data['workspaceCbpId'])
+            return self._cbp_workspace_cache
+        except Exception as e:
+            self.print_exception_and_recover(e, "Failed to get CBP workspace info")
+            return None
+
     def _get_workspace_state(self) -> dict:
         """
         Get the current state of the workspace.
@@ -120,6 +142,7 @@ class LaunchableClient:
             self._workspace_state_cache = {
                 'fail_fast_mode': state.get('isFailFastMode', False),
                 'pts_v2': state.get('isPtsV2Enabled', False),
+                'is_cbp_workspace': state.get('isCbpWorkspace', False),
             }
             return self._workspace_state_cache
         except Exception as e:

{launchable-1.124.2 → launchable-1.124.3}/launchable.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: launchable
-Version: 1.124.2
+Version: 1.124.3
 Summary: Launchable CLI
 Home-page: https://launchableinc.com/
 Author: Launchable, Inc.

{launchable-1.124.2 → launchable-1.124.3}/launchable.egg-info/SOURCES.txt

@@ -141,6 +141,7 @@ src/test/java/com/launchableinc/ingest/commits/AllTests.java
 src/test/java/com/launchableinc/ingest/commits/BUILD
 src/test/java/com/launchableinc/ingest/commits/CommitGraphCollectorTest.java
 src/test/java/com/launchableinc/ingest/commits/FileChunkStreamerTest.java
+src/test/java/com/launchableinc/ingest/commits/GitFileTest.java
 src/test/java/com/launchableinc/ingest/commits/MainTest.java
 src/test/java/com/launchableinc/ingest/commits/PassThroughTreeReceiverImpl.java
 src/test/java/com/launchableinc/ingest/commits/ProgressReportingConsumerTest.java

{launchable-1.124.2 → launchable-1.124.3}/src/main/java/com/launchableinc/ingest/commits/GitFile.java

@@ -5,11 +5,10 @@ import org.eclipse.jgit.lib.ObjectLoader;
 import org.eclipse.jgit.lib.ObjectReader;
 
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.io.Reader;
+import java.nio.ByteBuffer;
 import java.nio.charset.CharacterCodingException;
-import java.nio.charset.StandardCharsets;
+import java.nio.charset.CodingErrorAction;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.eclipse.jgit.lib.Constants.*;
@@ -67,12 +66,10 @@ final class GitFile implements VirtualFile {
    */
   public boolean isText() throws IOException {
     try {
-      char[] c = new char[1024];
-      try (Reader r = new InputStreamReader(open().openStream(), UTF_8)) {
-        while (r.read(c)!= -1) {
-          // Read the file until EOF.
-        }
-      }
+      UTF_8.newDecoder()
+          .onMalformedInput(CodingErrorAction.REPORT)
+          .onUnmappableCharacter(CodingErrorAction.REPORT)
+          .decode(ByteBuffer.wrap(open().getCachedBytes(Integer.MAX_VALUE)));
       return true;
     } catch (CharacterCodingException e) {
       return false;

{launchable-1.124.2 → launchable-1.124.3}/src/test/java/com/launchableinc/ingest/commits/AllTests.java

@@ -10,6 +10,7 @@ import org.junit.runners.Suite.SuiteClasses;
     MainTest.class,
     FileChunkStreamerTest.class,
     SSLBypassTest.class,
+    GitFileTest.class,
     ProgressReportingConsumerTest.class
 })
 public class AllTests {}

launchable-1.124.3/src/test/java/com/launchableinc/ingest/commits/GitFileTest.java

@@ -0,0 +1,51 @@
+package com.launchableinc.ingest.commits;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import java.io.File;
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.ObjectInserter;
+import org.eclipse.jgit.lib.Repository;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import static org.eclipse.jgit.lib.Constants.OBJ_BLOB;
+
+@RunWith(JUnit4.class)
+public class GitFileTest {
+
+  @Rule public TemporaryFolder tmp = new TemporaryFolder();
+
+  @Test
+  public void isText_textFile_returnsTrue() throws Exception {
+    assertThat(gitFileWithContent("public class Hello {}".getBytes()).isText()).isTrue();
+  }
+
+  @Test
+  public void isText_binaryFile_returnsFalse() throws Exception {
+    // 0xFF 0xFE is invalid UTF-8
+    assertThat(gitFileWithContent(new byte[]{(byte) 0xFF, (byte) 0xFE, 0x00, 0x01}).isText()).isFalse();
+  }
+
+  @Test
+  public void isText_utf8MultiByte_returnsTrue() throws Exception {
+    assertThat(gitFileWithContent("日本語テスト".getBytes(java.nio.charset.StandardCharsets.UTF_8)).isText()).isTrue();
+  }
+
+  private GitFile gitFileWithContent(byte[] content) throws Exception {
+    File repoDir = tmp.newFolder();
+    try (Git git = Git.init().setDirectory(repoDir).call()) {
+      Repository repo = git.getRepository();
+      ObjectId blobId;
+      try (ObjectInserter inserter = repo.newObjectInserter()) {
+        blobId = inserter.insert(OBJ_BLOB, content);
+        inserter.flush();
+      }
+      return new GitFile("test", "file", blobId, repo.newObjectReader());
+    }
+  }
+}

{launchable-1.124.2 → launchable-1.124.3}/tests/commands/test_subset.py

@@ -687,3 +687,233 @@ class SubsetTest(CliTestCase):
         """
         payload = json.loads(gzip.decompress(responses.calls[1].request.body).decode())
         self.assertIn([{"type": "file", "name": "tests/commands/test_subset.py"}], payload.get("testPaths", []))
+
+    @responses.activate
+    @mock.patch.dict(os.environ, {"LAUNCHABLE_TOKEN": CliTestCase.launchable_token})
+    def test_subset_id_file_not_set(self):
+        pipe = "test_1.py\ntest_2.py\n"
+        mock_json_response = {
+            "testPaths": [
+                [{"type": "file", "name": "test_1.py"}],
+                [{"type": "file", "name": "test_2.py"}],
+            ],
+            "testRunner": "file",
+            "rest": [],
+            "subsettingId": self.subsetting_id,
+            "summary": {
+                "subset": {"duration": 10, "candidates": 2, "rate": 100},
+                "rest": {"duration": 0, "candidates": 0, "rate": 0},
+            },
+            "isObservation": False,
+        }
+        responses.replace(
+            responses.POST,
+            "{}/intake/organizations/{}/workspaces/{}/subset".format(
+                get_base_url(), self.organization, self.workspace),
+            json=mock_json_response,
+            status=200,
+        )
+
+        sentinel = tempfile.NamedTemporaryFile(delete=False)
+        sentinel_path = sentinel.name
+        sentinel.close()
+        os.unlink(sentinel_path)
+
+        result = self.cli(
+            "subset",
+            "--session", self.session,
+            "file",
+            mix_stderr=False,
+            input=pipe,
+        )
+        self.assert_success(result)
+        self.assertEqual(result.stdout, "test_1.py\ntest_2.py\n")
+        self.assertFalse(os.path.exists(sentinel_path))
+
+    @responses.activate
+    @mock.patch.dict(os.environ, {"LAUNCHABLE_TOKEN": CliTestCase.launchable_token})
+    def test_subset_id_file_written(self):
+        pipe = "test_1.py\ntest_2.py\n"
+        mock_json_response = {
+            "testPaths": [
+                [{"type": "file", "name": "test_1.py"}],
+                [{"type": "file", "name": "test_2.py"}],
+            ],
+            "testRunner": "file",
+            "rest": [],
+            "subsettingId": self.subsetting_id,
+            "summary": {
+                "subset": {"duration": 10, "candidates": 2, "rate": 100},
+                "rest": {"duration": 0, "candidates": 0, "rate": 0},
+            },
+            "isObservation": False,
+        }
+        responses.replace(
+            responses.POST,
+            "{}/intake/organizations/{}/workspaces/{}/subset".format(
+                get_base_url(), self.organization, self.workspace),
+            json=mock_json_response,
+            status=200,
+        )
+
+        with tempfile.NamedTemporaryFile(delete=False) as id_file:
+            id_file_path = id_file.name
+
+        try:
+            result = self.cli(
+                "subset",
+                "--session", self.session,
+                "--subset-id-file", id_file_path,
+                "file",
+                mix_stderr=False,
+                input=pipe,
+            )
+            self.assert_success(result)
+            self.assertEqual(result.stdout, "test_1.py\ntest_2.py\n")
+            with open(id_file_path) as f:
+                self.assertEqual(f.read(), "{}\n".format(self.subsetting_id))
+        finally:
+            os.unlink(id_file_path)
+
+    @responses.activate
+    @mock.patch.dict(os.environ, {"LAUNCHABLE_TOKEN": CliTestCase.launchable_token})
+    def test_subset_id_file_with_target(self):
+        pipe = "test_1.py\ntest_2.py\ntest_3.py\n"
+        mock_json_response = {
+            "testPaths": [
+                [{"type": "file", "name": "test_1.py"}],
+            ],
+            "testRunner": "file",
+            "rest": [
+                [{"type": "file", "name": "test_2.py"}],
+                [{"type": "file", "name": "test_3.py"}],
+            ],
+            "subsettingId": self.subsetting_id,
+            "summary": {
+                "subset": {"duration": 5, "candidates": 1, "rate": 33},
+                "rest": {"duration": 10, "candidates": 2, "rate": 67},
+            },
+            "isObservation": False,
+        }
+        responses.replace(
+            responses.POST,
+            "{}/intake/organizations/{}/workspaces/{}/subset".format(
+                get_base_url(), self.organization, self.workspace),
+            json=mock_json_response,
+            status=200,
+        )
+
+        with tempfile.NamedTemporaryFile(delete=False) as id_file:
+            id_file_path = id_file.name
+
+        try:
+            result = self.cli(
+                "subset",
+                "--session", self.session,
+                "--target", "30%",
+                "--subset-id-file", id_file_path,
+                "file",
+                mix_stderr=False,
+                input=pipe,
+            )
+            self.assert_success(result)
+            self.assertEqual(result.stdout, "test_1.py\n")
+            with open(id_file_path) as f:
+                self.assertEqual(f.read(), "{}\n".format(self.subsetting_id))
+        finally:
+            os.unlink(id_file_path)
+
+    @responses.activate
+    @mock.patch.dict(os.environ, {"LAUNCHABLE_TOKEN": CliTestCase.launchable_token})
+    def test_subset_id_file_with_rest(self):
+        pipe = "test_1.py\ntest_2.py\n"
+        mock_json_response = {
+            "testPaths": [
+                [{"type": "file", "name": "test_1.py"}],
+            ],
+            "testRunner": "file",
+            "rest": [
+                [{"type": "file", "name": "test_2.py"}],
+            ],
+            "subsettingId": self.subsetting_id,
+            "summary": {
+                "subset": {"duration": 5, "candidates": 1, "rate": 50},
+                "rest": {"duration": 5, "candidates": 1, "rate": 50},
+            },
+            "isObservation": False,
+        }
+        responses.replace(
+            responses.POST,
+            "{}/intake/organizations/{}/workspaces/{}/subset".format(
+                get_base_url(), self.organization, self.workspace),
+            json=mock_json_response,
+            status=200,
+        )
+
+        with tempfile.NamedTemporaryFile(delete=False) as id_file, \
+                tempfile.NamedTemporaryFile(delete=False) as rest_file:
+            id_file_path = id_file.name
+            rest_file_path = rest_file.name
+
+        try:
+            result = self.cli(
+                "subset",
+                "--session", self.session,
+                "--rest", rest_file_path,
+                "--subset-id-file", id_file_path,
+                "file",
+                mix_stderr=False,
+                input=pipe,
+            )
+            self.assert_success(result)
+            self.assertEqual(result.stdout, "test_1.py\n")
+            with open(id_file_path) as f:
+                self.assertEqual(f.read(), "{}\n".format(self.subsetting_id))
+            with open(rest_file_path) as f:
+                self.assertIn("test_2.py", f.read())
+        finally:
+            os.unlink(id_file_path)
+            os.unlink(rest_file_path)
+
+    @responses.activate
+    @mock.patch.dict(os.environ, {"LAUNCHABLE_TOKEN": CliTestCase.launchable_token})
+    def test_subset_id_file_no_id_returned(self):
+        pipe = "test_1.py\n"
+        mock_json_response = {
+            "testPaths": [
+                [{"type": "file", "name": "test_1.py"}],
+            ],
+            "testRunner": "file",
+            "rest": [],
+            "subsettingId": "",
+            "summary": {
+                "subset": {"duration": 5, "candidates": 1, "rate": 100},
+                "rest": {"duration": 0, "candidates": 0, "rate": 0},
+            },
+            "isObservation": False,
+        }
+        responses.replace(
+            responses.POST,
+            "{}/intake/organizations/{}/workspaces/{}/subset".format(
+                get_base_url(), self.organization, self.workspace),
+            json=mock_json_response,
+            status=200,
+        )
+
+        with tempfile.NamedTemporaryFile(delete=False) as id_file:
+            id_file_path = id_file.name
+
+        try:
+            result = self.cli(
+                "subset",
+                "--session", self.session,
+                "--subset-id-file", id_file_path,
+                "file",
+                mix_stderr=False,
+                input=pipe,
+            )
+            self.assert_exit_code(result, 1)
+            self.assertIn("Subset request did not return a subset ID", result.stderr)
+        finally:
+            if os.path.exists(id_file_path):
+                os.unlink(id_file_path)