smart-tests-cli 2.3.0__tar.gz → 2.3.2__tar.gz

{smart_tests_cli-2.3.0 → smart_tests_cli-2.3.2}/PKG-INFO

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

{smart_tests_cli-2.3.0 → smart_tests_cli-2.3.2}/smart_tests/commands/verify.py

@@ -20,6 +20,15 @@ from ..utils.typer_types import emoji
 from ..version import __version__ as version
 
 
+def parse_version(version_string: str) -> List[int]:
+    """Parse version string and extract numeric parts.
+
+    Handles version strings with special characters like '3.13.0+' by extracting
+    only the numeric prefix from each component.
+    """
+    return [int(x) for x in version_string.replace('+', '').split('.')]
+
+
 def compare_version(a: List[int], b: List[int]):
     """Compare two version numbers represented as int arrays"""
 
@@ -122,7 +131,8 @@ def verify(app_instance: Application):
     # Level 2 check: versions. This is more fragile than just reporting the number, so we move
     # this out here
 
-    if compare_version([int(x) for x in platform.python_version().split('.')], [3, 6]) < 0:
+    python_version = parse_version(platform.python_version())
+    if compare_version(python_version, [3, 6]) < 0:
         msg = "Python 3.6 or later is required"
         tracking_client.send_error_event(
             event_name=Tracking.ErrorEvent.INTERNAL_CLI_ERROR,

{smart_tests_cli-2.3.0 → smart_tests_cli-2.3.2}/smart_tests_cli.egg-info/PKG-INFO

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

{smart_tests_cli-2.3.0 → smart_tests_cli-2.3.2}/src/main/java/com/launchableinc/ingest/commits/BUILD

@@ -11,6 +11,7 @@ java_library(
         "@maven//:com_fasterxml_jackson_core_jackson_core",
         "@maven//:com_fasterxml_jackson_core_jackson_databind",
         "@maven//:com_google_guava_guava",
+        "@maven//:commons_io_commons_io",
         "@maven//:org_apache_commons_commons_compress",
         "@maven//:org_apache_httpcomponents_httpclient",
         "@maven//:org_apache_httpcomponents_httpcore",

{smart_tests_cli-2.3.0 → smart_tests_cli-2.3.2}/src/main/java/com/launchableinc/ingest/commits/CommitGraphCollector.java

@@ -10,6 +10,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.io.CharStreams;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+import org.apache.commons.io.IOUtils;
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.config.RequestConfig;
@@ -43,7 +44,10 @@ import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.UncheckedIOException;
@@ -643,7 +647,7 @@ public class CommitGraphCollector {
 
         // even in dry run, this method needs to execute in order to show what files we'll be collecting
         try (CloseableHttpResponse response = handleError(url, client.execute(request));
-             JsonParser parser = new JsonFactory().createParser(response.getEntity().getContent())) {
+             JsonParser parser = new JsonFactory().createParser(maybeDump(response.getEntity().getContent(),"SMART_TESTS_DUMP_COLLECT_TREE"))) {
             return select(objectMapper.readValue(parser, String[].class));
         }
       } catch (IOException e) {
@@ -675,4 +679,21 @@ public class CommitGraphCollector {
       files.add(f);
     }
   }
+
+  /**
+   * To assist troubleshooting, captue the network response into a local file and then replay.
+   */
+  private InputStream maybeDump(InputStream content, String env) throws IOException {
+    String file = System.getenv(env);
+    if (file==null) {
+      return content;
+    }
+    // write the content to a file for debugging purpose, but still return the content so that the program can continue
+    try (OutputStream out = new FileOutputStream(file)) {
+      IOUtils.copy(content, out);
+    }
+    content.close();
+
+    return new FileInputStream(file);
+  }
 }

{smart_tests_cli-2.3.0 → smart_tests_cli-2.3.2}/tests/commands/test_verify.py

@@ -2,7 +2,7 @@ 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
+from smart_tests.commands.verify import check_java_version, compare_java_version, compare_version, parse_version
 
 
 class VersionTest(TestCase):
@@ -23,6 +23,12 @@ class VersionTest(TestCase):
         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(
             """