diff --git a/Lib/test/test_future3.py b/Lib/test/badsyntax_future3.py similarity index 100% rename from Lib/test/test_future3.py rename to Lib/test/badsyntax_future3.py diff --git a/Lib/test/test_future4.py b/Lib/test/badsyntax_future4.py similarity index 100% rename from Lib/test/test_future4.py rename to Lib/test/badsyntax_future4.py diff --git a/Lib/test/test_future5.py b/Lib/test/badsyntax_future5.py similarity index 100% rename from Lib/test/test_future5.py rename to Lib/test/badsyntax_future5.py diff --git a/Lib/test/test_future6.py b/Lib/test/badsyntax_future6.py similarity index 100% rename from Lib/test/test_future6.py rename to Lib/test/badsyntax_future6.py diff --git a/Lib/test/test_future7.py b/Lib/test/badsyntax_future7.py similarity index 100% rename from Lib/test/test_future7.py rename to Lib/test/badsyntax_future7.py diff --git a/Lib/test/nocaret.py b/Lib/test/badsyntax_nocaret.py similarity index 100% rename from Lib/test/nocaret.py rename to Lib/test/badsyntax_nocaret.py diff --git a/Lib/test/output/test_future b/Lib/test/output/test_future index 5d7770af1f9..4631489a882 100644 --- a/Lib/test/output/test_future +++ b/Lib/test/output/test_future @@ -1,8 +1,8 @@ test_future 6 6 -SyntaxError test_future3 3 -SyntaxError test_future4 3 -SyntaxError test_future5 4 -SyntaxError test_future6 3 -SyntaxError test_future7 3 +SyntaxError badsyntax_future3 3 +SyntaxError badsyntax_future4 3 +SyntaxError badsyntax_future5 4 +SyntaxError badsyntax_future6 3 +SyntaxError badsyntax_future7 3 diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index f05f7645c48..ffa67f1b41f 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -199,11 +199,6 @@ def main(tests=None, testdir=None, verbose=0, quiet=0, generate=0, 'test_b2', 'test_future1', 'test_future2', - 'test_future3', - 'test_future4', - 'test_future5', - 'test_future6', - 'test_future7', ] def findtests(testdir=None, stdtests=STDTESTS, nottests=NOTTESTS): diff --git a/Lib/test/test_future.py b/Lib/test/test_future.py index 1ffda5e36f8..ba0763b7c71 100644 --- a/Lib/test/test_future.py +++ b/Lib/test/test_future.py @@ -19,26 +19,26 @@ def check_error_location(msg): # The remaining tests should fail try: - import test_future3 + import badsyntax_future3 except SyntaxError, msg: check_error_location(str(msg)) try: - import test_future4 + import badsyntax_future4 except SyntaxError, msg: check_error_location(str(msg)) try: - import test_future5 + import badsyntax_future5 except SyntaxError, msg: check_error_location(str(msg)) try: - import test_future6 + import badsyntax_future6 except SyntaxError, msg: check_error_location(str(msg)) try: - import test_future7 + import badsyntax_future7 except SyntaxError, msg: check_error_location(str(msg)) diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py index 759cc98c177..9f818e16078 100644 --- a/Lib/test/test_traceback.py +++ b/Lib/test/test_traceback.py @@ -22,7 +22,7 @@ def syntax_error_with_caret(self): def syntax_error_without_caret(self): # XXX why doesn't compile raise the same traceback? - import nocaret + import badsyntax_nocaret def test_caret(self): err = self.get_exception_format(self.syntax_error_with_caret,