Remove the temporary hack to force test_optparse to

run immediately after test_file.  At least 8 buildbot
boxes passed since the underlying problem got fixed,
and they all failed before the fix, so there's no point
to this anymore.

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index d146eb0a24a0f6a4aa2bcedfc1e42c01298f3495..ca4a3b515fa55476f9cc94f7e378344b0dd47423 100755 (executable)
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -344,11 +344,6 @@ def main(tests=None, testdir=None, verbose=0, quiet=False, generate=False,
         tests = tests[:1]
     if randomize:
         random.shuffle(tests)
-        # XXX Temporary hack to force test_optparse to run immediately
-        # XXX after test_file.  This should go away as soon as we fix
-        # XXX whatever it is that's causing that to fail.
-        tests.remove("test_file")
-        tests.insert(tests.index("test_optparse"), "test_file")
     if trace:
         import trace
         tracer = trace.Trace(ignoredirs=[sys.prefix, sys.exec_prefix],