Many changes to get this to pass on Windows, and to make it easier to

figure out what the code was doing.  The fixes were a combination of
closing open files before deletion, opening files in binary mode, and
plain skipping things that can't work on Windows (BaseTest.decompress
uses a process gimmick that doesn't exist on Windows, and, even if it
did, assumes a "bunzip2" executable is on PATH).

1 files changed, 45 insertions, 11 deletions

diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py
index bc9eb3c..db04454 100644
--- a/Lib/test/test_bz2.py
+++ b/Lib/test/test_bz2.py
@@ -1,11 +1,15 @@
 #!/usr/bin/python
+from test import test_support
+
 import unittest
 from cStringIO import StringIO
 import os
 import popen2
 import tempfile
-from bz2 import *
-from test import test_support
+import sys
+
+import bz2
+from bz2 import BZ2File, BZ2Compressor, BZ2Decompressor
 
 class BaseTest(unittest.TestCase):
     "Base for other testcases."
@@ -13,14 +17,23 @@ class BaseTest(unittest.TestCase):
     DATA = 'BZh91AY&SY.\xc8N\x18\x00\x01>_\x80\x00\x10@\x02\xff\xf0\x01\x07n\x00?\xe7\xff\xe00\x01\x99\xaa\x00\xc0\x03F\x86\x8c#&\x83F\x9a\x03\x06\xa6\xd0\xa6\x93M\x0fQ\xa7\xa8\x06\x804hh\x12$\x11\xa4i4\xf14S\xd2<Q\xb5\x0fH\xd3\xd4\xdd\xd5\x87\xbb\xf8\x94\r\x8f\xafI\x12\xe1\xc9\xf8/E\x00pu\x89\x12]\xc9\xbbDL\nQ\x0e\t1\x12\xdf\xa0\xc0\x97\xac2O9\x89\x13\x94\x0e\x1c7\x0ed\x95I\x0c\xaaJ\xa4\x18L\x10\x05#\x9c\xaf\xba\xbc/\x97\x8a#C\xc8\xe1\x8cW\xf9\xe2\xd0\xd6M\xa7\x8bXa<e\x84t\xcbL\xb3\xa7\xd9\xcd\xd1\xcb\x84.\xaf\xb3\xab\xab\xad`n}\xa0lh\tE,\x8eZ\x15\x17VH>\x88\xe5\xcd9gd6\x0b\n\xe9\x9b\xd5\x8a\x99\xf7\x08.K\x8ev\xfb\xf7xw\xbb\xdf\xa1\x92\xf1\xdd|/";\xa2\xba\x9f\xd5\xb1#A\xb6\xf6\xb3o\xc9\xc5y\\\xebO\xe7\x85\x9a\xbc\xb6f8\x952\xd5\xd7"%\x89>V,\xf7\xa6z\xe2\x9f\xa3\xdf\x11\x11"\xd6E)I\xa9\x13^\xca\xf3r\xd0\x03U\x922\xf26\xec\xb6\xed\x8b\xc3U\x13\x9d\xc5\x170\xa4\xfa^\x92\xacDF\x8a\x97\xd6\x19\xfe\xdd\xb8\xbd\x1a\x9a\x19\xa3\x80ankR\x8b\xe5\xd83]\xa9\xc6\x08\x82f\xf6\xb9"6l$\xb8j@\xc0\x8a\xb0l1..\xbak\x83ls\x15\xbc\xf4\xc1\x13\xbe\xf8E\xb8\x9d\r\xa8\x9dk\x84\xd3n\xfa\xacQ\x07\xb1%y\xaav\xb4\x08\xe0z\x1b\x16\xf5\x04\xe9\xcc\xb9\x08z\x1en7.G\xfc]\xc9\x14\xe1B@\xbb!8`'
     DATA_CRLF = 'BZh91AY&SY\xaez\xbbN\x00\x01H\xdf\x80\x00\x12@\x02\xff\xf0\x01\x07n\x00?\xe7\xff\xe0@\x01\xbc\xc6`\x86*\x8d=M\xa9\x9a\x86\xd0L@\x0fI\xa6!\xa1\x13\xc8\x88jdi\x8d@\x03@\x1a\x1a\x0c\x0c\x83 \x00\xc4h2\x19\x01\x82D\x84e\t\xe8\x99\x89\x19\x1ah\x00\r\x1a\x11\xaf\x9b\x0fG\xf5(\x1b\x1f?\t\x12\xcf\xb5\xfc\x95E\x00ps\x89\x12^\xa4\xdd\xa2&\x05(\x87\x04\x98\x89u\xe40%\xb6\x19\'\x8c\xc4\x89\xca\x07\x0e\x1b!\x91UIFU%C\x994!DI\xd2\xfa\xf0\xf1N8W\xde\x13A\xf5\x9cr%?\x9f3;I45A\xd1\x8bT\xb1<l\xba\xcb_\xc00xY\x17r\x17\x88\x08\x08@\xa0\ry@\x10\x04$)`\xf2\xce\x89z\xb0s\xec\x9b.iW\x9d\x81\xb5-+t\x9f\x1a\'\x97dB\xf5x\xb5\xbe.[.\xd7\x0e\x81\xe7\x08\x1cN`\x88\x10\xca\x87\xc3!"\x80\x92R\xa1/\xd1\xc0\xe6mf\xac\xbd\x99\xcca\xb3\x8780>\xa4\xc7\x8d\x1a\\"\xad\xa1\xabyBg\x15\xb9l\x88\x88\x91k"\x94\xa4\xd4\x89\xae*\xa6\x0b\x10\x0c\xd6\xd4m\xe86\xec\xb5j\x8a\x86j\';\xca.\x01I\xf2\xaaJ\xe8\x88\x8cU+t3\xfb\x0c\n\xa33\x13r2\r\x16\xe0\xb3(\xbf\x1d\x83r\xe7M\xf0D\x1365\xd8\x88\xd3\xa4\x92\xcb2\x06\x04\\\xc1\xb0\xea//\xbek&\xd8\xe6+t\xe5\xa1\x13\xada\x16\xder5"w]\xa2i\xb7[\x97R \xe2IT\xcd;Z\x04dk4\xad\x8a\t\xd3\x81z\x10\xf1:^`\xab\x1f\xc5\xdc\x91N\x14$+\x9e\xae\xd3\x80'
 
+    # XXX BaseTest.decompress can't run on Windows -- popen2.Popen3 doesn't
+    # XXX exist there, XXX and even if it did, bunzip2 isn't available to
+    # XXX run.  Tests using this are therefore skipped on Windows.
+    skip_decompress_tests = sys.platform in ("win32",)
+
     def decompress(self, data):
+        assert not self.skip_decompress_tests
         pop = popen2.Popen3("bunzip2", capturestderr=1)
         pop.tochild.write(data)
         pop.tochild.close()
         ret = pop.fromchild.read()
         pop.fromchild.close()
         if pop.wait() != 0:
-            ret = decompress(data)
+            # XXX I don't think this works.  On Windows, trying to call
+            # XXX bz2.decompress in this function always raises
+            # XXD     ValueError: couldn't find end of stream
+            ret = bz2.decompress(data)
         return ret
 
 class BZ2FileTest(BaseTest):
@@ -119,6 +132,8 @@ class BZ2FileTest(BaseTest):
         bz2f.close()
 
     def testWrite(self):
+        if self.skip_decompress_tests:
+            return
         # "Test BZ2File.write()"
         bz2f = BZ2File(self.filename, "w")
         bz2f.write(self.TEXT)
@@ -129,6 +144,8 @@ class BZ2FileTest(BaseTest):
 
     def testWriteChunks10(self):
         # "Test BZ2File.write() with chunks of 10 bytes"
+        if self.skip_decompress_tests:
+            return
         bz2f = BZ2File(self.filename, "w")
         n = 0
         while 1:
@@ -144,6 +161,8 @@ class BZ2FileTest(BaseTest):
 
     def testWriteLines(self):
         # "Test BZ2File.writelines()"
+        if self.skip_decompress_tests:
+            return
         bz2f = BZ2File(self.filename, "w")
         sio = StringIO(self.TEXT)
         bz2f.writelines(sio.readlines())
@@ -158,6 +177,7 @@ class BZ2FileTest(BaseTest):
         bz2f = BZ2File(self.filename)
         bz2f.seek(150)
         self.assertEqual(bz2f.read(), self.TEXT[150:])
+        bz2f.close()
 
     def testSeekBackwards(self):
         # "Test BZ2File.seek(-150, 1)"
@@ -166,6 +186,7 @@ class BZ2FileTest(BaseTest):
         bz2f.read(500)
         bz2f.seek(-150, 1)
         self.assertEqual(bz2f.read(), self.TEXT[500-150:])
+        bz2f.close()
 
     def testSeekBackwardsFromEnd(self):
         # "Test BZ2File.seek(-150, 2)"
@@ -173,6 +194,7 @@ class BZ2FileTest(BaseTest):
         bz2f = BZ2File(self.filename)
         bz2f.seek(-150, 2)
         self.assertEqual(bz2f.read(), self.TEXT[len(self.TEXT)-150:])
+        bz2f.close()
 
     def testSeekPostEnd(self):
         # "Test BZ2File.seek(150000)"
@@ -181,6 +203,7 @@ class BZ2FileTest(BaseTest):
         bz2f.seek(150000)
         self.assertEqual(bz2f.tell(), len(self.TEXT))
         self.assertEqual(bz2f.read(), "")
+        bz2f.close()
 
     def testSeekPostEndTwice(self):
         # "Test BZ2File.seek(150000) twice"
@@ -190,6 +213,7 @@ class BZ2FileTest(BaseTest):
         bz2f.seek(150000)
         self.assertEqual(bz2f.tell(), len(self.TEXT))
         self.assertEqual(bz2f.read(), "")
+        bz2f.close()
 
     def testSeekPreStart(self):
         # "Test BZ2File.seek(-150, 0)"
@@ -198,10 +222,13 @@ class BZ2FileTest(BaseTest):
         bz2f.seek(-150)
         self.assertEqual(bz2f.tell(), 0)
         self.assertEqual(bz2f.read(), self.TEXT)
+        bz2f.close()
 
 class BZ2CompressorTest(BaseTest):
     def testCompress(self):
         # "Test BZ2Compressor.compress()/flush()"
+        if self.skip_decompress_tests:
+            return
         bz2c = BZ2Compressor()
         data = bz2c.compress(self.TEXT)
         data += bz2c.flush()
@@ -209,6 +236,8 @@ class BZ2CompressorTest(BaseTest):
 
     def testCompressChunks10(self):
         # "Test BZ2Compressor.compress()/flush() with chunks of 10 bytes"
+        if self.skip_decompress_tests:
+            return
         bz2c = BZ2Compressor()
         n = 0
         data = ''
@@ -261,28 +290,33 @@ class FuncTest(BaseTest):
 
     def testCompress(self):
         # "Test compress() function"
-        data = compress(self.TEXT)
+        if self.skip_decompress_tests:
+            return
+        data = bz2.compress(self.TEXT)
         self.assertEqual(self.decompress(data), self.TEXT)
 
     def testDecompress(self):
         # "Test decompress() function"
-        text = decompress(self.DATA)
+        text = bz2.decompress(self.DATA)
         self.assertEqual(text, self.TEXT)
 
     def testDecompressEmpty(self):
         # "Test decompress() function with empty string"
-        text = decompress("")
+        text = bz2.decompress("")
         self.assertEqual(text, "")
 
     def testDecompressIncomplete(self):
         # "Test decompress() function with incomplete data"
-        self.assertRaises(ValueError, decompress, self.DATA[:-10])
+        self.assertRaises(ValueError, bz2.decompress, self.DATA[:-10])
 
 def test_main():
-    test_support.run_unittest(BZ2FileTest)
-    test_support.run_unittest(BZ2CompressorTest)
-    test_support.run_unittest(BZ2DecompressorTest)
-    test_support.run_unittest(FuncTest)
+    suite = unittest.TestSuite()
+    for test in (BZ2FileTest,
+                 BZ2CompressorTest,
+                 BZ2DecompressorTest,
+                 FuncTest):
+        suite.addTest(unittest.makeSuite(test))
+    test_support.run_suite(suite)
 
 if __name__ == '__main__':
     test_main()