Change the order in which the parameters are applied

Author: felsenhower

conftest.py

@@ -281,21 +281,30 @@ def pytest_generate_tests(metafunc: pytest.Metafunc) -> None:
         filter_regexes = metafunc.config.getoption("filter")
         do_shuffle = metafunc.config.getoption("shuffle")
         test_cases = util.get_test_cases()
-        if do_shuffle:
-            shuffle(test_cases)
-        if max_num_tests:
-            test_cases = test_cases[:max_num_tests]
+
+        # 1. Apply the filter regexes (if desired):
+        test_cases = [
+            test_case
+            for test_case in test_cases
+            if all(regex.match(" ".join(test_case)) for regex in filter_regexes)
+        ]
+
+        # 2. Apply the selected number of threads:
         test_cases = [
             (str(num), method, lines, func, term, preciter)
             for (
                 num,
                 (_old_num, method, lines, func, term, preciter),
             ) in itertools.product(num_threads_list, test_cases)
         ]
+
+        # 3. Shuffle the tests (if desired):
+        if do_shuffle:
+            shuffle(test_cases)
+
+        # 4. Apply max. number of tests (if desired):
+        if max_num_tests:
+            test_cases = test_cases[:max_num_tests]
+
         test_ids = [" ".join(test_case) for test_case in test_cases]
-        test_ids = [
-            test_id
-            for test_id in test_ids
-            if all(regex.match(test_id) for regex in filter_regexes)
-        ]
         metafunc.parametrize("test_id", test_ids)