pytestomatio 2.8.2.dev43__tar.gz → 2.9.0__tar.gz

{pytestomatio-2.8.2.dev43/pytestomatio.egg-info → pytestomatio-2.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytestomatio
-Version: 2.8.2.dev43
+Version: 2.9.0
 Summary: Pytest plugin to sync test with testomat.io
 Author: Oleksii Ostapov, TikoQA
 Project-URL: Testomat.io, https://testomat.io/
@@ -13,6 +13,12 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: requests>=2.29.0
+Requires-Dist: pytest>7.2.0
+Requires-Dist: boto3>=1.28.28
+Requires-Dist: libcst==1.1.0
+Requires-Dist: commitizen>=3.18.1
+Requires-Dist: autopep8>=2.1.0
 Provides-Extra: dev
 Requires-Dist: pytest>=7.2.0; extra == "dev"
 Requires-Dist: pytest-testdox>=2.0.0; extra == "dev"
@@ -114,7 +120,7 @@ https://docs.testomat.io/usage/test-artifacts/
 Analyser needs to be aware of the cloud storage credentials.
 There are two options:
 1. Enable **Share credentials with testomat.io Reporter** option in testomat.io Settings -> Artifacts.
-2. Use environment variables   `ACCESS_KEY_ID, SECRET_ACCESS_KEY, ENDPOINT, BUCKET, BUCKET_PATH`
+2. Use environment variables   `ACCESS_KEY_ID, SECRET_ACCESS_KEY, ENDPOINT, BUCKET`
 
 You would need to decide when you want to upload your test artifacts to cloud storage
 
@@ -219,14 +225,12 @@ def test_example():
 - test run labels, tags
 
 ## TODO
-- retry test run update with less attributes, we get 500 from api
-- handler non configured s3 bucket error
 - Fix test duration
 
 ## Contribution
 Use python 3.12
 
-1. `pip install -e ".[dev]"`
+1. `pip install ".[dev]"`
 1. `python ./smoke.py`
 1. Test things manually
 1. Verify no regression bugs

{pytestomatio-2.8.2.dev43 → pytestomatio-2.9.0}/README.md

@@ -92,7 +92,7 @@ https://docs.testomat.io/usage/test-artifacts/
 Analyser needs to be aware of the cloud storage credentials.
 There are two options:
 1. Enable **Share credentials with testomat.io Reporter** option in testomat.io Settings -> Artifacts.
-2. Use environment variables   `ACCESS_KEY_ID, SECRET_ACCESS_KEY, ENDPOINT, BUCKET, BUCKET_PATH`
+2. Use environment variables   `ACCESS_KEY_ID, SECRET_ACCESS_KEY, ENDPOINT, BUCKET`
 
 You would need to decide when you want to upload your test artifacts to cloud storage
 
@@ -197,14 +197,12 @@ def test_example():
 - test run labels, tags
 
 ## TODO
-- retry test run update with less attributes, we get 500 from api
-- handler non configured s3 bucket error
 - Fix test duration
 
 ## Contribution
 Use python 3.12
 
-1. `pip install -e ".[dev]"`
+1. `pip install ".[dev]"`
 1. `python ./smoke.py`
 1. Test things manually
 1. Verify no regression bugs

{pytestomatio-2.8.2.dev43 → pytestomatio-2.9.0}/pyproject.toml

@@ -11,6 +11,9 @@ tag_format = "$version"
 version_scheme = "pep440"
 version_provider = "pep621"
 update_changelog_on_bump = false
+[project]
+name = "pytestomatio"
+version = "2.9.0"
 
 dependencies = [
     "requests>=2.29.0",
@@ -21,31 +24,11 @@ dependencies = [
     "autopep8>=2.1.0"
 ]
 
-[project.optional-dependencies]
-dev = [
-    "pytest>=7.2.0",
-    "pytest-testdox>=2.0.0",
-    "pytest-xdist==3.6.1",
-    "python-dotenv==1.0.1",
-    "toml==0.10.2"
-]
-
-[tool.pytest.ini_options]
-minversion = "6.0"
-addopts = "-ra -q"
-testpaths = ["tests"]
-markers = [
-    "smoke: Run smoke tests",
-]
-
-[project]
-version = "2.8.2.dev43"
-name = "pytestomatio"
-description = "Pytest plugin to sync test with testomat.io"
 authors = [
     { name = "Oleksii Ostapov" },
     { name = "TikoQA" },
 ]
+description = "Pytest plugin to sync test with testomat.io"
 readme = "README.md"
 requires-python = ">=3.10"
 classifiers = [
@@ -59,3 +42,21 @@ classifiers = [
 "Testomat.io" = "https://testomat.io/"
 "Homepage" = "https://github.com/testomatio/pytestomatio"
 "Bug Tracker" = "https://github.com/testomatio/pytestomatio/issues"
+
+[project.entry-points.pytest11]
+pytestomatio = "pytestomatio.main"
+
+[project.optional-dependencies]
+dev = [
+    "pytest>=7.2.0",
+    "pytest-testdox>=2.0.0",
+    "pytest-xdist==3.6.1",
+    "python-dotenv==1.0.1",
+    "toml==0.10.2"
+]
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+markers = [
+    "smoke: indicates smoke tests"
+]

{pytestomatio-2.8.2.dev43 → pytestomatio-2.9.0}/pytestomatio/connect/connector.py

@@ -5,7 +5,6 @@ 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')
 
@@ -13,59 +12,11 @@ log = logging.getLogger('pytestomatio')
 class Connector:
     def __init__(self, base_url: str = '', api_key: str = None):
         self.base_url = base_url
-        self._session = requests.Session()
+        self.session = requests.Session()
+        self.session.verify = True
         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],
@@ -99,14 +50,14 @@ class Connector:
 
         try:
             response = self.session.post(f'{self.base_url}/api/load?api_key={self.api_key}', json=request)
-        except ConnectionError as ce:
-            log.error(f'Failed to connect to {self.base_url}: {ce}')
+        except ConnectionError:
+            log.error(f'Failed to connect to {self.base_url}')
             return
-        except HTTPError as he:
-            log.error(f'HTTP error occurred while connecting to {self.base_url}: {he}')
+        except HTTPError:
+            log.error(f'Failed to connect to {self.base_url}')
             return
         except Exception as e:
-            log.error(f'An unexpected exception occurred. Please report an issue: {e}')
+            log.error(f'Generic exception happened. Please report an issue. {e}')
             return
 
         if response.status_code < 400:
@@ -128,19 +79,18 @@ class Connector:
             "label": label,
             "parallel": parallel,
             "ci_build_url": ci_build_url,
-            "shared_run": shared_run
         }
         filtered_request = {k: v for k, v in request.items() if v is not None}
         try:
             response = self.session.post(f'{self.base_url}/api/reporter', json=filtered_request)
-        except ConnectionError as ce:
-            log.error(f'Failed to connect to {self.base_url}: {ce}')
+        except ConnectionError:
+            log.error(f'Failed to connect to {self.base_url}')
             return
-        except HTTPError as he:
-            log.error(f'HTTP error occurred while connecting to {self.base_url}: {he}')
+        except HTTPError:
+            log.error(f'Failed to connect to {self.base_url}')
             return
         except Exception as e:
-            log.error(f'An unexpected exception occurred. Please report an issue: {e}')
+            log.error(f'Generic exception happened. Please report an issue. {e}')
             return
 
         if response.status_code == 200:
@@ -153,24 +103,23 @@ class Connector:
             "api_key": self.api_key,
             "title": title,
             "group_title": group_title,
-            "env": env,
-            "label": label,
+            # "env": env, TODO: enabled when bug with 500 response fixed
+            # "label": label, TODO: enabled when bug with 500 response fixed
             "parallel": parallel,
             "ci_build_url": ci_build_url,
-            "shared_run": shared_run
         }
         filtered_request = {k: v for k, v in request.items() if v is not None}
 
         try:
             response = self.session.put(f'{self.base_url}/api/reporter/{id}', json=filtered_request)
-        except ConnectionError as ce:
-            log.error(f'Failed to connect to {self.base_url}: {ce}')
+        except ConnectionError:
+            log.error(f'Failed to connect to {self.base_url}')
             return
-        except HTTPError as he:
-            log.error(f'HTTP error occurred while connecting to {self.base_url}: {he}')
+        except HTTPError:
+            log.error(f'Failed to connect to {self.base_url}')
             return
         except Exception as e:
-            log.error(f'An unexpected exception occurred. Please report an issue: {e}')
+            log.error(f'Generic exception happened. Please report an issue. {e}')
             return
 
         if response.status_code == 200:
@@ -209,14 +158,14 @@ class Connector:
         try:
             response = self.session.post(f'{self.base_url}/api/reporter/{run_id}/testrun?api_key={self.api_key}',
                                          json=filtered_request)
-        except ConnectionError as ce:
-            log.error(f'Failed to connect to {self.base_url}: {ce}')
+        except ConnectionError:
+            log.error(f'Failed to connect to {self.base_url}')
             return
-        except HTTPError as he:
-            log.error(f'HTTP error occurred while connecting to {self.base_url}: {he}')
+        except HTTPError:
+            log.error(f'Failed to connect to {self.base_url}')
             return
         except Exception as e:
-            log.error(f'An unexpected exception occurred. Please report an issue: {e}')
+            log.error(f'Generic exception happened. Please report an issue. {e}')
             return
         if response.status_code == 200:
             log.info('Test status updated')
@@ -227,14 +176,14 @@ class Connector:
         try:
             self.session.put(f'{self.base_url}/api/reporter/{run_id}?api_key={self.api_key}',
                              json={"status_event": status_event})
-        except ConnectionError as ce:
-            log.error(f'Failed to connect to {self.base_url}: {ce}')
+        except ConnectionError:
+            log.error(f'Failed to connect to {self.base_url}')
             return
-        except HTTPError as he:
-            log.error(f'HTTP error occurred while connecting to {self.base_url}: {he}')
+        except HTTPError:
+            log.error(f'Failed to connect to {self.base_url}')
             return
         except Exception as e:
-            log.error(f'An unexpected exception occurred. Please report an issue: {e}')
+            log.error(f'Generic exception happened. Please report an issue. {e}')
             return
 
     def disconnect(self):

pytestomatio-2.9.0/pytestomatio/connect/s3_connector.py

@@ -0,0 +1,69 @@
+import boto3
+import logging
+from io import BytesIO
+
+log = logging.getLogger(__name__)
+log.setLevel('INFO')
+
+
+def parse_endpoint(endpoint: str or None) -> str or None:
+    if endpoint is None:
+        return
+    if endpoint.startswith('https://'):
+        return endpoint[8:]
+    elif endpoint.startswith('http://'):
+        return endpoint[7:]
+    return endpoint
+
+
+class S3Connector:
+    def __init__(self, aws_access_key_id: str or None = None,
+                 aws_secret_access_key: str or None = None,
+                 endpoint: str or None = None,
+                 bucket_name: str or None = None):
+
+        self.endpoint = parse_endpoint(endpoint)
+        self.bucket_name = bucket_name
+        self.client = None
+        self._is_logged_in = False
+        self.aws_access_key_id = aws_access_key_id
+        self.aws_secret_access_key = aws_secret_access_key
+
+    def login(self):
+        log.debug('creating s3 session')
+        self.client = boto3.client(
+            's3',
+            endpoint_url=f'https://{self.endpoint}',
+            aws_access_key_id=self.aws_access_key_id,
+            aws_secret_access_key=self.aws_secret_access_key)
+        self._is_logged_in = True
+        log.info('s3 session created')
+
+    def upload_file(self, file_path: str, key: str = None, bucket_name: str = None) -> str or None:
+        if not self._is_logged_in:
+            log.warning('s3 session is not created, creating new one')
+            return
+        if not key:
+            key = file_path
+        if not bucket_name:
+            bucket_name = self.bucket_name
+        if bucket_name is None:
+            raise Exception('bucket name is not defined')
+        log.info(f'uploading artifact {file_path} to s3://{bucket_name}/{key}')
+        self.client.upload_file(file_path, bucket_name, key)
+        log.info(f'artifact {file_path} uploaded to s3://{bucket_name}/{key}')
+        return f'https://{bucket_name}.{self.endpoint}/{key}'
+
+    def upload_file_object(self, file_bytes: bytes, key: str, bucket_name: str = None) -> str or None:
+        if not self._is_logged_in:
+            log.warning('s3 session is not created, creating new one')
+            return
+        file = BytesIO(file_bytes)
+        if not bucket_name:
+            bucket_name = self.bucket_name
+        if bucket_name is None:
+            raise Exception('bucket name is not defined')
+        log.info(f'uploading artifact {key} to s3://{bucket_name}/{key}')
+        self.client.upload_fileobj(file, bucket_name, key)
+        log.info(f'artifact {key} uploaded to s3://{bucket_name}/{key}')
+        return f'https://{bucket_name}.{self.endpoint}/{key}'

{pytestomatio-2.8.2.dev43 → pytestomatio-2.9.0}/pytestomatio/main.py

@@ -9,6 +9,7 @@ from pytestomatio.decor.decorator_updater import update_tests
 from pytestomatio.utils.helper import add_and_enrich_tests, get_test_mapping, collect_tests, read_env_s3_keys
 from pytestomatio.utils.parser_setup import parser_options
 from pytestomatio.utils import validations
+from xdist.plugin import is_xdist_controller, get_xdist_worker_id
 
 from pytestomatio.testomatio.testRunConfig import TestRunConfig
 from pytestomatio.testomatio.testomatio import Testomatio
@@ -119,8 +120,7 @@ def pytest_collection_modifyitems(session: Session, config: Config, items: list[
             run_details = pytest.testomatio.connector.update_test_run(**run.to_dict())
 
             if run_details is None:
-                log.error('Test run failed to create. Reporting skipped')
-                return
+                raise Exception('Test run failed to create. Reporting skipped')
 
             s3_details = read_env_s3_keys(run_details)
 

{pytestomatio-2.8.2.dev43 → pytestomatio-2.9.0}/pytestomatio/testing/testItem.py

@@ -95,15 +95,33 @@ class TestItem:
         else:
             return name
 
-    def _get_test_parameter_key(self, item: Item) -> bool:
-        params = []
+    def _get_test_parameter_key(self, item: Item):
+        """Return a list of parameter names for a given test item."""
+        param_names = set()
+
+        # 1) Look for @pytest.mark.parametrize
         for mark in item.iter_markers('parametrize'):
-            is_list = mark.args[0].find(',') > -1
-            if is_list:
-                params.extend([p.strip() for p in mark.args[0].split(',')])
-            else:
-                params.append(mark.args[0])
-        return params
+            # mark.args[0] is often a string like "param1,param2" 
+            # or just "param1" if there's only one.
+            if len(mark.args) > 0 and isinstance(mark.args[0], str):
+                arg_string = mark.args[0]
+                # If the string has commas, split it into multiple names
+                if ',' in arg_string:
+                    param_names.update(name.strip() for name in arg_string.split(','))
+                else:
+                    param_names.add(arg_string.strip())
+
+        # 2) Look for fixture parameterization (including dynamically generated)
+        #    via callspec, which holds *all* final parameters for an item.
+        callspec = getattr(item, 'callspec', None)
+        if callspec:
+            # callspec.params is a dict: fixture_name -> parameter_value
+            # We only want fixture names, not the values.
+            param_names.update(callspec.params.keys())
+
+        # Return them as a list, or keep it as a set—whatever you prefer.
+        return list(param_names)
+
     
     def _resolve_parameter_key_in_test_name(self, item: Item, test_name: str) -> str:
         test_params = self._get_test_parameter_key(item)
@@ -120,6 +138,7 @@ class TestItem:
     def _resolve_parameter_value_in_test_name(self, item: Item, test_name: str) -> str:
         param_keys = self._get_test_parameter_key(item)
         sync_title = self._get_sync_test_title(item)
+
         if not param_keys:
             return test_name
         if not item.callspec:

{pytestomatio-2.8.2.dev43 → pytestomatio-2.9.0}/pytestomatio/testomatio/testRunConfig.py

@@ -1,25 +1,22 @@
 import os
 import datetime as dt
-import tempfile
 from pytestomatio.utils.helper import safe_string_list
 from typing import Optional
 
-TESTOMATIO_TEST_RUN_LOCK_FILE = ".testomatio_test_run_id_lock"
 
 class TestRunConfig:
-    def __init__(self):
-        run_id = os.environ.get('TESTOMATIO_RUN_ID') or os.environ.get('TESTOMATIO_RUN')
-        title = os.environ.get('TESTOMATIO_TITLE') if os.environ.get('TESTOMATIO_TITLE') else 'test run at ' + dt.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-        shared_run = os.environ.get('TESTOMATIO_SHARED_RUN') in ['True', 'true', '1']
-        self.test_run_id = run_id
-        self.title = title
+    def __init__(self, parallel: bool = True):
+        self.test_run_id = os.environ.get('TESTOMATIO_RUN_ID') or None
+        run = os.environ.get('TESTOMATIO_RUN') or None
+        title = os.environ.get('TESTOMATIO_TITLE') or None
+        run_or_title = run if run else title
+        self.title = run_or_title if run_or_title else 'test run at ' + dt.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         self.environment = safe_string_list(os.environ.get('TESTOMATIO_ENV'))
         self.label = safe_string_list(os.environ.get('TESTOMATIO_LABEL'))
-        self.group_title = os.environ.get('TESTOMATIO_RUNGROUP_TITLE')
-        # This allows to report tests to the test run by it's id. https://docs.testomat.io/getting-started/running-automated-tests/#reporting-parallel-tests
-        self.parallel = False if shared_run else True
-        # This allows using test run title to group tests under a single test run. This is needed when running tests in different processes or servers.
-        self.shared_run = shared_run
+        self.group_title = os.environ.get('TESTOMATIO_RUNGROUP_TITLE') or None
+        self.parallel = parallel
+        # stands for run with shards
+        self.shared_run = run_or_title is not None
         self.status_request = {}
         self.build_url = self.resolve_build_url()
 
@@ -41,28 +38,21 @@ class TestRunConfig:
 
     def save_run_id(self, run_id: str) -> None:
         self.test_run_id = run_id
-        temp_dir = tempfile.gettempdir()
-        temp_file_path = os.path.join(temp_dir, TESTOMATIO_TEST_RUN_LOCK_FILE)
-        with open(temp_file_path, 'w') as f:
+        with open('.temp_test_run_id', 'w') as f:
             f.write(run_id)
 
-
     def get_run_id(self) -> Optional[str]:
         if self.test_run_id:
             return self.test_run_id
-        temp_dir = tempfile.gettempdir()
-        temp_file_path = os.path.join(temp_dir, TESTOMATIO_TEST_RUN_LOCK_FILE)
-        if os.path.exists(temp_file_path):
-            with open(temp_file_path, 'r') as f:
+        if os.path.exists('.temp_test_run_id'):
+            with open('.temp_test_run_id', 'r') as f:
                 self.test_run_id = f.read()
                 return self.test_run_id
         return None
 
     def clear_run_id(self) -> None:
-        temp_dir = tempfile.gettempdir()
-        temp_file_path = os.path.join(temp_dir, TESTOMATIO_TEST_RUN_LOCK_FILE)
-        if os.path.exists(temp_file_path):
-            os.remove(temp_file_path)
+        if os.path.exists('.temp_test_run_id'):
+            os.remove('.temp_test_run_id')
 
     def resolve_build_url(self) -> Optional[str]:
         # You might not always want the build URL to change in the Testomat.io test run

{pytestomatio-2.8.2.dev43 → pytestomatio-2.9.0}/pytestomatio/testomatio/testomatio.py

@@ -2,9 +2,6 @@ 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:
@@ -14,26 +11,19 @@ class Testomatio:
         self.test_run_config: TestRunConfig = test_run_config
         self.connector: Connector = None
 
-    def upload_files(self, files_list, bucket_name: str = None) -> str:
-        if self.test_run_config.test_run_id is None:
-            log.debug("Skipping file upload when testomatio test run is not created")
-            return ""
-        return self.s3_connector.upload_files(files_list, bucket_name)
-    
     def upload_file(self, file_path: str, key: str = None, bucket_name: str = None) -> str:
         if self.test_run_config.test_run_id is None:
-            log.debug("Skipping file upload when testomatio test run is not created")
+            print("Skipping file upload when testomatio test run is not created")
             return ""
         return self.s3_connector.upload_file(file_path, key, bucket_name)
 
     def upload_file_object(self, file_bytes: bytes, key: str, bucket_name: str = None) -> str:
         if self.test_run_config.test_run_id is None:
-            log.debug("Skipping file upload when testomatio test run is not created")
+            print("Skipping file upload when testomatio test run is not created")
             return ""
         return self.s3_connector.upload_file_object(file_bytes, key, bucket_name)
 
-    def add_artifacts(self, node: Function, url_list) -> None:        
+    def add_artifacts(self, node: Function, urls: list[str]) -> None:
         artifact_urls = node.stash.get("artifact_urls", [])
-        artifact_urls.extend(url_list)
-        node.stash["artifact_urls"] = [ url for url in artifact_urls if url is not None]
-
+        artifact_urls.extend(urls)
+        node.stash["artifact_urls"] = artifact_urls

{pytestomatio-2.8.2.dev43 → pytestomatio-2.9.0}/pytestomatio/utils/helper.py

@@ -1,4 +1,4 @@
-from os import getenv
+import os
 from os.path import basename
 from pytest import Item
 from pytestomatio.testomatio.testomat_item import TestomatItem
@@ -84,18 +84,12 @@ def add_and_enrich_tests(meta: list[TestItem], test_files: set,
         update_tests(test_file, mapping, test_names, decorator_name)
 
 
-def read_env_s3_keys(testRunConfig: dict) -> tuple:
-    artifacts = testRunConfig.get('artifacts', {})
-    bucket_path = (getenv('BUCKET_PATH') or getenv('S3_BUCKET_PATH'))
-    acl = 'private' if (getenv('TESTOMATIO_PRIVATE_ARTIFACTS') or artifacts.get('presign')) else "public-read"
+def read_env_s3_keys(artifact: dict) -> tuple:
     return (
-        getenv('REGION') or getenv('S3_REGION') or artifacts.get('REGION'),
-        getenv('ACCESS_KEY_ID') or getenv('S3_ACCESS_KEY_ID') or artifacts.get('ACCESS_KEY_ID'),
-        getenv('SECRET_ACCESS_KEY') or getenv('S3_SECRET_ACCESS_KEY') or artifacts.get('SECRET_ACCESS_KEY'),
-        getenv('ENDPOINT') or  getenv('S3_ENDPOINT') or artifacts.get('ENDPOINT'),
-        getenv('BUCKET') or getenv('S3_BUCKET') or artifacts.get('BUCKET'),
-        bucket_path + "/" + testRunConfig.get("uid") if bucket_path else testRunConfig.get("uid"),
-        acl
+        os.environ.get('ACCESS_KEY_ID') or artifact.get('ACCESS_KEY_ID'),
+        os.environ.get('SECRET_ACCESS_KEY') or artifact.get('SECRET_ACCESS_KEY'),
+        os.environ.get('ENDPOINT') or artifact.get('ENDPOINT'),
+        os.environ.get('BUCKET') or artifact.get('BUCKET')
     )
 
 def safe_string_list(param: str):

{pytestomatio-2.8.2.dev43 → pytestomatio-2.9.0/pytestomatio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytestomatio
-Version: 2.8.2.dev43
+Version: 2.9.0
 Summary: Pytest plugin to sync test with testomat.io
 Author: Oleksii Ostapov, TikoQA
 Project-URL: Testomat.io, https://testomat.io/
@@ -13,6 +13,12 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: requests>=2.29.0
+Requires-Dist: pytest>7.2.0
+Requires-Dist: boto3>=1.28.28
+Requires-Dist: libcst==1.1.0
+Requires-Dist: commitizen>=3.18.1
+Requires-Dist: autopep8>=2.1.0
 Provides-Extra: dev
 Requires-Dist: pytest>=7.2.0; extra == "dev"
 Requires-Dist: pytest-testdox>=2.0.0; extra == "dev"
@@ -114,7 +120,7 @@ https://docs.testomat.io/usage/test-artifacts/
 Analyser needs to be aware of the cloud storage credentials.
 There are two options:
 1. Enable **Share credentials with testomat.io Reporter** option in testomat.io Settings -> Artifacts.
-2. Use environment variables   `ACCESS_KEY_ID, SECRET_ACCESS_KEY, ENDPOINT, BUCKET, BUCKET_PATH`
+2. Use environment variables   `ACCESS_KEY_ID, SECRET_ACCESS_KEY, ENDPOINT, BUCKET`
 
 You would need to decide when you want to upload your test artifacts to cloud storage
 
@@ -219,14 +225,12 @@ def test_example():
 - test run labels, tags
 
 ## TODO
-- retry test run update with less attributes, we get 500 from api
-- handler non configured s3 bucket error
 - Fix test duration
 
 ## Contribution
 Use python 3.12
 
-1. `pip install -e ".[dev]"`
+1. `pip install ".[dev]"`
 1. `python ./smoke.py`
 1. Test things manually
 1. Verify no regression bugs

{pytestomatio-2.8.2.dev43 → pytestomatio-2.9.0}/pytestomatio.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ pytestomatio/main.py
 pytestomatio.egg-info/PKG-INFO
 pytestomatio.egg-info/SOURCES.txt
 pytestomatio.egg-info/dependency_links.txt
+pytestomatio.egg-info/entry_points.txt
 pytestomatio.egg-info/requires.txt
 pytestomatio.egg-info/top_level.txt
 pytestomatio/connect/__init__.py

pytestomatio-2.9.0/pytestomatio.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[pytest11]
+pytestomatio = pytestomatio.main

{pytestomatio-2.8.2.dev43 → pytestomatio-2.9.0}/pytestomatio.egg-info/requires.txt

@@ -1,3 +1,9 @@
+requests>=2.29.0
+pytest>7.2.0
+boto3>=1.28.28
+libcst==1.1.0
+commitizen>=3.18.1
+autopep8>=2.1.0
 
 [dev]
 pytest>=7.2.0

{pytestomatio-2.8.2.dev43 → pytestomatio-2.9.0}/tests/test_cli_param_test_id.py

@@ -23,34 +23,34 @@ test_file = """
 def test_cli_param_test_id_without_filters(pytester):
     pytester.makepyfile(test_file)
 
-    result = pytester.runpytest("--testomatio", "report", "-vv")
+    result = pytester.runpytest_subprocess("--testomatio", "report", "-vv")
     result.assert_outcomes(passed=4, failed=0, skipped=0)
     result.stdout.fnmatch_lines([
-        "*::test_smoke PASSED*",
-        "*::test_testomatio_only PASSED*",
-        "*::test_smoke_and_testomatio PASSED*",
-        "*::test_neither_marker PASSED*",
+        "*::test_smoke*",
+        "*::test_testomatio_only*",
+        "*::test_smoke_and_testomatio*",
+        "*::test_neither_marker*",
     ])
 
 @pytest.mark.testomatio("@T3cf626ca")
 def test_cli_param_test_id_with_k_filter(pytester):
     pytester.makepyfile(test_file)
 
-    result = pytester.runpytest("--testomatio" ,"report", "-vv", "-k", "test_neither_marker")
+    result = pytester.runpytest_subprocess("--testomatio" ,"report", "-vv", "-k", "test_neither_marker")
     result.assert_outcomes(passed=1, failed=0, skipped=0)
     result.stdout.fnmatch_lines([
-        "*::test_neither_marker PASSED*",
+        "*::test_neither_marker*",
     ])
 
 @pytest.mark.testomatio("@T709adc8a")
 def test_cli_param_test_id_without_k_filter_matching_2_tests(pytester):
     pytester.makepyfile(test_file)
 
-    result = pytester.runpytest("--testomatio", "report", "-vv", "-k", "test_smoke")
+    result = pytester.runpytest_subprocess("--testomatio", "report", "-vv", "-k", "test_smoke")
     result.assert_outcomes(passed=2, failed=0, skipped=0)
     result.stdout.fnmatch_lines([
-        "*::test_smoke PASSED*",
-        "*::test_smoke_and_testomatio PASSED*",
+        "*::test_smoke*",
+        "*::test_smoke_and_testomatio*",
     ])
 
 # TODO: troubleshoot pytester env
@@ -61,8 +61,8 @@ def test_cli_param_test_id_with_test_id_filter(pytester):
     pytest.skip()
     pytester.makepyfile(test_file)
 
-    result = pytester.runpytest_inprocess("--testomatio", "report", '--test-id="@T123"', "-vv")
+    result = pytester.runpytest_subprocess("--testomatio", "report", '--test-id="@T123"', "-vv")
     result.assert_outcomes(passed=1, failed=0, skipped=0)
     result.stdout.fnmatch_lines([
-        "*::test_testomatio_only PASSED*",
+        "*::test_testomatio_only*",
     ])

pytestomatio-2.9.0/tests/test_parameters.py

@@ -0,0 +1,67 @@
+import pytest
+pytestmark = pytest.mark.smoke
+
+test_file = """
+    import pytest
+
+    # Define some dummy callables
+    def add(a, b):
+        return a + b
+
+    def multiply(a, b):
+        return a * b
+
+    @pytest.mark.testomatio("@Tbca18714")
+    @pytest.mark.parametrize(
+        "operation, a, b, expected",
+        [
+            (add, 2, 3, 5),  # Test add function
+            (multiply, 2, 3, 6),  # Test multiply function
+        ],
+    )
+    def test_operations(operation, a, b, expected):
+        # Call the provided operation
+        result = operation(a, b)
+        assert result == expected, f"Expected {expected}, got {result}"
+"""
+
+@pytest.mark.testomatio("@Tb8930394")
+def test_callable_in_params(pytester):
+    pytester.makepyfile(test_file)
+
+    pytester.runpytest("--testomatio", "sync", "-n", "0", "--no-detach")
+    result = pytester.runpytest("--testomatio", "report", "-vv")
+    result.assert_outcomes(passed=2, failed=0, skipped=0)
+    cleaned_lines = [line.strip() for line in result.stdout.lines if line.strip()]
+
+    assert any("test_callable_in_params.py::test_operations[add-2-3-5]" in line for line in cleaned_lines)
+    assert any("test_callable_in_params.py::test_operations[multiply-2-3-6]" in line for line in cleaned_lines)
+
+session_fixture_file = """
+    import pytest
+
+    @pytest.fixture(scope="session", params=["db_connection_1", "db_connection_2"])
+    def session_fixture(request):
+        # Simulate setting up a database connection
+        db_connection = request.param
+        yield db_connection
+        # Simulate tearing down the database connection
+
+    def test_session_fixture_usage(session_fixture):
+        assert session_fixture in ["db_connection_1", "db_connection_2"], (
+            f"Unexpected session fixture value: {session_fixture}"
+        )
+"""
+
+def test_session_fixture_with_param(pytester):
+    pytester.makepyfile(session_fixture_file)
+
+    pytester.runpytest("--testomatio", "sync", "-n", "0", "--no-detach")
+    result = pytester.runpytest("--testomatio", "report", "-vv", "--full-trace")
+    result.assert_outcomes(passed=2, failed=0, skipped=0)
+
+    cleaned_lines = [line.strip() for line in result.stdout.lines if line.strip()]
+
+    assert any("test_session_fixture_usage[db_connection_1]" in line for line in cleaned_lines)
+    assert any("test_session_fixture_usage[db_connection_2]" in line for line in cleaned_lines)
+

{pytestomatio-2.8.2.dev43 → pytestomatio-2.9.0}/tests/test_sync.py

@@ -14,7 +14,7 @@ def test_sync_stop_when_xdist_in_use(pytester):
     # if option == 'sync' and parallel_set:
     #     raise UsageError("The 'sync' mode does not support parallel execution! In order to synchronise test run command sync as '--testomatio sync -n 0'")
 
-    result = pytester.runpytest_inprocess('-p', 'xdist', '--testomatio', 'sync', '-vv')
+    result = pytester.runpytest('-p', 'xdist', '--testomatio', 'sync', '-vv')
 
     # Match the entire error line as it appears in stderr
     result.stderr.fnmatch_lines([
@@ -31,7 +31,7 @@ def test_sync_works_with_xdist_set_to_0(pytester):
         assert True
     """)
 
-    result = pytester.runpytest_inprocess('-p', 'xdist', '--testomatio', 'sync', '-n', '0', '-vv')
+    result = pytester.runpytest_subprocess('-p', 'xdist', '--testomatio', 'sync', '-n', '0', '-vv')
 
     # Assert that the special exit message is printed to stderr
     result.stdout.fnmatch_lines([

pytestomatio-2.8.2.dev43/pytestomatio/connect/s3_connector.py

@@ -1,121 +0,0 @@
-from typing import Optional
-import boto3
-import logging
-from io import BytesIO
-import mimetypes
-
-log = logging.getLogger(__name__)
-log.setLevel('INFO')
-
-
-def parse_endpoint(endpoint: str = None) -> Optional[str]:
-    if endpoint.startswith('https://'):
-        return endpoint[8:]
-    elif endpoint.startswith('http://'):
-        return endpoint[7:]
-    return endpoint
-
-# TODO: review error handling. It should be save, and only create log entries without effecting test execution.
-class S3Connector:
-    def __init__(self,
-                 aws_region_name: Optional[str],
-                 aws_access_key_id: Optional[str],
-                 aws_secret_access_key: Optional[str],
-                 endpoint: Optional[str],
-                 bucket_name: Optional[str],
-                 bucker_prefix: Optional[str],
-                 acl: Optional[str] = 'public-read'
-                 ):
-
-        self.aws_region_name = aws_region_name
-        self.endpoint = parse_endpoint(endpoint)
-        self.bucket_name = bucket_name
-        self.bucker_prefix = bucker_prefix
-        self.client = None
-        self._is_logged_in = False
-        self.aws_access_key_id = aws_access_key_id
-        self.aws_secret_access_key = aws_secret_access_key
-        self.acl = acl
-
-    def login(self):
-        log.debug('creating s3 session')
-        self.client = boto3.client(
-            's3',
-            endpoint_url=f'https://{self.endpoint}',
-            aws_access_key_id=self.aws_access_key_id,
-            aws_secret_access_key=self.aws_secret_access_key,
-            region_name=self.aws_region_name
-            )
-
-        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.append(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')
-            return
-        if not key:
-            key = file_path
-        key = f"{self.bucker_prefix}/{key}"
-        if not bucket_name:
-            bucket_name = self.bucket_name
-
-        content_type, _ = mimetypes.guess_type(key)
-        if content_type is None:
-            content_type = 'application/octet-stream'
-
-        try:
-            log.info(f'uploading artifact {file_path} to s3://{bucket_name}/{key}')
-            self.client.upload_file(
-                file_path,
-                bucket_name,
-                key,
-                ExtraArgs={
-                    'ACL': self.acl,
-                    'ContentType': content_type,
-                    'ContentDisposition': 'inline'
-                }
-            )
-            log.info(f'artifact {file_path} uploaded to s3://{bucket_name}/{key}')
-            return f'https://{bucket_name}.{self.endpoint}/{key}'
-        except Exception as e:
-            log.error(f'failed to upload file {file_path} to s3://{bucket_name}/{key}: {e}')
-
-    def upload_file_object(self, file_bytes: bytes, key: str, bucket_name: str = None) -> Optional[str]:
-        if not self._is_logged_in:
-            log.warning('s3 session is not created, creating new one')
-            return
-        file = BytesIO(file_bytes)
-        if not bucket_name:
-            bucket_name = self.bucket_name
-        key = f"{self.bucker_prefix}/{key}"
-
-        content_type, _ = mimetypes.guess_type(key)
-        if content_type is None:
-            content_type = 'application/octet-stream'
-
-        try:
-            log.info(f'uploading artifact {key} to s3://{bucket_name}/{key}')
-            self.client.upload_fileobj(
-                file,
-                bucket_name,
-                key,
-                ExtraArgs={
-                    'ACL': self.acl,
-                    'ContentType': content_type,
-                    'ContentDisposition': 'inline'
-                }
-            )
-            log.info(f'artifact {key} uploaded to s3://{bucket_name}/{key}')
-            return f'https://{bucket_name}.{self.endpoint}/{key}'
-        except Exception as e:
-            log.error(f'failed to upload file {key} to s3://{bucket_name}/{key}: {e}')

pytestomatio-2.8.2.dev43/tests/test_parameters.py

@@ -1,36 +0,0 @@
-import pytest
-pytestmark = pytest.mark.smoke
-
-test_file = """
-    import pytest
-
-    # Define some dummy callables
-    def add(a, b):
-        return a + b
-
-    def multiply(a, b):
-        return a * b
-
-    @pytest.mark.testomatio("@Tbca18714")
-    @pytest.mark.parametrize(
-        "operation, a, b, expected",
-        [
-            (add, 2, 3, 5),  # Test add function
-            (multiply, 2, 3, 6),  # Test multiply function
-        ],
-    )
-    def test_operations(operation, a, b, expected):
-        # Call the provided operation
-        result = operation(a, b)
-        assert result == expected, f"Expected {expected}, got {result}"
-"""
-
-@pytest.mark.testomatio("@Tb8930394")
-def test_callable_in_params(pytester):
-    pytester.makepyfile(test_file)
-
-    result = pytester.runpytest("--testomatio", "report", "-vv")
-    result.assert_outcomes(passed=2, failed=0, skipped=0)
-    assert "test_callable_in_params.py::test_operations[add-2-3-5] PASSED" in result.stdout.str()
-    assert "test_callable_in_params.py::test_operations[multiply-2-3-6] PASSED" in result.stdout.str()
-