Fix merge

Author: juj

test/parallel_testsuite.py

@@ -111,6 +111,11 @@ def run(self, result):
     # issues.
     # multiprocessing.set_start_method('spawn')
 
+    # If we are running with --failing-and-slow-first, then the test list has been
+    # pre-sorted based on previous test run results. Otherwise run the tests in
+    # reverse alphabetical order.
+    tests = list(self if self.failing_and_slow_first else self.reversed_tests())
+
     tests = self.get_sorted_tests()
     contains_browser_test = any(test.is_browser_test() for test in tests)
     use_cores = cap_max_workers_in_pool(min(self.max_cores, len(tests), num_cores()), contains_browser_test)