mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 15:43:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 73379,73388,73507,73722 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

........
  r73379 | benjamin.peterson | 2009-06-11 18:06:21 -0500 (Thu, 11 Jun 2009) | 1 line

  use a real conditional expresion
........
  r73388 | benjamin.peterson | 2009-06-12 09:44:29 -0500 (Fri, 12 Jun 2009) | 1 line

  fix typo in last fix
........
  r73507 | benjamin.peterson | 2009-06-22 13:32:04 -0500 (Mon, 22 Jun 2009) | 1 line

  remove svn:executable property
........
  r73722 | benjamin.peterson | 2009-06-30 19:44:30 -0500 (Tue, 30 Jun 2009) | 1 line

  replace fail* with assert*
........
This commit is contained in:
Benjamin Peterson 2009-07-01 00:49:09 +00:00
parent 4d3f18f2ed
commit 7e2801d1b5
5 changed files with 183 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/lib2to3/tests/test_fixers.py
View file

@ -32,20 +32,20 @@ class FixerTestCase(support.TestCase):
before = support.reformat(before)
after = support.reformat(after)
tree = self.refactor.refactor_string(before, self.filename)
self.failUnlessEqual(after, unicode(tree))
self.assertEqual(after, unicode(tree))
return tree
def check(self, before, after, ignore_warnings=False):
tree = self._check(before, after)
self.failUnless(tree.was_changed)
self.assertTrue(tree.was_changed)
if not ignore_warnings:
self.failUnlessEqual(self.fixer_log, [])
self.assertEqual(self.fixer_log, [])
def warns(self, before, after, message, unchanged=False):
tree = self._check(before, after)
self.failUnless(message in "".join(self.fixer_log))
self.assertTrue(message in "".join(self.fixer_log))
if not unchanged:
self.failUnless(tree.was_changed)
self.assertTrue(tree.was_changed)
def warns_unchanged(self, before, message):
self.warns(before, before, message, unchanged=True)
@ -53,7 +53,7 @@ class FixerTestCase(support.TestCase):
def unchanged(self, before, ignore_warnings=False):
self._check(before, before)
if not ignore_warnings:
self.failUnlessEqual(self.fixer_log, [])
self.assertEqual(self.fixer_log, [])
def assert_runs_after(self, *names):
fixes = [self.fixer]