pytestomatio 2.8.2.dev29__tar.gz → 2.8.2.dev31__tar.gz

{pytestomatio-2.8.2.dev29/pytestomatio.egg-info → pytestomatio-2.8.2.dev31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytestomatio
-Version: 2.8.2.dev29
+Version: 2.8.2.dev31
 Summary: Pytest plugin to sync test with testomat.io
 Author: Oleksii Ostapov, TikoQA
 Project-URL: Testomat.io, https://testomat.io/

{pytestomatio-2.8.2.dev29 → pytestomatio-2.8.2.dev31}/pyproject.toml

@@ -13,7 +13,7 @@ version_provider = "pep621"
 update_changelog_on_bump = false
 [project]
 name = "pytestomatio"
-version = "2.8.2.dev29"
+version = "2.8.2.dev31"
 
 dependencies = [
     "requests>=2.29.0",

{pytestomatio-2.8.2.dev29 → pytestomatio-2.8.2.dev31}/pytestomatio/connect/connector.py

@@ -5,6 +5,7 @@ from os.path import join, normpath
 from os import getenv
 from pytestomatio.utils.helper import safe_string_list
 from pytestomatio.testing.testItem import TestItem
+import time
 
 log = logging.getLogger('pytestomatio')
 
@@ -35,30 +36,35 @@ class Connector:
         if http_proxy:
             self._session.proxies = {"http": http_proxy, "https": http_proxy}
             self._session.verify = False
-            log.info(f"Proxy settings applied: {self._session.proxies}")
+            log.debug(f"Proxy settings applied: {self._session.proxies}")
 
-            if not self._test_proxy_connection():
-                log.info("Proxy is unavailable. Falling back to a direct connection.")
+            if not self._test_proxy_connection(timeout=1):
+                log.debug("Proxy is unavailable. Falling back to a direct connection.")
                 self._session.proxies.clear()
                 self._session.verify = True
         else:
-            log.info("No proxy settings found. Using a direct connection.")
+            log.debug("No proxy settings found. Using a direct connection.")
             self._session.proxies.clear()
             self._session.verify = True
             self._test_proxy_connection()
 
-    def _test_proxy_connection(self, test_url="https://api.ipify.org?format=json"):
-        """Test if the proxy connection is available."""
+    def _test_proxy_connection(self, test_url="https://api.ipify.org?format=json", timeout=30, retry_interval=1):
         log.debug("Current session: %s", self._session.proxies)
         log.debug("Current verify: %s", self._session.verify)
-        try:
-            response = self._session.get(test_url, timeout=5)
-            response.raise_for_status()
-            log.info("Internet connection is available.")
-            return True
-        except requests.exceptions.RequestException:
-            log.error("Internet connection is unavailable.")
-            return False
+
+        start_time = time.time()
+        while time.time() - start_time < timeout:
+            try:
+                response = self._session.get(test_url, timeout=5)
+                response.raise_for_status()
+                log.debug("Internet connection is available.")
+                return True
+            except requests.exceptions.RequestException as e:
+                log.error("Internet connection is unavailable. Error: %s", e)
+                time.sleep(retry_interval)
+        
+        log.error("Internet connection check timed out after %d seconds.", timeout)
+        return False
 
     def load_tests(
             self,

{pytestomatio-2.8.2.dev29 → pytestomatio-2.8.2.dev31}/pytestomatio/connect/s3_connector.py

@@ -49,6 +49,15 @@ class S3Connector:
         self._is_logged_in = True
         log.info('s3 session created')
 
+    # TODO: upload files async
+    def upload_files(self, file_list, bucket_name: str = None):
+        links = []
+        for file_path, key in file_list:
+            link = self.upload_file(file_path=file_path, key=key, bucket_name=bucket_name)
+            links.extend(link)
+        return [link for link in links if link is not None]
+
+
     def upload_file(self, file_path: str, key: str = None, bucket_name: str = None) -> Optional[str]:
         if not self._is_logged_in:
             log.warning('s3 session is not created, creating new one')

{pytestomatio-2.8.2.dev29 → pytestomatio-2.8.2.dev31}/pytestomatio/testomatio/testomatio.py

@@ -2,6 +2,9 @@ from _pytest.python import Function
 from .testRunConfig import TestRunConfig
 from pytestomatio.connect.s3_connector import S3Connector
 from pytestomatio.connect.connector import Connector
+import logging
+
+log = logging.getLogger(__name__)
 
 
 class Testomatio:
@@ -23,7 +26,19 @@ class Testomatio:
             return ""
         return self.s3_connector.upload_file_object(file_bytes, key, bucket_name)
 
-    def add_artifacts(self, node: Function, urls: list[str]) -> None:
-        artifact_urls = node.stash.get("artifact_urls", [])
+    def add_artifacts(self, *args) -> None:
+        urls = None
+        for arg in args:
+            if isinstance(arg, list):
+                urls = arg
+        if not urls:
+            log.warn("Failed to add artifacts. No valid list of url has been provided")
+            return
+
+        if not hasattr(self, "request"):
+            log.warn("Couldn't attach link to the test. Make sure pytestomatio is configured correctly.")
+            return
+        
+        artifact_urls = self.request.node.stash.get("artifact_urls", [])
         artifact_urls.extend(urls)
-        node.stash["artifact_urls"] = [ url for url in artifact_urls if url is not None]
+        self.request.node.stash["artifact_urls"] = [ url for url in artifact_urls if url is not None]

{pytestomatio-2.8.2.dev29 → pytestomatio-2.8.2.dev31/pytestomatio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytestomatio
-Version: 2.8.2.dev29
+Version: 2.8.2.dev31
 Summary: Pytest plugin to sync test with testomat.io
 Author: Oleksii Ostapov, TikoQA
 Project-URL: Testomat.io, https://testomat.io/