Change CI arguments: remove --randomize, add --fail-rerun

Author: mhsmith

Android/android.py

@@ -739,10 +739,7 @@ def ci(context):
 
             # Arguments are similar to --fast-ci, but in single-process mode.
             launcher_args = ["--managed", "maxVersion", "-v"]
-            test_args = [
-                "--single-process", "--fail-env-changed", "--rerun", "--slowest",
-                "--verbose3", "-u", "all,-cpu", "--timeout=600"
-            ]
+            test_args = ["--fast-ci", "--single-process"]
             run(
                 ["./android.py", "test", *launcher_args, "--", *test_args],
                 cwd=temp_dir

Lib/test/libregrtest/cmdline.py

@@ -453,13 +453,13 @@ def _parse_args(args, **kwargs):
     # Continuous Integration (CI): common options for fast/slow CI modes
     if ns.slow_ci or ns.fast_ci:
         # Similar to options:
-        #   -j0 --randomize --fail-env-changed --rerun --slowest --verbose3
+        #   -j0 --fail-env-changed --rerun --fail-rerun --slowest --verbose3
         if ns.use_mp is None:
             ns.use_mp = 0
-        ns.randomize = True
         ns.fail_env_changed = True
         if ns.python is None:
             ns.rerun = True
+            ns.fail_rerun = True
         ns.print_slow = True
         ns.verbose3 = True
     else:

Lib/test/test_regrtest.py

@@ -432,7 +432,7 @@ def check_ci_mode(self, args, use_resources, rerun=True):
         regrtest = self.create_regrtest(args)
         self.assertEqual(regrtest.num_workers, -1)
         self.assertEqual(regrtest.want_rerun, rerun)
-        self.assertTrue(regrtest.randomize)
+        self.assertEqual(regrtest.fail_rerun, rerun)
         self.assertIsInstance(regrtest.random_seed, int)
         self.assertTrue(regrtest.fail_env_changed)
         self.assertTrue(regrtest.print_slowest)