Fixes “class” mode to fall back to module name for tests with no class so that other tests aren’t all in one bucket like with “global” option.

Author: jbasko

pytest_random_order.py

@@ -29,7 +29,7 @@ def pytest_report_header(config):
     'global': lambda x: None,
     'package': lambda x: x.module.__package__,
     'module': lambda x: x.module.__name__,
-    'class': lambda x: (x.module.__name__, x.cls.__name__) if x.cls else None,
+    'class': lambda x: (x.module.__name__, x.cls.__name__) if x.cls else x.module.__name__,
 }
 
 

tests/test_actual_test_runs.py

@@ -8,7 +8,7 @@
 Call = collections.namedtuple('Call', field_names=('package', 'module', 'cls', 'name'))
 
 
-def get_runtest_call_sequence(result, key=None):
+def get_runtest_call_sequence(result):
     """
     Returns a tuple of names of test methods that were run
     in the order they were run.
@@ -145,12 +145,14 @@ def inspect_attr(this_call, prev_call, attr_name):
     elif shuffle_mode == 'module':
         assert num_module_switches == num_modules
 
-    elif shuffle_mode == 'cls':
+    elif shuffle_mode == 'class':
         # Each class can contribute to 1 or 2 switches.
         assert num_class_switches <= num_classes * 2
 
-        # Class shuffle is a subset of module shuffle
-        assert num_module_switches == num_modules
+        # Class shuffle is a subset of module shuffle.
+        # We have two classes in one module and these could be reshuffled so
+        # the module could appear in sequence of buckets two times.
+        assert num_modules <= num_module_switches <= num_modules + 1
 
 
 @pytest.mark.parametrize('mode', ['class', 'module', 'package', 'global'])