pytestomatio 2.8.2.dev42__tar.gz → 2.8.2.dev44__tar.gz

{pytestomatio-2.8.2.dev42/pytestomatio.egg-info → pytestomatio-2.8.2.dev44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytestomatio
-Version: 2.8.2.dev42
+Version: 2.8.2.dev44
 Summary: Pytest plugin to sync test with testomat.io
 Author: Oleksii Ostapov, TikoQA
 Project-URL: Testomat.io, https://testomat.io/
@@ -19,6 +19,12 @@ 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"
+Requires-Dist: pytest-xdist==3.6.1; extra == "dev"
+Requires-Dist: python-dotenv==1.0.1; extra == "dev"
+Requires-Dist: toml==0.10.2; extra == "dev"
 
 [![Support Ukraine Badge](https://bit.ly/support-ukraine-now)](https://github.com/support-ukraine/support-ukraine)
 
@@ -226,9 +232,9 @@ def test_example():
 ## Contribution
 Use python 3.12
 
-1. `pip install ".[dev]"` (note, there are still issues with imports in edit mode `pip install -e ".[dev]"`)
-1. `TESTOMATIO_URL=https://beta.testomat.io   TESTOMATIO=$TT pytest -p pytester -m smoke`
-1. Test things manually (automated test are WIP)
+1. `pip install ".[dev]"`
+1. `python ./smoke.py`
+1. Test things manually
 1. Verify no regression bugs
 1. `cz commit`
 1. `cz bump`

{pytestomatio-2.8.2.dev42 → pytestomatio-2.8.2.dev44}/README.md

@@ -204,9 +204,9 @@ def test_example():
 ## Contribution
 Use python 3.12
 
-1. `pip install ".[dev]"` (note, there are still issues with imports in edit mode `pip install -e ".[dev]"`)
-1. `TESTOMATIO_URL=https://beta.testomat.io   TESTOMATIO=$TT pytest -p pytester -m smoke`
-1. Test things manually (automated test are WIP)
+1. `pip install ".[dev]"`
+1. `python ./smoke.py`
+1. Test things manually
 1. Verify no regression bugs
 1. `cz commit`
 1. `cz bump`

{pytestomatio-2.8.2.dev42 → pytestomatio-2.8.2.dev44}/pyproject.toml

@@ -13,7 +13,7 @@ version_provider = "pep621"
 update_changelog_on_bump = false
 [project]
 name = "pytestomatio"
-version = "2.8.2.dev42"
+version = "2.8.2.dev44"
 
 dependencies = [
     "requests>=2.29.0",
@@ -46,11 +46,13 @@ classifiers = [
 [project.entry-points.pytest11]
 pytestomatio = "pytestomatio.main"
 
-[options.extras_require]
+[project.optional-dependencies]
 dev = [
     "pytest>=7.2.0",
     "pytest-testdox>=2.0.0",
-    "pytest-xdist==3.6.1"
+    "pytest-xdist==3.6.1",
+    "python-dotenv==1.0.1",
+    "toml==0.10.2"
 ]
 
 [tool.pytest.ini_options]

{pytestomatio-2.8.2.dev42 → pytestomatio-2.8.2.dev44}/pytestomatio/main.py

@@ -14,6 +14,8 @@ from pytestomatio.testomatio.testRunConfig import TestRunConfig
 from pytestomatio.testomatio.testomatio import Testomatio
 from pytestomatio.testomatio.filter_plugin import TestomatioFilterPlugin
 
+import pdb
+
 log = logging.getLogger(__name__)
 log.setLevel('INFO')
 
@@ -162,6 +164,7 @@ def pytest_runtest_makereport(item: Item, call: CallInfo):
         'code': None,
     }
 
+    # TODO: refactor it and use TestItem setter to upate those attributes
     if call.when in ['setup', 'call']:
         if call.excinfo is not None:
             if call.excinfo.typename == 'Skipped':
@@ -175,7 +178,7 @@ def pytest_runtest_makereport(item: Item, call: CallInfo):
             request['status'] = 'passed' if call.when == 'call' else request['status']
 
         if hasattr(item, 'callspec'):
-            request['example'] = item.callspec.params
+            request['example'] = test_item.safe_params(item.callspec.params)
 
     if item.nodeid not in pytest.testomatio.test_run_config.status_request:
         pytest.testomatio.test_run_config.status_request[item.nodeid] = request

{pytestomatio-2.8.2.dev42 → pytestomatio-2.8.2.dev44}/pytestomatio/testing/testItem.py

@@ -95,15 +95,34 @@ 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())
+
+        print('_get_test_parameter_key ->', param_names)
+        # 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,25 +139,36 @@ 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:
             return test_name
-        
+
         pattern = r'\$\{(.*?)\}'
 
         def repl(match):
             key = match.group(1)
-            
             value = item.callspec.params.get(key, '')
-            if type(value) is bytes:
-                string_value = value.decode('utf-8')
-            elif isinstance(value, (str, int, float, bool)):
-                string_value = str(value)
-            else:
-                string_value = 'Unsupported type'
+            
+            string_value = self._to_string_value(value)
             # TODO: handle "value with space" on testomatio BE https://github.com/testomatio/check-tests/issues/147
-            return sub(r"[\.\s]", "_", string_value) # Temporary fix for spaces in parameter values
+            return sub(r"[\.\s]", "_", string_value)  # Temporary fix for spaces in parameter values
 
         test_name = sub(pattern, repl, sync_title)
-        return test_name
+        return test_name
+
+    def _to_string_value(self, value):
+        if callable(value):
+            return value.__name__ if hasattr(value, "__name__") else "anonymous_function"
+        elif isinstance(value, bytes):
+            return value.decode('utf-8')
+        elif isinstance(value, (str, int, float, bool)) or value is None:
+            return str(value)
+        else:
+            return str(value)  # Fallback to a string representation
+
+    # TODO: leverage as an attribute setter
+    def safe_params(self, params):
+        return {key: self._to_string_value(value) for key, value in params.items()}
+

{pytestomatio-2.8.2.dev42 → pytestomatio-2.8.2.dev44}/pytestomatio/testomatio/filter_plugin.py

@@ -5,7 +5,6 @@ class TestomatioFilterPlugin:
     def pytest_collection_modifyitems(self, session, config, items):
         # By now all other filters (like -m, -k, name-based) have been applied
         # and `items` is the filtered set after all their conditions.
-
         test_ids_str = config.getoption("test_id")
         if not test_ids_str:
             # No custom IDs specified, nothing to do
@@ -31,8 +30,9 @@ class TestomatioFilterPlugin:
                      testomatio_matched.append(item)
                      break
        
-       # We'll check common filters: -k, -m and a few others.
+        # We'll check common filters: -k, -m and a few others.
         # If they are empty or None, they are not active.
+
         other_filters_active = bool(
             config.option.keyword or  # -k
             config.option.markexpr or # -m
@@ -42,12 +42,20 @@ class TestomatioFilterPlugin:
             False
         )
 
+        if other_filters_active and "not" in config.option.keyword:
+            # If a "not" keyword filter exist - it means we have exclusion filter applied.
+            # In such scenario we respect the exclusion filters in a way
+            # that we accept tests with requested test ids as long as such tests do not fall into exclusion filter
+            items[:] = [item for item in testomatio_matched if item in items]
+            return
+
         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
             # 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
-            items[:] = testomatio_matched
+            return
+
+        # If no other filters are applied, test-ids filter acts as an exclusive filter:
+        # only run tests that match the given test IDs
+        items[:] = testomatio_matched

{pytestomatio-2.8.2.dev42 → pytestomatio-2.8.2.dev44/pytestomatio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytestomatio
-Version: 2.8.2.dev42
+Version: 2.8.2.dev44
 Summary: Pytest plugin to sync test with testomat.io
 Author: Oleksii Ostapov, TikoQA
 Project-URL: Testomat.io, https://testomat.io/
@@ -19,6 +19,12 @@ 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"
+Requires-Dist: pytest-xdist==3.6.1; extra == "dev"
+Requires-Dist: python-dotenv==1.0.1; extra == "dev"
+Requires-Dist: toml==0.10.2; extra == "dev"
 
 [![Support Ukraine Badge](https://bit.ly/support-ukraine-now)](https://github.com/support-ukraine/support-ukraine)
 
@@ -226,9 +232,9 @@ def test_example():
 ## Contribution
 Use python 3.12
 
-1. `pip install ".[dev]"` (note, there are still issues with imports in edit mode `pip install -e ".[dev]"`)
-1. `TESTOMATIO_URL=https://beta.testomat.io   TESTOMATIO=$TT pytest -p pytester -m smoke`
-1. Test things manually (automated test are WIP)
+1. `pip install ".[dev]"`
+1. `python ./smoke.py`
+1. Test things manually
 1. Verify no regression bugs
 1. `cz commit`
 1. `cz bump`

{pytestomatio-2.8.2.dev42 → pytestomatio-2.8.2.dev44}/pytestomatio.egg-info/SOURCES.txt

@@ -32,8 +32,9 @@ tests/test_class_root.py
 tests/test_cli_param_test_id.py
 tests/test_cli_params.py
 tests/test_decorators.py
+tests/test_parameters.py
 tests/test_root.py
-tests/test_xdist.py
+tests/test_sync.py
 tests/sub/__init__.py
 tests/sub/test_class_sub.py
 tests/sub/test_sub.py

pytestomatio-2.8.2.dev44/pytestomatio.egg-info/requires.txt

@@ -0,0 +1,13 @@
+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
+pytest-testdox>=2.0.0
+pytest-xdist==3.6.1
+python-dotenv==1.0.1
+toml==0.10.2

{pytestomatio-2.8.2.dev42 → pytestomatio-2.8.2.dev44}/tests/test_cli_param_test_id.py

@@ -23,46 +23,46 @@ 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
 # The testomatio and test-id parameters are lost in the pytester env.
 # Please test it in a semiautomated way with "test_cli_params.py" test
 @pytest.mark.testomatio("@T5a965adf")
-@pytest.mark.skip
 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.8.2.dev42 → pytestomatio-2.8.2.dev44}/tests/test_cli_params.py

@@ -7,7 +7,6 @@
 # ======================================= 3 passed, 50 deselected in 0.89s =======================================
 
 import pytest
-pytestmark = pytest.mark.smoke
 
 @pytest.mark.testomatio("@T55ecbca9")
 def test_smoke():

pytestomatio-2.8.2.dev44/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.dev42/tests/test_xdist.py → pytestomatio-2.8.2.dev44/tests/test_sync.py

@@ -1,4 +1,5 @@
 import pytest
+#TODO verify requests to testomatio
 
 @pytest.mark.testomatio("@Tfaf4da53")
 @pytest.mark.smoke
@@ -13,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([
@@ -30,17 +31,12 @@ 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([
         "*Sync completed without test execution*"
     ])
 
-    # Assert that no tests were run
-    result.stdout.fnmatch_lines([
-        "*no tests ran in *"
-    ])
-
     # Optional: Verify the process exited successfully (0 means no error)
     assert result.ret == 2

pytestomatio-2.8.2.dev42/pytestomatio.egg-info/requires.txt

@@ -1,6 +0,0 @@
-requests>=2.29.0
-pytest>7.2.0
-boto3>=1.28.28
-libcst==1.1.0
-commitizen>=3.18.1
-autopep8>=2.1.0