Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-pytest-order for
openSUSE:Factory checked in at 2024-04-07 22:11:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pytest-order (Old)
and /work/SRC/openSUSE:Factory/.python-pytest-order.new.1905 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest-order"
Sun Apr 7 22:11:10 2024 rev:5 rq:1165755 version:1.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pytest-order/python-pytest-order.changes
2023-12-04 23:02:17.177334464 +0100
+++
/work/SRC/openSUSE:Factory/.python-pytest-order.new.1905/python-pytest-order.changes
2024-04-07 22:13:21.574760560 +0200
@@ -1,0 +2,8 @@
+Sat Apr 6 07:44:52 UTC 2024 - Dirk Müller <[email protected]>
+
+- update to 1.2.1:
+ * handle dependency markers with the same alias name (see #71)
+ * specify rootdir to recursive pytest calls to avoid searching
+ a large directory tree unnecessarily (see #110)
+
+-------------------------------------------------------------------
Old:
----
pytest-order-1.2.0.tar.gz
New:
----
pytest-order-1.2.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pytest-order.spec ++++++
--- /var/tmp/diff_new_pack.YySlOW/_old 2024-04-07 22:13:21.994775942 +0200
+++ /var/tmp/diff_new_pack.YySlOW/_new 2024-04-07 22:13:21.994775942 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-pytest-order
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%{?sle15_python_module_pythons}
Name: python-pytest-order
-Version: 1.2.0
+Version: 1.2.1
Release: 0
Summary: Pytest plugin to run your tests in a specific order
License: MIT
++++++ pytest-order-1.2.0.tar.gz -> pytest-order-1.2.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-order-1.2.0/CHANGELOG.md
new/pytest-order-1.2.1/CHANGELOG.md
--- old/pytest-order-1.2.0/CHANGELOG.md 2023-11-18 13:23:06.000000000 +0100
+++ new/pytest-order-1.2.1/CHANGELOG.md 2024-04-02 21:08:49.000000000 +0200
@@ -1,10 +1,21 @@
# pytest-order Release Notes
+## [Version 1.2.1](https://pypi.org/project/pytest-order/1.2.1/) (2024-04-02)
+Bugfix release.
+
+## Fixes
+- handle dependency markers with the same alias name (see
[#71](https://github.com/pytest-dev/pytest-order/issues/71))
+- specify rootdir to recursive pytest calls to avoid searching a large
directory tree unnecessarily (see
[#110](https://github.com/pytest-dev/pytest-order/issues/110))
+
+## Infrastructure
+- avoid unknown marker warning in tests (see
[#101](https://github.com/pytest-dev/pytest-order/issues/101))
+- added pytest 8 to CI tests
+
## [Version 1.2.0](https://pypi.org/project/pytest-order/1.2.0/) (2023-11-18)
Allows using custom markers for ordering.
### New features
-* added option `--order-marker-prefix` to allow using custom markers for
ordering
+- added option `--order-marker-prefix` to allow using custom markers for
ordering
### Infrastructure
- added pre-commit hook for linters
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-order-1.2.0/PKG-INFO
new/pytest-order-1.2.1/PKG-INFO
--- old/pytest-order-1.2.0/PKG-INFO 2023-11-18 13:23:15.452074500 +0100
+++ new/pytest-order-1.2.1/PKG-INFO 2024-04-02 21:09:00.307364200 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: pytest-order
-Version: 1.2.0
+Version: 1.2.1
Summary: pytest plugin to run your tests in a specific order
Home-page: https://github.com/pytest-dev/pytest-order
Author: mrbean-bremen
@@ -83,7 +83,7 @@
- sparse ordering of tests via the
[sparse-ordering](https://pytest-order.readthedocs.io/en/stable/configuration.html#sparse-ordering)
option
- usage of custom markers for ordering using the
-
[sparse-ordering](https://pytest-order.readthedocs.io/en/stable/configuration.html#order-marker-prefix)
option
+
[order-marker-prefix](https://pytest-order.readthedocs.io/en/stable/configuration.html#order-marker-prefix)
option
Overview
--------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-order-1.2.0/README.md
new/pytest-order-1.2.1/README.md
--- old/pytest-order-1.2.0/README.md 2023-11-18 13:23:06.000000000 +0100
+++ new/pytest-order-1.2.1/README.md 2024-04-02 21:08:49.000000000 +0200
@@ -49,7 +49,7 @@
- sparse ordering of tests via the
[sparse-ordering](https://pytest-order.readthedocs.io/en/stable/configuration.html#sparse-ordering)
option
- usage of custom markers for ordering using the
-
[sparse-ordering](https://pytest-order.readthedocs.io/en/stable/configuration.html#order-marker-prefix)
option
+
[order-marker-prefix](https://pytest-order.readthedocs.io/en/stable/configuration.html#order-marker-prefix)
option
Overview
--------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-order-1.2.0/docs/source/configuration.rst
new/pytest-order-1.2.1/docs/source/configuration.rst
--- old/pytest-order-1.2.0/docs/source/configuration.rst 2023-11-18
13:23:06.000000000 +0100
+++ new/pytest-order-1.2.1/docs/source/configuration.rst 2024-04-02
21:08:49.000000000 +0200
@@ -488,7 +488,7 @@
the option ``--order-marker-prefix``. Running the original tests without any
order marker
gives you now::
- $ pytest tests -vv -m "m2 or m3" --order-merker-prefix=m
+ $ pytest tests -vv -m "m2 or m3" --order-marker-prefix=m
============================= test session starts
==============================
...
test_module.py:18: test_c PASSED
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-order-1.2.0/example/test_classes.py
new/pytest-order-1.2.1/example/test_classes.py
--- old/pytest-order-1.2.0/example/test_classes.py 2023-11-18
13:23:06.000000000 +0100
+++ new/pytest-order-1.2.1/example/test_classes.py 2024-04-02
21:08:49.000000000 +0200
@@ -1,6 +1,7 @@
"""Shows how to use relative sorting in test classes, see
See
https://pytest-order.readthedocs.io/en/stable/#referencing-of-tests-in-other-classes-or-modules
# noqa: E501
"""
+
import pytest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-order-1.2.0/example/test_combined.py
new/pytest-order-1.2.1/example/test_combined.py
--- old/pytest-order-1.2.0/example/test_combined.py 2023-11-18
13:23:06.000000000 +0100
+++ new/pytest-order-1.2.1/example/test_combined.py 2024-04-02
21:08:49.000000000 +0200
@@ -1,6 +1,7 @@
"""Shows how combined ordinal and relative sorting is handled.
See
https://pytest-order.readthedocs.io/en/stable/#combination-of-absolute-and-relative-ordering
# noqa: E501
"""
+
import pytest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-order-1.2.0/example/test_module1.py
new/pytest-order-1.2.1/example/test_module1.py
--- old/pytest-order-1.2.0/example/test_module1.py 2023-11-18
13:23:06.000000000 +0100
+++ new/pytest-order-1.2.1/example/test_module1.py 2024-04-02
21:08:49.000000000 +0200
@@ -1,6 +1,7 @@
"""One of the test files showing the use of the --order-scope option.
See https://pytest-order.readthedocs.io/en/stable/#order-scope
"""
+
import pytest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-order-1.2.0/example/test_module2.py
new/pytest-order-1.2.1/example/test_module2.py
--- old/pytest-order-1.2.0/example/test_module2.py 2023-11-18
13:23:06.000000000 +0100
+++ new/pytest-order-1.2.1/example/test_module2.py 2024-04-02
21:08:49.000000000 +0200
@@ -1,6 +1,7 @@
"""One of the test files showing the use of the --order-scope option.
See https://pytest-order.readthedocs.io/en/stable/#order-scope
"""
+
import pytest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-order-1.2.0/example/test_modules_b.py
new/pytest-order-1.2.1/example/test_modules_b.py
--- old/pytest-order-1.2.0/example/test_modules_b.py 2023-11-18
13:23:06.000000000 +0100
+++ new/pytest-order-1.2.1/example/test_modules_b.py 2024-04-02
21:08:49.000000000 +0200
@@ -1,6 +1,7 @@
"""Example showing ordering relative to tests in other modules.
See
https://pytest-order.readthedocs.io/en/stable/#referencing-of-tests-in-other-classes-or-modules
# noqa: E501
"""
+
import pytest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-order-1.2.0/example/test_number.py
new/pytest-order-1.2.1/example/test_number.py
--- old/pytest-order-1.2.0/example/test_number.py 2023-11-18
13:23:06.000000000 +0100
+++ new/pytest-order-1.2.1/example/test_number.py 2024-04-02
21:08:49.000000000 +0200
@@ -2,6 +2,7 @@
and the use of the long form (index attribute) and short form (number only).
See https://pytest-order.readthedocs.io/en/stable/#order-by-index
"""
+
import pytest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-order-1.2.0/example/test_ordinals.py
new/pytest-order-1.2.1/example/test_ordinals.py
--- old/pytest-order-1.2.0/example/test_ordinals.py 2023-11-18
13:23:06.000000000 +0100
+++ new/pytest-order-1.2.1/example/test_ordinals.py 2024-04-02
21:08:49.000000000 +0200
@@ -1,6 +1,7 @@
"""Shows how to use ordinal names for sorting.
See https://pytest-order.readthedocs.io/en/stable/#order-using-ordinals
"""
+
import pytest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-order-1.2.0/example/test_quickstart.py
new/pytest-order-1.2.1/example/test_quickstart.py
--- old/pytest-order-1.2.0/example/test_quickstart.py 2023-11-18
13:23:06.000000000 +0100
+++ new/pytest-order-1.2.1/example/test_quickstart.py 2024-04-02
21:08:49.000000000 +0200
@@ -1,6 +1,7 @@
"""Test with ordering (as opposed to test.py) from the quick start chapter.
See https://pytest-order.readthedocs.io/en/stable/#quickstart
"""
+
import pytest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-order-1.2.0/example/test_relative.py
new/pytest-order-1.2.1/example/test_relative.py
--- old/pytest-order-1.2.0/example/test_relative.py 2023-11-18
13:23:06.000000000 +0100
+++ new/pytest-order-1.2.1/example/test_relative.py 2024-04-02
21:08:49.000000000 +0200
@@ -1,6 +1,7 @@
"""Shows how to sort tests relatively to each other, see
https://pytest-order.readthedocs.io/en/stable/#order-relative-to-other-tests
"""
+
import pytest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pytest-order-1.2.0/example/test_sort_breaks_dependency.py
new/pytest-order-1.2.1/example/test_sort_breaks_dependency.py
--- old/pytest-order-1.2.0/example/test_sort_breaks_dependency.py
2023-11-18 13:23:06.000000000 +0100
+++ new/pytest-order-1.2.1/example/test_sort_breaks_dependency.py
2024-04-02 21:08:49.000000000 +0200
@@ -2,6 +2,7 @@
dependency.
See https://pytest-order.readthedocs.io/en/stable/#order-dependencies
"""
+
import pytest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-order-1.2.0/example/test_sort_dependency.py
new/pytest-order-1.2.1/example/test_sort_dependency.py
--- old/pytest-order-1.2.0/example/test_sort_dependency.py 2023-11-18
13:23:06.000000000 +0100
+++ new/pytest-order-1.2.1/example/test_sort_dependency.py 2024-04-02
21:08:49.000000000 +0200
@@ -1,6 +1,7 @@
"""Test showing the behavior of the --order-dependencies option.
See https://pytest-order.readthedocs.io/en/stable/#order-dependencies
"""
+
import pytest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-order-1.2.0/example/test_sparse_ordering.py
new/pytest-order-1.2.1/example/test_sparse_ordering.py
--- old/pytest-order-1.2.0/example/test_sparse_ordering.py 2023-11-18
13:23:06.000000000 +0100
+++ new/pytest-order-1.2.1/example/test_sparse_ordering.py 2024-04-02
21:08:49.000000000 +0200
@@ -1,6 +1,7 @@
"""Test file showing the behavior of the --sparse-ordering option.
See https://pytest-order.readthedocs.io/en/stable/#sparse-ordering
"""
+
import pytest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-order-1.2.0/pytest_order/__init__.py
new/pytest-order-1.2.1/pytest_order/__init__.py
--- old/pytest-order-1.2.0/pytest_order/__init__.py 2023-11-18
13:23:06.000000000 +0100
+++ new/pytest-order-1.2.1/pytest_order/__init__.py 2024-04-02
21:08:49.000000000 +0200
@@ -1 +1 @@
-__version__ = "1.2.0"
+__version__ = "1.2.1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-order-1.2.0/pytest_order/sorter.py
new/pytest-order-1.2.1/pytest_order/sorter.py
--- old/pytest-order-1.2.0/pytest_order/sorter.py 2023-11-18
13:23:06.000000000 +0100
+++ new/pytest-order-1.2.1/pytest_order/sorter.py 2024-04-02
21:08:49.000000000 +0200
@@ -1,7 +1,9 @@
+import re
import sys
-from warnings import warn
+from collections import OrderedDict
from contextlib import suppress
from typing import Optional, List, Dict, Tuple, cast
+from warnings import warn
from _pytest.config import Config
from _pytest.mark import Mark
@@ -10,20 +12,6 @@
from .item import Item, ItemList, ItemGroup, filter_marks, move_item,
RelativeMark
from .settings import Settings, Scope
-try:
- from typing import OrderedDict
-except ImportError:
- # In Python <3.7.2, we need to stub it
- from collections import OrderedDict as OrderedDict_cls
- from typing import MutableMapping, TypeVar
-
- KT = TypeVar("KT")
- VT = TypeVar("VT")
-
- class OrderedDict(OrderedDict_cls, MutableMapping[KT, VT]): # type: ignore
- pass
-
-
orders_map = {
"first": 0,
"second": 1,
@@ -112,7 +100,7 @@
self,
item: Item,
dep_marks: Dict[Tuple[str, Scope, str], List[Item]],
- aliases: Dict[str, Item],
+ aliases: Dict[str, List[Item]],
) -> None:
"""
Collect relevant markers for the given item.
@@ -138,7 +126,7 @@
item: Item,
has_order: bool,
dep_marks: Dict[Tuple[str, Scope, str], List[Item]],
- aliases: Dict[str, Item],
+ aliases: Dict[str, List[Item]],
) -> None:
# always order dependencies if an order mark is present
# otherwise only if order-dependencies is set
@@ -159,7 +147,7 @@
# of the nodeid, depending on the scope
if not name_mark:
name_mark = item.node_id
- aliases[name_mark] = item
+ aliases.setdefault(name_mark, []).append(item)
def handle_order_marks(self, item: Item) -> None:
marks = item.item.iter_markers("order")
@@ -289,7 +277,7 @@
)
def collect_markers(self) -> None:
- aliases: Dict[str, Item] = {}
+ aliases: Dict[str, List[Item]] = {}
dep_marks: Dict[Tuple[str, Scope, str], List[Item]] = {}
for item in self.items:
self.mark_binning(item, dep_marks, aliases)
@@ -298,20 +286,20 @@
def resolve_dependency_markers(
self,
dep_marks: Dict[Tuple[str, Scope, str], List[Item]],
- aliases: Dict[str, Item],
+ aliases: Dict[str, List[Item]],
) -> None:
for (name, _, prefix), items in dep_marks.items():
if name in aliases:
for item in items:
- self.dep_marks.append(
- RelativeMark(aliases[name], item, move_after=True)
- )
+ alias = self.matching_alias(aliases[name], item)
+ self.dep_marks.append(RelativeMark(alias, item,
move_after=True))
else:
label = "::".join((prefix, name))
if label in aliases:
for item in items:
+ alias = self.matching_alias(aliases[label], item)
self.dep_marks.append(
- RelativeMark(aliases[label], item, move_after=True)
+ RelativeMark(alias, item, move_after=True)
)
else:
sys.stdout.write(
@@ -319,6 +307,28 @@
"- ignoring it.".format(name)
)
+ @staticmethod
+ def matching_alias(aliases: List[Item], item: Item) -> Item:
+ if len(aliases) == 1:
+ return aliases[0]
+
+ # handle the rare case that several tests have the same alias name
+ # we use the item that best matches the node id of the dependent item
+ max_matching_parts = 0
+ node_id_parts = re.split("(::|/)", item.node_id)
+ matching_item = aliases[0]
+ for alias_item in aliases:
+ alias_node_id_parts = re.split("(::|/)", alias_item.node_id)
+ nr_matching_parts = 0
+ for n, a in zip(node_id_parts, alias_node_id_parts):
+ if n != a:
+ break
+ nr_matching_parts += 1
+ if nr_matching_parts > max_matching_parts:
+ max_matching_parts = nr_matching_parts
+ matching_item = alias_item
+ return matching_item
+
def module_item_groups(items: List[Item]) -> Dict[str, List[Item]]:
"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-order-1.2.0/pytest_order.egg-info/PKG-INFO
new/pytest-order-1.2.1/pytest_order.egg-info/PKG-INFO
--- old/pytest-order-1.2.0/pytest_order.egg-info/PKG-INFO 2023-11-18
13:23:15.000000000 +0100
+++ new/pytest-order-1.2.1/pytest_order.egg-info/PKG-INFO 2024-04-02
21:09:00.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: pytest-order
-Version: 1.2.0
+Version: 1.2.1
Summary: pytest plugin to run your tests in a specific order
Home-page: https://github.com/pytest-dev/pytest-order
Author: mrbean-bremen
@@ -83,7 +83,7 @@
- sparse ordering of tests via the
[sparse-ordering](https://pytest-order.readthedocs.io/en/stable/configuration.html#sparse-ordering)
option
- usage of custom markers for ordering using the
-
[sparse-ordering](https://pytest-order.readthedocs.io/en/stable/configuration.html#order-marker-prefix)
option
+
[order-marker-prefix](https://pytest-order.readthedocs.io/en/stable/configuration.html#order-marker-prefix)
option
Overview
--------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-order-1.2.0/tests/test_dependency.py
new/pytest-order-1.2.1/tests/test_dependency.py
--- old/pytest-order-1.2.0/tests/test_dependency.py 2023-11-18
13:23:06.000000000 +0100
+++ new/pytest-order-1.2.1/tests/test_dependency.py 2024-04-02
21:08:49.000000000 +0200
@@ -399,6 +399,61 @@
)
+def test_equally_named_dependency_in_modules(test_path):
+ # regression test for #71
+ test_path.makepyfile(
+ test_ndep1=(
+ """
+ import pytest
+
+ class TestOne:
+
+ @pytest.mark.dependency(name="one", depends=["zero"])
+ def test_one(self):
+ assert True
+
+ @pytest.mark.dependency(name="two", depends=["one"])
+ def test_two(self):
+ assert True
+
+ @pytest.mark.dependency(name="three", depends=["two"])
+ def test_three(self):
+ assert True
+
+ @pytest.mark.dependency(name="zero")
+ def test_zero(self):
+ assert True
+ """
+ ),
+ test_ndep2=(
+ """
+ import pytest
+
+ class TestTwo:
+
+ @pytest.mark.dependency(name="one", depends=["zero"])
+ def test_one(self):
+ assert True
+
+ @pytest.mark.dependency(name="two", depends=["one"])
+ def test_two(self):
+ assert True
+
+ @pytest.mark.dependency(name="three", depends=["two"])
+ def test_three(self):
+ assert True
+
+ @pytest.mark.dependency(name="zero")
+ def test_zero(self):
+ assert True
+ """
+ ),
+ )
+
+ result = test_path.runpytest("-v", "--order-dependencies")
+ result.assert_outcomes(passed=8, failed=0, skipped=0)
+
+
@pytest.mark.skipif(
pytest.__version__.startswith("3.7."),
reason="pytest-dependency < 0.5 does not support session scope",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-order-1.2.0/tests/test_marker_prefix.py
new/pytest-order-1.2.1/tests/test_marker_prefix.py
--- old/pytest-order-1.2.0/tests/test_marker_prefix.py 2023-11-18
13:23:06.000000000 +0100
+++ new/pytest-order-1.2.1/tests/test_marker_prefix.py 2024-04-02
21:08:49.000000000 +0200
@@ -22,14 +22,35 @@
)
[email protected](scope="module")
+def conftest_file():
+ yield (
+ """
+ def pytest_configure(config):
+ config.addinivalue_line("markers", "my1: used in marker prefix
test")
+ config.addinivalue_line("markers", "my2: used in marker prefix
test")
+ config.addinivalue_line("markers", "my3: used in marker prefix
test")
+ """
+ )
+
+
@pytest.fixture
-def marker_test(test_path, marker_test_file):
+def marker_test(test_path, marker_test_file, conftest_file):
+ test_path.makepyfile(conftest=conftest_file)
test_path.makepyfile(test_marker=marker_test_file)
yield test_path
-def test_no_ordering(marker_test_file, item_names_for):
- assert item_names_for(marker_test_file) == ["test_a", "test_b", "test_c"]
+def test_no_ordering(marker_test):
+ result = marker_test.runpytest("-v")
+ result.assert_outcomes(passed=3, skipped=0)
+ result.stdout.fnmatch_lines(
+ [
+ "test_marker.py::test_a PASSED",
+ "test_marker.py::test_b PASSED",
+ "test_marker.py::test_c PASSED",
+ ]
+ )
def test_order_with_marker_prefix(marker_test):
@@ -110,7 +131,8 @@
)
-def test_mix_marker_prefix_with_order_marks(test_path):
+def test_mix_marker_prefix_with_order_marks(test_path, conftest_file):
+ test_path.makepyfile(conftest=conftest_file)
test_path.makepyfile(
test_marker=(
"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-order-1.2.0/tests/test_xdist_handling.py
new/pytest-order-1.2.1/tests/test_xdist_handling.py
--- old/pytest-order-1.2.0/tests/test_xdist_handling.py 2023-11-18
13:23:06.000000000 +0100
+++ new/pytest-order-1.2.1/tests/test_xdist_handling.py 2024-04-02
21:08:49.000000000 +0200
@@ -59,11 +59,11 @@
)
)
# With `loadfile`, the tests should pass
- args = ["-n3", "--dist=loadfile", str(tmpdir)]
+ args = ["-n3", "--dist=loadfile", f"--rootdir={tmpdir}", str(tmpdir)]
ret = pytest.main(args, [pytest_order])
assert ret == 0
# Without `loadfile`, the tests should fail
- args = ["-n3", str(tmpdir)]
+ args = ["-n3", f"--rootdir={tmpdir}", str(tmpdir)]
ret = pytest.main(args, [pytest_order])
assert ret == 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pytest-order-1.2.0/tox.ini
new/pytest-order-1.2.1/tox.ini
--- old/pytest-order-1.2.0/tox.ini 2023-11-18 13:23:06.000000000 +0100
+++ new/pytest-order-1.2.1/tox.ini 2024-04-02 21:08:49.000000000 +0200
@@ -1,23 +1,21 @@
[tox]
envlist =
- {py37,py38,py39,pypy37,pypy39}-pytest{50,51,52,53,54,60,61,62,70,73}
- {py310,py311,py312,pypy310}-pytest{624,70,73}
+ {py37,pypy37}-pytest{50,54,60,62,624,70,74}
+ {py38,py39,pypy39}-pytest{50,54,60,62,624,70,74,80}
+ {py310,py311,py312,pypy310}-pytest{624,70,74,80}
[testenv]
deps =
pytest50: pytest>=5.0,<5.1
- pytest51: pytest>=5.1,<5.2
- pytest52: pytest>=5.2,<5.3
- pytest53: pytest>=5.3,<5.4
pytest54: pytest>=5.4,<6.0
pytest60: pytest>=6.0,<6.1
- pytest61: pytest>=6.1,<6.2
pytest62: pytest>=6.2,<6.3
pytest624: pytest>=6.2.4,<6.3
pytest70: pytest>=7.0,<7.1
- pytest73: pytest>=7.3,<7.4
+ pytest74: pytest>=7.3,<8.0
+ pytest80: pytest==8.0.1
pytest-cov<2.10
- pytest{50,51,52,53,54}: pytest-xdist<2.0.0
- pytest{60,61,62,624,70,73}: pytest-xdist
+ pytest{50,54}: pytest-xdist<2.0.0
+ pytest{60,62,624,70,74,80}: pytest-xdist
pytest-dependency>=0.5.1
pytest-mock
