smart-tests-cli 2.6.0__tar.gz → 2.6.1__tar.gz

{smart_tests_cli-2.6.0/smart_tests_cli.egg-info → smart_tests_cli-2.6.1}/PKG-INFO

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

{smart_tests_cli-2.6.0 → smart_tests_cli-2.6.1}/smart_tests/commands/verify.py

@@ -80,20 +80,12 @@ def verify(app_instance: Application):
     client = SmartTestsClient(tracking_client=tracking_client, app=app_instance)
     java = get_java_command()
 
-    # Print the system information first so that we can get them even if there's
-    # an issue.
-
-    click.echo("Organization: " + repr(org))
-    click.echo("Workspace: " + repr(workspace))
-    click.echo("Proxy: " + repr(os.getenv("HTTPS_PROXY")))
-    click.echo("Platform: " + repr(platform.platform()))
-    click.echo("Python version: " + repr(platform.python_version()))
-    click.echo("Java command: " + repr(java))
-    click.echo("smart-tests version: " + repr(version))
-
     # raise an error here after we print out the basic diagnostics if LAUNCHABLE_TOKEN is not set.
     ensure_org_workspace()
 
+    # Fetch display names from the verification endpoint
+    org_display = org
+    workspace_display = workspace
     try:
         res = client.request("get", "verification")
         if res.status_code == 401:
@@ -111,6 +103,15 @@ def verify(app_instance: Application):
             )
             raise typer.Exit(2)
         res.raise_for_status()
+
+        # Parse display names from response, with fallback to original values
+        try:
+            data = res.json()
+            org_display = data.get("organizationDisplayName", org)
+            workspace_display = data.get("workspaceDisplayName", workspace)
+        except Exception:
+            # If JSON parsing fails, continue with original values
+            pass
     except Exception as e:
         tracking_client.send_error_event(
             event_name=Tracking.ErrorEvent.INTERNAL_CLI_ERROR,
@@ -119,6 +120,15 @@ def verify(app_instance: Application):
         )
         client.print_exception_and_recover(e)
 
+    # Print the system information after fetching display names
+    click.echo("Organization: " + repr(org_display))
+    click.echo("Workspace: " + repr(workspace_display))
+    click.echo("Proxy: " + repr(os.getenv("HTTPS_PROXY")))
+    click.echo("Platform: " + repr(platform.platform()))
+    click.echo("Python version: " + repr(platform.python_version()))
+    click.echo("Java command: " + repr(java))
+    click.echo("smart-tests version: " + repr(version))
+
     if java is None:
         msg = "Java is not installed. Install Java version 8 or newer to use the Smart Tests CLI."
         tracking_client.send_error_event(

{smart_tests_cli-2.6.0 → smart_tests_cli-2.6.1/smart_tests_cli.egg-info}/PKG-INFO

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

smart_tests_cli-2.6.1/tests/commands/test_verify.py

@@ -0,0 +1,109 @@
+import os
+from subprocess import CalledProcessError
+from unittest import TestCase
+from unittest.mock import patch
+
+import responses  # type: ignore
+
+from smart_tests.commands.verify import check_java_version, compare_java_version, compare_version, parse_version
+from smart_tests.utils.http_client import get_base_url
+from tests.cli_test_case import CliTestCase
+
+
+class VersionTest(TestCase):
+    def test_compare_version(self):
+        def sign(x):
+            if x < 0:
+                return -1
+            if x > 0:
+                return 1
+            return 0
+
+        def f(expected, a, b):
+            """Ensure symmetry on two sides"""
+            self.assertEqual(sign(compare_version(a, b)), expected)
+            self.assertEqual(sign(compare_version(b, a)), -expected)
+
+        f(0, [1, 1, 0], [1, 1])     # 1.1.0 = 1.1
+        f(1, [1, 1], [1, 0])        # 1.1 > 1.0
+        f(1, [1, 0, 1], [1])        # 1.0.1 > 1
+
+    def test_python_version_with_plus_sign(self):
+        """Test that Python versions with '+' character are parsed correctly"""
+        self.assertEqual(parse_version('3.13.0+'), [3, 13, 0])
+        self.assertEqual(parse_version('3.13+'), [3, 13])
+        self.assertEqual(parse_version('3.13.0'), [3, 13, 0])
+
+    def test_java_version(self):
+        self.assertTrue(compare_java_version(
+            """
+    java version "1.8.0_144"
+    Java(TM) SE Runtime Environment (build 1.8.0_144-b01)
+    Java HotSpot(TM) 64-Bit Server VM (build 25.144-b01, mixed mode)
+    """
+        ) >= 0)
+
+        self.assertTrue(compare_java_version(
+            """
+    java version "1.5.0_22"
+    Java(TM) 2 Runtime Environment, Standard Edition (build 1.5.0_22-b03)
+    Java HotSpot(TM) 64-Bit Server VM (build 1.5.0_22-b03, mixed mode)
+    """
+        ) < 0)
+
+    @patch('smart_tests.commands.verify.subprocess.run')
+    def test_check_java_version(self, mock_run):
+        mock_run.side_effect = CalledProcessError(1, 'java -version')
+        result = check_java_version('java')
+        self.assertEqual(result, -1)
+
+
+class VerifyCommandTest(CliTestCase):
+    """Test the verify command with display names"""
+
+    @responses.activate
+    @patch.dict(os.environ, {"SMART_TESTS_TOKEN": CliTestCase.smart_tests_token})
+    def test_verify_shows_display_name(self):
+        """Test that verify displays organizationDisplayName and workspaceDisplayName from API response"""
+        verification_url = f"{get_base_url()}/intake/organizations/{self.organization}/workspaces/{self.workspace}/verification"
+
+        # Mock server response with displayName fields
+        responses.add(
+            responses.GET,
+            verification_url,
+            json={
+                "organization": self.organization,
+                "organizationDisplayName": "My Company",
+                "workspace": self.workspace,
+                "workspaceDisplayName": "Production"
+            },
+            status=200
+        )
+
+        result = self.cli("verify")
+        self.assert_success(result)
+
+        # Verify displayName appears in output
+        self.assertIn("'My Company'", result.output)
+        self.assertIn("'Production'", result.output)
+
+    @responses.activate
+    @patch.dict(os.environ, {"SMART_TESTS_TOKEN": CliTestCase.smart_tests_token})
+    def test_verify_fallback_when_no_display_name(self):
+        """Test that verify falls back to org/workspace when displayName not in response"""
+        verification_url = f"{get_base_url()}/intake/organizations/{self.organization}/workspaces/{self.workspace}/verification"
+
+        # Mock server response without displayName fields
+        responses.add(
+            responses.GET,
+            verification_url,
+            json={},
+            status=200
+        )
+
+        result = self.cli("verify")
+        self.assert_success(result)
+
+        # Should show original org/workspace names
+        self.assertIn(f"'{self.organization}'", result.output)
+        self.assertIn(f"'{self.workspace}'", result.output)

smart_tests_cli-2.6.0/tests/commands/test_verify.py

@@ -1,53 +0,0 @@
-from subprocess import CalledProcessError
-from unittest import TestCase
-from unittest.mock import patch
-
-from smart_tests.commands.verify import check_java_version, compare_java_version, compare_version, parse_version
-
-
-class VersionTest(TestCase):
-    def test_compare_version(self):
-        def sign(x):
-            if x < 0:
-                return -1
-            if x > 0:
-                return 1
-            return 0
-
-        def f(expected, a, b):
-            """Ensure symmetry on two sides"""
-            self.assertEqual(sign(compare_version(a, b)), expected)
-            self.assertEqual(sign(compare_version(b, a)), -expected)
-
-        f(0, [1, 1, 0], [1, 1])     # 1.1.0 = 1.1
-        f(1, [1, 1], [1, 0])        # 1.1 > 1.0
-        f(1, [1, 0, 1], [1])        # 1.0.1 > 1
-
-    def test_python_version_with_plus_sign(self):
-        """Test that Python versions with '+' character are parsed correctly"""
-        self.assertEqual(parse_version('3.13.0+'), [3, 13, 0])
-        self.assertEqual(parse_version('3.13+'), [3, 13])
-        self.assertEqual(parse_version('3.13.0'), [3, 13, 0])
-
-    def test_java_version(self):
-        self.assertTrue(compare_java_version(
-            """
-    java version "1.8.0_144"
-    Java(TM) SE Runtime Environment (build 1.8.0_144-b01)
-    Java HotSpot(TM) 64-Bit Server VM (build 25.144-b01, mixed mode)
-    """
-        ) >= 0)
-
-        self.assertTrue(compare_java_version(
-            """
-    java version "1.5.0_22"
-    Java(TM) 2 Runtime Environment, Standard Edition (build 1.5.0_22-b03)
-    Java HotSpot(TM) 64-Bit Server VM (build 1.5.0_22-b03, mixed mode)
-    """
-        ) < 0)
-
-    @patch('smart_tests.commands.verify.subprocess.run')
-    def test_check_java_version(self, mock_run):
-        mock_run.side_effect = CalledProcessError(1, 'java -version')
-        result = check_java_version('java')
-        self.assertEqual(result, -1)