From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 26 Jan 2011 23:31:20 +0000 (+0000)
Subject: Merged revisions 88204 via svnmerge from
X-Git-Tag: v3.2.1b1~347^2~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c3f01791b9aaaab98bcb14ad81979572ae1abfe;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 88204 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88204 | antoine.pitrou | 2011-01-27 00:29:28 +0100 (jeu., 27 janv. 2011) | 4 lines

  Issue #11018: fix a test to not be a no-op in test_bz2.
  Found by Nadeem Vawda, reviewed by Brett.
........
---

diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py
index bfcb02a5358b..fbf8fff47c10 100644
--- a/Lib/test/test_bz2.py
+++ b/Lib/test/test_bz2.py
@@ -86,7 +86,7 @@ class BZ2FileTest(BaseTest):
             if not str:
                 break
             text += str
-        self.assertEqual(text, text)
+        self.assertEqual(text, self.TEXT)
         bz2f.close()
 
     def testRead100(self):