Fixed test with pytest 8.1+

smarie · Sep 26, 2024 · 201bb14 · 201bb14
1 parent f9f199e
commit 201bb14
Showing 1 changed file with 28 additions and 11 deletions.
diff --git a/tests/pytest_extension/order/session_optim/test_reorder_default_normal.py b/tests/pytest_extension/order/session_optim/test_reorder_default_normal.py
@@ -4,7 +4,7 @@
 # License: 3-clause BSD, <https://github.com/smarie/python-pytest-cases/blob/master/LICENSE>
 import pytest
 
-from pytest_cases.common_pytest_marks import PYTEST3_OR_GREATER, PYTEST361_36X, PYTEST811
+from pytest_cases.common_pytest_marks import PYTEST3_OR_GREATER, PYTEST361_36X, PYTEST811, PYTEST81_OR_GREATER
 
 
 def test_config(request):
@@ -30,15 +30,32 @@ def test2(reprovision):
     pass
 
 
-@pytest.mark.skipif((not PYTEST3_OR_GREATER) or PYTEST361_36X or PYTEST811,
+@pytest.mark.skipif((not PYTEST3_OR_GREATER) or PYTEST361_36X,
                     reason="This 'optimal order' was changed in some versions of pytest")
 def test_synthesis(module_results_dct):
-    assert list(module_results_dct) == ['test_config',
-                                        'test[flavor1-vxlan]',
-                                        'test2[flavor1-vxlan]',
-                                        'test[flavor2-vxlan]',
-                                        'test2[flavor2-vxlan]',
-                                        'test[flavor2-vlan]',
-                                        'test2[flavor2-vlan]',
-                                        'test[flavor1-vlan]',
-                                        'test2[flavor1-vlan]']
+    if PYTEST81_OR_GREATER:
+        # new 'optimal order'
+        assert list(module_results_dct) == [
+            'test_config',
+            'test[flavor1-vxlan]',
+            'test2[flavor1-vxlan]',
+            'test[flavor1-vlan]',
+            'test2[flavor1-vlan]',
+            'test[flavor2-vlan]',
+            'test2[flavor2-vlan]',
+            'test[flavor2-vxlan]',
+            'test2[flavor2-vxlan]',
+        ]
+    else:
+        # legacy 'optimal order'
+        assert list(module_results_dct) == [
+            'test_config',
+            'test[flavor1-vxlan]',
+            'test2[flavor1-vxlan]',
+            'test[flavor2-vxlan]',
+            'test2[flavor2-vxlan]',
+            'test[flavor2-vlan]',
+            'test2[flavor2-vlan]',
+            'test[flavor1-vlan]',
+            'test2[flavor1-vlan]'
+        ]