From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 26 Jan 2011 23:31:25 +0000 (+0000)
Subject: Merged revisions 88204 via svnmerge from
X-Git-Tag: v2.7.2rc1~347
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=812a3a116206e1b567379433605af42c664753a8;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 4cb6bf1eed0e..d9ccf0abbec2 100644
--- a/Lib/test/test_bz2.py
+++ b/Lib/test/test_bz2.py
@@ -85,7 +85,7 @@ class BZ2FileTest(BaseTest):
                 if not str:
                     break
                 text += str
-            self.assertEqual(text, text)
+            self.assertEqual(text, self.TEXT)
 
     def testRead100(self):
         # "Test BZ2File.read(100)"