launchable 1.76.3__tar.gz → 1.78.0__tar.gz

launchable-1.78.0/.github/workflows/bazel-test.yml

@@ -0,0 +1,34 @@
+name: Bazel test
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'WORKSPACE'
+      - 'src/**'
+      - '!src/**.md'
+  pull_request:
+    paths:
+      - 'WORKSPACE'
+      - 'src/**'
+      - '!src/**.md'
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - name: Set up JDK 8
+        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
+        with:
+          distribution: temurin
+          java-version: '8'
+      - name: Setup Bazel
+        uses: bazelbuild/setup-bazelisk@95c9bf48d0c570bb3e28e57108f3450cd67c1a44 # v2.0.0
+      - name: Cache Bazel outputs
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+        with:
+          path: "~/.cache/bazel"
+          key: bazel
+      - name: Run Bazel test
+        run: |
+          bazel test //...

{launchable-1.76.3 → launchable-1.78.0}/.github/workflows/e2e.yml

@@ -30,7 +30,7 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: 1.17
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies

{launchable-1.76.3 → launchable-1.78.0}/.github/workflows/python-package.yml

@@ -7,8 +7,14 @@ on:
   workflow_dispatch:
   push:
     branches: [ main ]
+    paths-ignore:
+      - 'WORKSPACE'
+      - 'src/**'
   pull_request:
     branches: [ main ]
+    paths-ignore:
+      - 'WORKSPACE'
+      - 'src/**'
   schedule:
     # This job runs at 00:00 JST every day.
     - cron: '0 9 * * *'
@@ -16,8 +22,8 @@ on:
 env:
   LAUNCHABLE_ORGANIZATION: "launchableinc"
   LAUNCHABLE_WORKSPACE: "cli"
-  EXPERIMENTAL_GITHUB_OIDC_TOKEN_AUTH: 1
   GITHUB_PULL_REQUEST_URL: ${{ github.event.pull_request.html_url }}
+  GITHUB_PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
 
 permissions:
   id-token: write
@@ -30,20 +36,21 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04, windows-latest]
-        python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]
+        python-version: [3.6, 3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       with:
         fetch-depth: 0
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
       with:
-        java-version: 1.8
+        java-version: 8
+        distribution: 'temurin'
     - name: Install specific dependencies in 3.6
       if: matrix.python-version == '3.6'
       uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0

{launchable-1.76.3 → launchable-1.78.0}/.github/workflows/python-publish.yml

@@ -19,9 +19,9 @@ jobs:
     outputs:
       tag: ${{ steps.run-tagpr.outputs.tag }}
     steps:
-    - uses: actions/checkout@96f53100ba2a5449eb71d2e6604bbcd94b9449b5 # v3.5.3
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - id: run-tagpr
-      uses: Songmu/tagpr@43d52e123cf8d55db9d602601f115f530588e2f8 # v1.1.2
+      uses: Songmu/tagpr@d240cfd0ec8d697b1f19b4b67b0b52c151214f45 # v1.1.4
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -36,7 +36,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
     # build and publish package using GitHub Actions workflow
@@ -62,7 +62,7 @@ jobs:
         user: __token__
         password: ${{ secrets.PYPI_API_TOKEN }}
     - name: Actions for Discord
-      uses: Ilshidur/action-discord@0.3.0
+      uses: Ilshidur/action-discord@0.3.2
       env:
         DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
       with:

{launchable-1.76.3 → launchable-1.78.0}/PKG-INFO

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

{launchable-1.76.3 → launchable-1.78.0}/Pipfile

@@ -14,10 +14,10 @@ wheel = "*"
 # The last flake8 version that supports Python 3.6 specifies "pycodestyle >=
 # 2.9.0, < 2.10.0". ref: https://github.com/PyCQA/flake8/pull/1633
 # The latest autopep8 specifies "pycodestyle >= 2.10.0". This conflict cannot be resolved. Pin the version to resolve this.
-autopep8 = "<=1.5.7"
+autopep8 = "<=1.7.0"
 importlib-metadata = "<5.0"
 isort = "*"
-more_itertools = "<8.6"
+more_itertools = "<8.15"
 mypy = "*"
 pre-commit = "*"
 responses = "*"
@@ -26,9 +26,7 @@ types-pkg_resources = "*"
 types-python-dateutil = "*"
 types-requests = "*"
 types-tabulate = "*"
-# Faced an error when try to install lxml v4.9.2. So, fixed the lxml version.
-# ref: https://github.com/launchableinc/cli/actions/runs/3691265723
-lxml = "<=4.9.1"
+lxml = "<=4.9.4"
 unittest-xml-reporting = "*"
 
 [packages]

{launchable-1.76.3 → launchable-1.78.0}/WORKSPACE

@@ -19,7 +19,7 @@ maven_install(
         "com.fasterxml.jackson.core:jackson-core:2.13.3",
         "com.fasterxml.jackson.core:jackson-databind:2.13.3",
         "com.google.guava:guava:31.1-jre",
-        "org.apache.httpcomponents:httpclient:4.5.13",
+        "org.apache.httpcomponents:httpclient:4.5.14",
         # This is the last release that produce Java 8 class files.
         "org.eclipse.jgit:org.eclipse.jgit:5.13.1.202206130422-r",
         "org.slf4j:slf4j-api:1.7.36",
@@ -27,7 +27,7 @@ maven_install(
             testonly = 1,
             artifact = "mockserver-junit-rule-no-dependencies",
             group = "org.mock-server",
-            version = "5.13.2",
+            version = "5.15.0",
         ),
         maven.artifact(
             testonly = 1,
@@ -39,7 +39,7 @@ maven_install(
             testonly = 1,
             artifact = "truth",
             group = "com.google.truth",
-            version = "1.1.3",
+            version = "1.2.0",
         ),
     ],
     maven_install_json = "//src:maven_install.json",

launchable-1.78.0/launchable/commands/record/build.py

@@ -0,0 +1,356 @@
+import os
+import re
+import sys
+from typing import Dict, List, Optional
+
+import click
+from tabulate import tabulate
+
+from launchable.utils.key_value_type import normalize_key_value_types
+from launchable.utils.link import CIRCLECI_KEY, GITHUB_ACTIONS_KEY, JENKINS_URL_KEY, LinkKind, capture_link
+from launchable.utils.tracking import Tracking, TrackingClient
+
+from ...utils import subprocess
+from ...utils.authentication import get_org_workspace
+from ...utils.click import KeyValueType
+from ...utils.env_keys import REPORT_ERROR_KEY
+from ...utils.launchable_client import LaunchableClient
+from ...utils.session import clean_session_files, write_build
+from .commit import commit
+
+JENKINS_GIT_BRANCH_KEY = "GIT_BRANCH"
+JENKINS_GIT_LOCAL_BRANCH_KEY = "GIT_LOCAL_BRANCH"
+GITHUB_ACTIONS_GITHUB_HEAD_REF_KEY = "GITHUB_HEAD_REF"
+GITHUB_ACTIONS_GITHUB_BASE_REF_KEY = "GITHUB_BASE_REF"
+CIRCLECI_CIRCLE_BRANCH_KEY = "CIRCLE_BRANCH"
+CODE_BUILD_BUILD_ID_KEY = "CODEBUILD_BUILD_ID"
+CODE_BUILD_WEBHOOK_HEAD_REF_KEY = "CODEBUILD_WEBHOOK_HEAD_REF"
+
+
+@click.command()
+@click.option(
+    '--name',
+    'build_name',
+    help='build name',
+    required=True,
+    type=str,
+    metavar='BUILD_NAME'
+)
+@click.option(
+    '--source',
+    help='path to local Git workspace, optionally prefixed by a label.  '
+    ' like --source path/to/ws or --source main=path/to/ws',
+    default=["."],
+    metavar="REPO_NAME",
+    multiple=True
+)
+@click.option(
+    '--max-days',
+    help="the maximum number of days to collect commits retroactively",
+    default=30
+)
+@click.option(
+    '--no-submodules',
+    is_flag=True,
+    help="stop collecting information from Git Submodules",
+    default=False
+)
+@click.option(
+    '--no-commit-collection',
+    is_flag=True,
+    help="""do not collect commit data.
+
+    This is useful if the repository is a shallow clone and the RevWalk is not
+    possible. The commit data must be collected with a separate fully-cloned
+    repository.
+    """,
+    default=False
+)
+@click.option('--scrub-pii', is_flag=True, help='Scrub emails and names', hidden=True)
+@click.option(
+    '--commit',
+    'commits',
+    help="set repository name and commit hash when you use --no-commit-collection option",
+    multiple=True,
+    default=[],
+    cls=KeyValueType,
+)
+@click.option(
+    '--link',
+    'links',
+    help="Set external link of title and url",
+    multiple=True,
+    default=[],
+    cls=KeyValueType,
+)
+@click.option(
+    '--branch',
+    'branches',
+    help="Set repository name and branch name when you use --no-commit-collection option. Please use the same repository name with a commit option",  # noqa: E501
+    multiple=True,
+    default=[],
+    cls=KeyValueType,
+)
+@click.pass_context
+def build(ctx: click.core.Context, build_name: str, source: List[str], max_days: int, no_submodules: bool,
+          no_commit_collection: bool, scrub_pii: bool, commits: List[str], links: List[str], branches: List[str]):
+
+    if "/" in build_name or "%2f" in build_name.lower():
+        sys.exit("--name must not contain a slash and an encoded slash")
+    if "%25" in build_name:
+        sys.exit("--name must not contain encoded % (%25)")
+    if not no_commit_collection and len(commits) != 0:
+        sys.exit("--no-commit-collection must be specified when --commit is used")
+
+    clean_session_files(days_ago=14)
+
+    # Information we want to collect for each Git repository
+    # The key data structure throughout the implementation of this command
+    class Workspace:
+        # identifier given to a Git repository to track the same repository from one 'record build' to next
+        name: str
+        # path to the Git workspace. Can be None if there's no local workspace present
+        dir: str
+        # current branch of this workspace
+        branch: str
+        # SHA1 commit hash that's currently checked out
+        commit_hash: str
+
+        def __init__(self, name, dir=None, branch=None, commit_hash=None):
+            self.name = name
+            self.dir = dir
+            self.branch = branch
+            self.commit_hash = commit_hash
+
+        def calc_branch_name(self):
+            '''
+            figure out the branch using the workspace. requires `dir` and `commit_hash` to be set.
+            '''
+
+            # Jenkins
+            # ref:
+            # https://www.theserverside.com/blog/Coffee-Talk-Java-News-Stories-and-Opinions/Complete-Jenkins-Git-environment-variables-list-for-batch-jobs-and-shell-script-builds
+            if os.environ.get(JENKINS_URL_KEY):
+                self.branch = os.environ.get(JENKINS_GIT_BRANCH_KEY) or os.environ.get(JENKINS_GIT_LOCAL_BRANCH_KEY)
+
+            # Github Actions
+            # ref: https://docs.github.com/en/actions/learn-github-actions/variables#default-environment-variables
+            if os.environ.get(GITHUB_ACTIONS_KEY):
+                self.branch = os.environ.get(GITHUB_ACTIONS_GITHUB_HEAD_REF_KEY) or \
+                    os.environ.get(GITHUB_ACTIONS_GITHUB_BASE_REF_KEY)
+
+            # CircleCI
+            # ref: https://circleci.com/docs/variables/
+            if os.environ.get(CIRCLECI_KEY):
+                self.branch = os.environ.get(CIRCLECI_CIRCLE_BRANCH_KEY)
+            # AWS CodeBuild
+            # ref: https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-env-vars.html
+            if os.environ.get(CODE_BUILD_BUILD_ID_KEY):
+                v = os.environ.get(CODE_BUILD_WEBHOOK_HEAD_REF_KEY)
+                if v:
+                    # refs/head/<branch name>
+                    self.branch = v.split("/")[-1]
+
+            if self.branch:
+                return      # if we've figured this out, great
+
+            try:
+                show_ref = subprocess.check_output(["git", "show-ref"], cwd=self.dir).decode()
+                refs = [ref for ref in show_ref.split("\n") if self.commit_hash in ref]
+
+                if len(refs) > 0:
+                    # e.g) ed6de84bde58d51deebe90e01ddfa5fa78899b1c refs/heads/branch-name
+                    self.branch = refs[0].split("/")[-1]
+            except Exception:
+                # cannot get branch name by git command
+                pass
+
+    # The first order of business is to ascertain what Git repositories we have in the workspace
+    def list_sources() -> List[Workspace]:
+        # This command accepts REPO_NAME=REPO_DIR as well as just REPO_DIR
+        pattern = re.compile(r'[^=]+=[^=]+')
+        ws: List[Workspace] = []
+        for s in source:
+            if pattern.match(s):
+                kv = s.split('=')
+                ws.append(Workspace(name=kv[0], dir=kv[1]))
+            else:
+                ws.append(Workspace(name=s, dir=s))
+            # TODO: if repo_dir is absolute path, warn the user that that's probably
+            # not what they want to do
+        return ws
+
+    # `record commit` on each top-level (= non submodule) Git repository
+    # `record commit` command processes Git submodule on its own,
+    # so we need to do this between list_sources and list_submodules
+    def collect_commits():
+        if not no_commit_collection:
+            for w in ws:
+                ctx.invoke(commit, source=w.dir, max_days=max_days, scrub_pii=scrub_pii)
+        else:
+            click.echo(click.style(
+                "Warning: Commit collection is turned off. The commit data must be collected separately.",
+                fg='yellow'), err=True)
+
+    # tally up all the submodules, unless we are told not to
+    def list_submodules(workspaces: List[Workspace]) -> List[Workspace]:
+        if no_submodules:
+            return workspaces
+
+        r = workspaces.copy()
+        for w in workspaces:
+            submodule_pattern = re.compile(r"^[\+\-U ](?P<hash>[a-f0-9]{40}) (?P<name>\S+)")
+
+            # invoke git directly because dulwich's submodule feature was broken
+            submodule_stdouts = subprocess.check_output("git submodule status --recursive".split(),
+                                                        cwd=w.dir).decode().splitlines()
+            for submodule_stdout in submodule_stdouts:
+                # the output is e.g.
+                # "+bbf213437a65e82dd6dda4391ecc5d598200a6ce sub1 (heads/master)"
+                matched = submodule_pattern.search(submodule_stdout)
+                if matched:
+                    commit_hash = matched.group('hash')
+                    name = matched.group('name')
+                    if commit_hash and name:
+                        r.append(Workspace(
+                            name=w.name + "/" + name,
+                            dir=w.dir + "/" + name,
+                            commit_hash=commit_hash))
+        return r
+
+    # figure out the commit hash and branch of those workspaces
+    def compute_hash_and_branch(ws: List[Workspace]):
+        # figure out w.commit_hash and w.branch
+        for w in ws:
+            try:
+                if not w.commit_hash:
+                    w.commit_hash = subprocess.check_output("git rev-parse HEAD".split(), cwd=w.dir).decode().replace("\n", "")
+            except Exception as e:
+                click.echo(
+                    click.style(
+                        "Can't get commit hash for {}. Do you run command under git-controlled directory? "
+                        "If not, please set a directory use by --source option.".format(w.dir),
+                        fg='yellow'),
+                    err=True)
+                print(e, file=sys.stderr)
+                sys.exit(1)
+            w.calc_branch_name()
+
+        # Our historical behaviour is to ignore --branch options. In that case, we should reject if that option is present
+        # I also think it's OK to allow this option to explicitly let the branch name set, since the inference
+        #  of the branch name from the workspace is inherently a little fragile
+
+    # Rely on --commit and --branch to create a list of workspaces, even when there's no local Git workspaces
+    def synthesize_workspaces() -> List[Workspace]:
+        # workspace by its name
+        ws: Dict[str, Workspace] = {}
+
+        commit_pattern = re.compile("[0-9A-Fa-f]{5,40}$")
+
+        branch_name_map = dict(normalize_key_value_types(branches))
+
+        for name, hash in normalize_key_value_types(commits):
+            if not commit_pattern.match(hash):
+                click.echo(click.style(
+                    "{}'s commit hash `{}` is invalid.".format(name, hash),
+                    fg="yellow"),
+                    err=True)
+                sys.exit(1)
+
+            ws[name] = Workspace(name=name, commit_hash=hash, branch=branch_name_map.get(name))
+
+        # make sure no invalid branch name options are given
+        for k in branch_name_map:
+            if not ws.get(k):
+                click.echo(click.style(
+                    "Invalid repository name {} in a --branch option. "
+                    "Perhaps you missed the corresponding --commit option?".format(k),
+                    fg="yellow"),
+                    err=True)
+                # TODO: is there any reason this is not an error? for now erring on caution
+                # sys.exit(1)
+
+        return list(ws.values())
+
+    # send all the data to server and obtain build_id, or none if the service is down, to recover
+    def send(ws: List[Workspace]) -> Optional[str]:
+        # figure out all the CI links to capture
+        def compute_links():
+            _links = capture_link(os.environ)
+            for k, v in normalize_key_value_types(links):
+                _links.append({
+                    "title": k,
+                    "url": v,
+                    "kind": LinkKind.CUSTOM_LINK.name,
+                })
+            return _links
+
+        tracking_client = TrackingClient(Tracking.Command.RECORD_BUILD)
+        try:
+            payload = {
+                "buildNumber": build_name,
+                "commitHashes": [{
+                    'repositoryName': w.name,
+                    'commitHash': w.commit_hash,
+                    'branchName': w.branch or ""
+                } for w in ws],
+                "links": compute_links()
+            }
+
+            client = LaunchableClient(dry_run=ctx.obj.dry_run, tracking_client=tracking_client)
+
+            res = client.request("post", "builds", payload=payload)
+            res.raise_for_status()
+
+            # at this point we've successfully send the data, so it's OK to record this build
+            write_build(build_name)
+
+            return res.json().get("id", None)
+        except Exception as e:
+            tracking_client.send_error_event(
+                event_name=Tracking.ErrorEvent.INTERNAL_CLI_ERROR,
+                stack_trace=str(e),
+            )
+            if os.getenv(REPORT_ERROR_KEY):
+                raise e
+            else:
+                print(e)
+            return None
+
+    # report what we did to the user to assist diagnostics
+    def report(ws: List[Workspace], build_id: str):
+        org, workspace = get_org_workspace()
+        click.echo(
+            "Launchable recorded build {} to workspace {}/{} with commits from {} {}:\n".format(
+                build_name,
+                org,
+                workspace,
+                len(ws),
+                ("repositories" if len(ws) > 1 else "repository"),
+            ),
+        )
+
+        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,
+            ))
+
+    # all the logics at the high level
+    if len(commits) == 0:
+        ws = list_sources()
+        collect_commits()
+        ws = list_submodules(ws)
+        compute_hash_and_branch(ws)
+    else:
+        ws = synthesize_workspaces()
+    build_id = send(ws)
+    if not build_id:
+        return  # recover from service outage gracefully
+    report(ws, build_id)

{launchable-1.76.3 → launchable-1.78.0}/launchable.egg-info/PKG-INFO

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

{launchable-1.76.3 → launchable-1.78.0}/launchable.egg-info/SOURCES.txt

@@ -12,11 +12,12 @@ Pipfile
 README.md
 WORKSPACE
 pyproject.toml
+renovate.json
 setup.cfg
 setup.py
 .github/release.yml
+.github/workflows/bazel-test.yml
 .github/workflows/e2e.yml
-.github/workflows/publicize-doc-change.yml
 .github/workflows/python-package.yml
 .github/workflows/python-publish.yml
 launchable/__init__.py

launchable-1.78.0/renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ]
+}

{launchable-1.76.3 → launchable-1.78.0}/tests/cli_test_case.py

@@ -187,6 +187,9 @@ class CliTestCase(unittest.TestCase):
         """
         return CliRunner(mix_stderr=mix_stderr).invoke(main, args, catch_exceptions=False, **kwargs)
 
+    def assert_success(self, result: click.testing.Result):
+        self.assertEqual(result.exit_code, 0, result.stdout)
+
     def load_json_from_file(self, file):
         try:
             with file.open() as json_file:

{launchable-1.76.3 → launchable-1.78.0}/tests/commands/record/test_build.py

@@ -19,25 +19,23 @@ class BuildTest(CliTestCase):
     @mock.patch.dict(os.environ, {"GITHUB_PULL_REQUEST_URL": ""})
     def test_submodule(self, mock_check_output):
         mock_check_output.side_effect = [
-            # the first call is git rev-parse HEAD
-            ('c50f5de0f06fe16afa4fd1dd615e4903e40b42a2').encode(),
-            # the second call is git rev-parse HEAD for detect branch name
-            ('c50f5de0f06fe16afa4fd1dd615e4903e40b42a2').encode(),
-            # the third call is git show-ref for detect branch name
-            ('c50f5de0f06fe16afa4fd1dd615e4903e40b42a2 refs/head/main\nc50f5de0f06fe16afa4fd1dd615e4903e40b42a2 refs/remotes/origin/main\n').encode(),  # noqa: E501
-            # the forth call is git submodule status --recursive
+            # the first call is git submodule status --recursive
             (
                 ' 491e03096e2234dab9a9533da714fb6eff5dcaa7 foo (v1.51.0-560-g491e030)\n'
                 ' 8bccab48338219e73c3118ad71c8c98fbd32a4be bar-zot (v1.32.0-516-g8bccab4)\n'
             ).encode(),
+            # the second call is git rev-parse HEAD for the '.' workspace
+            ('c50f5de0f06fe16afa4fd1dd615e4903e40b42a2').encode(),
+            # the third call is git show-ref for detect branch name
+            ('c50f5de0f06fe16afa4fd1dd615e4903e40b42a2 refs/head/main\nc50f5de0f06fe16afa4fd1dd615e4903e40b42a2 refs/remotes/origin/main\n').encode(),  # noqa: E501
         ]
 
         self.assertEqual(read_build(), None)
         result = self.cli("record", "build", "--no-commit-collection", "--name", self.build_name)
-        self.assertEqual(result.exit_code, 0)
+        self.assert_success(result)
 
         # Name & Path should both reflect the submodule path
-        self.assertTrue("| ./bar-zot | ./bar-zot | 8bccab48338219e73c3118ad71c8c98fbd32a4be |" in result.stdout)
+        self.assertTrue("| ./bar-zot | ./bar-zot | 8bccab48338219e73c3118ad71c8c98fbd32a4be |" in result.stdout, result.stdout)
 
         payload = json.loads(responses.calls[0].request.body.decode())
         self.assert_json_orderless_equal(
@@ -80,7 +78,7 @@ class BuildTest(CliTestCase):
         self.assertEqual(read_build(), None)
 
         result = self.cli("record", "build", "--no-commit-collection", "--no-submodules", "--name", self.build_name)
-        self.assertEqual(result.exit_code, 0)
+        self.assert_success(result)
 
         payload = json.loads(responses.calls[0].request.body.decode())
         self.assert_json_orderless_equal(
@@ -194,7 +192,7 @@ class BuildTest(CliTestCase):
             "B=feature-yyy",
             "--name",
             self.build_name)
-        self.assertEqual(result.exit_code, 0)
+        self.assert_success(result)
 
         payload = json.loads(responses.calls[0].request.body.decode())
         self.assert_json_orderless_equal(
@@ -210,7 +208,7 @@ class BuildTest(CliTestCase):
                 "links": []
             }, payload)
         responses.calls.reset()
-        self.assertIn("was not set for the --commit option", result.output)
+        self.assertIn("Invalid repository name B in a --branch option. ", result.output)
 
         # case multiple --commit options and multiple --branch options
         result = self.cli(

{launchable-1.76.3 → launchable-1.78.0}/tests/commands/test_api_error.py

@@ -6,14 +6,14 @@ import threading
 from http.server import HTTPServer, SimpleHTTPRequestHandler
 from pathlib import Path
 from unittest import mock
-from requests.exceptions import ReadTimeout
 
 import responses  # type: ignore
+from requests.exceptions import ReadTimeout
 
+from launchable.commands.verify import compare_version
 from launchable.utils.env_keys import BASE_URL_KEY
 from launchable.utils.http_client import get_base_url
 from tests.cli_test_case import CliTestCase
-from launchable.commands.verify import compare_version
 
 
 # dummy server for exe.jar
@@ -392,7 +392,7 @@ class APIErrorTest(CliTestCase):
         self.assert_tracking_count(tracking=tracking, count=2)
 
         result = self.cli("record", "build", "--name", "example")
-        self.assertEqual(result.exit_code, 0)
+        self.assert_success(result)
 
         # Since Timeout error is caught inside of LaunchableClient, the tracking event is sent twice.
         self.assert_tracking_count(tracking=tracking, count=4)