diff options
author | John Vandenberg <jayvdb@gmail.com> | 2015-11-14 23:11:37 +1100 |
---|---|---|
committer | John Vandenberg <jayvdb@gmail.com> | 2015-11-16 06:35:08 +1100 |
commit | f048360b775a9cfffb1c42a2e5cf6f25ffe895f9 (patch) | |
tree | bccea23ba280b677d6d243290bf5c488228e0494 | |
parent | dcf31a1ae62cd6ba1514acf61786db846b8d9d88 (diff) | |
download | pyflakes-f048360b775a9cfffb1c42a2e5cf6f25ffe895f9.tar.gz |
Merge test_doubleNestingReportsClosestName
The test_doubleNestingReportsClosestName in test_doctest only
differs by the expected line number of the error, which can
be dynamically determined using TestCase.withDoctest.
-rw-r--r-- | pyflakes/test/test_doctests.py | 21 | ||||
-rw-r--r-- | pyflakes/test/test_undefined_names.py | 6 |
2 files changed, 7 insertions, 20 deletions
diff --git a/pyflakes/test/test_doctests.py b/pyflakes/test/test_doctests.py index 30576bd..f15acb8 100644 --- a/pyflakes/test/test_doctests.py +++ b/pyflakes/test/test_doctests.py @@ -376,22 +376,5 @@ class TestImports(_DoctestMixin, TestImports): class TestUndefinedNames(_DoctestMixin, TestUndefinedNames): - - def test_doubleNestingReportsClosestName(self): - """ - Lines in doctest are a bit different so we can't use the test - from TestUndefinedNames - """ - exc = self.flakes(''' - def a(): - x = 1 - def b(): - x = 2 # line 7 in the file - def c(): - x - x = 3 - return x - return x - return x - ''', m.UndefinedLocal).messages[0] - self.assertEqual(exc.message_args, ('x', 7)) + """Run TestUndefinedNames with each test wrapped in a doctest.""" + pass diff --git a/pyflakes/test/test_undefined_names.py b/pyflakes/test/test_undefined_names.py index bb50f2c..1a3c3a5 100644 --- a/pyflakes/test/test_undefined_names.py +++ b/pyflakes/test/test_undefined_names.py @@ -309,7 +309,11 @@ class Test(TestCase): return x return x ''', m.UndefinedLocal).messages[0] - self.assertEqual(exc.message_args, ('x', 5)) + + # _DoctestMixin.flakes adds two lines preceding the code above. + expected_line_num = 7 if self.withDoctest else 5 + + self.assertEqual(exc.message_args, ('x', expected_line_num)) def test_laterRedefinedGlobalFromNestedScope3(self): """ |