From 9de06bd60595de2719b313b697b8bf7f6715db9a Mon Sep 17 00:00:00 2001 From: Tim Peters Date: Sat, 9 Nov 2002 06:45:31 +0000 Subject: [PATCH] More tests run on Windows now. Something is still wrong here, but no idea what. Added liberal XXX explanations for the next guy. --- Lib/test/test_bz2.py | 59 +++++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py index db044548632..973ae42e4be 100644 --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -11,30 +11,43 @@ import sys import bz2 from bz2 import BZ2File, BZ2Compressor, BZ2Decompressor +has_cmdline_bunzip2 = sys.platform not in ("win32",) + class BaseTest(unittest.TestCase): "Base for other testcases." TEXT = 'root:x:0:0:root:/root:/bin/bash\nbin:x:1:1:bin:/bin:\ndaemon:x:2:2:daemon:/sbin:\nadm:x:3:4:adm:/var/adm:\nlp:x:4:7:lp:/var/spool/lpd:\nsync:x:5:0:sync:/sbin:/bin/sync\nshutdown:x:6:0:shutdown:/sbin:/sbin/shutdown\nhalt:x:7:0:halt:/sbin:/sbin/halt\nmail:x:8:12:mail:/var/spool/mail:\nnews:x:9:13:news:/var/spool/news:\nuucp:x:10:14:uucp:/var/spool/uucp:\noperator:x:11:0:operator:/root:\ngames:x:12:100:games:/usr/games:\ngopher:x:13:30:gopher:/usr/lib/gopher-data:\nftp:x:14:50:FTP User:/var/ftp:/bin/bash\nnobody:x:65534:65534:Nobody:/home:\npostfix:x:100:101:postfix:/var/spool/postfix:\nniemeyer:x:500:500::/home/niemeyer:/bin/bash\npostgres:x:101:102:PostgreSQL Server:/var/lib/pgsql:/bin/bash\nmysql:x:102:103:MySQL server:/var/lib/mysql:/bin/bash\nwww:x:103:104::/var/www:/bin/false\n' 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\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\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",) + if has_cmdline_bunzip2: + def decompress(self, data): + 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 = bz2.decompress(data) + return ret - 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: - # 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 + else: + # popen2.Popen3 doesn't exist on Windows, and even if it did, bunzip2 + # isn't available to run. + + # XXX This alternative doesn't work in all tests. It raises + # XXX ValueError: couldn't find end of stream + # XXX in + # XXX testWrite + # XXX testWriteChunks10 + # XXX testWriteLines + # XXX from BZ2FileTest . + # XXX I don't know why. + + def decompress(self, data): + return bz2.decompress(data) + + # XXX See XXX comment above. + skip_mystery_test = not has_cmdline_bunzip2 class BZ2FileTest(BaseTest): "Test MCRYPT type miscelaneous methods." @@ -132,7 +145,7 @@ class BZ2FileTest(BaseTest): bz2f.close() def testWrite(self): - if self.skip_decompress_tests: + if self.skip_mystery_test: return # "Test BZ2File.write()" bz2f = BZ2File(self.filename, "w") @@ -144,7 +157,7 @@ class BZ2FileTest(BaseTest): def testWriteChunks10(self): # "Test BZ2File.write() with chunks of 10 bytes" - if self.skip_decompress_tests: + if self.skip_mystery_test: return bz2f = BZ2File(self.filename, "w") n = 0 @@ -161,7 +174,7 @@ class BZ2FileTest(BaseTest): def testWriteLines(self): # "Test BZ2File.writelines()" - if self.skip_decompress_tests: + if self.skip_mystery_test: return bz2f = BZ2File(self.filename, "w") sio = StringIO(self.TEXT) @@ -227,8 +240,6 @@ class BZ2FileTest(BaseTest): 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() @@ -236,8 +247,6 @@ 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 = '' @@ -290,8 +299,6 @@ class FuncTest(BaseTest): def testCompress(self): # "Test compress() function" - if self.skip_decompress_tests: - return data = bz2.compress(self.TEXT) self.assertEqual(self.decompress(data), self.TEXT)