pytestomatio 2.8.2.dev38__tar.gz → 2.8.2.dev40__tar.gz

{pytestomatio-2.8.2.dev38/pytestomatio.egg-info → pytestomatio-2.8.2.dev40}/PKG-INFO

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

{pytestomatio-2.8.2.dev38 → pytestomatio-2.8.2.dev40}/pyproject.toml

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

{pytestomatio-2.8.2.dev38 → pytestomatio-2.8.2.dev40}/pytestomatio/connect/connector.py

@@ -1,6 +1,5 @@
-import requests
+import requests, time, logging
 from requests.exceptions import HTTPError, ConnectionError
-import logging
 from os.path import join, normpath
 from os import getenv
 from pytestomatio.utils.helper import safe_string_list
@@ -17,6 +16,55 @@ class Connector:
         self.jwt: str = ''
         self.api_key = api_key
 
+    @property
+    def session(self):
+        """Get the session, creating it and applying proxy settings if necessary."""
+        self._apply_proxy_settings()
+        return self._session
+
+    @session.setter
+    def session(self, value):
+        """Allow setting a custom session, while still applying proxy settings."""
+        self._session = value
+        self._apply_proxy_settings()
+
+    def _apply_proxy_settings(self):
+        """Apply proxy settings based on environment variables, fallback to no proxy if unavailable."""
+        http_proxy = getenv("HTTP_PROXY")
+        log.debug(f"HTTP_PROXY: {http_proxy}")
+        if http_proxy:
+            self._session.proxies = {"http": http_proxy, "https": http_proxy}
+            self._session.verify = False
+            log.debug(f"Proxy settings applied: {self._session.proxies}")
+
+            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.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", timeout=30, retry_interval=1):
+        log.debug("Current session: %s", self._session.proxies)
+        log.debug("Current verify: %s", self._session.verify)
+
+        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,
             tests: list[TestItem],

{pytestomatio-2.8.2.dev38 → pytestomatio-2.8.2.dev40}/pytestomatio/testomatio/filter_plugin.py

@@ -45,7 +45,8 @@ class TestomatioFilterPlugin:
         if other_filters_active:
             # If other filters are applied, use OR logic:
             # the final set is all items that passed previous filters plus those matched by test-ids
-            items[:] = list(set(items) | set(testomatio_matched))
+            # preserving original order of test
+            items[:] = items + [item for item in testomatio_matched if item not in items]
         else:
             # If no other filters are applied, test-ids filter acts as an exclusive filter:
             # only run tests that match the given test IDs

{pytestomatio-2.8.2.dev38 → pytestomatio-2.8.2.dev40/pytestomatio.egg-info}/PKG-INFO

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