Fix handling of more than one marker attribute

- increase code coverage

Author: mrbean-bremen

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## [Version 0.9.3](https://pypi.org/project/pytest-order/0.9.3/) (2021-01-14)
+Bugfix release.
+
+### Fixes
+- fixed handling of more than one attribute in an order marker 
+
 ## [Version 0.9.2](https://pypi.org/project/pytest-order/0.9.2/) (2020-11-13)
 Friday the 13th release.
 

pytest_order/__init__.py

@@ -166,9 +166,9 @@ def mark_binning(item, keys, start, end, before, after, dep, unordered, alias):
                 end.setdefault(order, []).append(item)
             else:
                 start.setdefault(order, []).append(item)
-        elif before_mark:
+        if before_mark:
             before.setdefault(full_name(item, before_mark), []).append(item)
-        elif after_mark:
+        if after_mark:
             after.setdefault(
                 full_name(item, after_mark), []).append(item)
         handled = True

tests/test_dependency.py

@@ -276,3 +276,19 @@ def test_c(self):
     warning = ("cannot execute test relative to others: "
                "test_3 enqueue them behind the others")
     assert warning in out
+
+
+def test_unsupported_order_with_dependency(item_names_for):
+    test_content = """
+    import pytest
+
+    @pytest.mark.dependency(depends=["test_2"])
+    @pytest.mark.order("unknown")
+    def test_1():
+        pass
+
+    def test_2():
+        pass
+    """
+    with pytest.warns(UserWarning, match="Unknown order attribute:'unknown'"):
+        assert item_names_for(test_content) == ["test_2", "test_1"]

tests/test_relative_ordering.py

@@ -267,7 +267,7 @@ def test_3():
     assert item_names_for(test_content) == ["test_3", "test_2", "test_1"]
 
 
-def test_combined_markers(item_names_for):
+def test_combined_markers1(item_names_for):
     test_content = """
     import pytest
 
@@ -285,6 +285,42 @@ def test_3():
     assert item_names_for(test_content) == ["test_3", "test_1", "test_2"]
 
 
+def test_combined_markers2(item_names_for):
+    test_content = """
+    import pytest
+
+    def test_1():
+        pass
+
+    @pytest.mark.order(index=2, before="test_1")
+    def test_2():
+        pass
+
+    @pytest.mark.order(index=1, before="test_1")
+    def test_3():
+        pass
+    """
+    assert item_names_for(test_content) == ["test_3", "test_2", "test_1"]
+
+
+def test_combined_markers3(item_names_for):
+    test_content = """
+    import pytest
+
+    def test_1():
+        pass
+
+    @pytest.mark.order(index=2, before="test_3")
+    def test_2():
+        pass
+
+    @pytest.mark.order(index=1, before="test_1")
+    def test_3():
+        pass
+    """
+    assert item_names_for(test_content) == ["test_2", "test_3", "test_1"]
+
+
 def test_dependency_after_unknown_test(item_names_for, capsys):
     test_content = """
     import pytest