Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 73841 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73841 | ezio.melotti | 2009-07-04 17:58:27 +0300 (Sat, 04 Jul 2009) | 1 line

  if zlib -> skipUnless(zlib) and minor cleanups
........
This commit is contained in:
Ezio Melotti 2009-07-08 22:24:06 +00:00
parent 9b10203537
commit 74c96ec399
1 changed files with 54 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Lib/test/test_zipfile.py
View File

@ -3,12 +3,20 @@ try:
import zlib
except ImportError:
zlib = None
import zipfile, os, unittest, sys, shutil, struct, io
import io
import os
import shutil
import struct
import zipfile
import unittest
from tempfile import TemporaryFile
from random import randint, random
from unittest import skipUnless
import test.support as support
from test import support
from test.support import TESTFN, run_unittest, findfile
TESTFN2 = TESTFN + "2"
@ -210,31 +218,38 @@ class TestsWithSourceFile(unittest.TestCase):
for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
self.zipIterlinesTest(f, zipfile.ZIP_STORED)
if zlib:
@skipUnless(zlib, "requires zlib")
def testDeflated(self):
for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
self.zipTest(f, zipfile.ZIP_DEFLATED)
@skipUnless(zlib, "requires zlib")
def testOpenDeflated(self):
for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
self.zipOpenTest(f, zipfile.ZIP_DEFLATED)
@skipUnless(zlib, "requires zlib")
def testRandomOpenDeflated(self):
for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
self.zipRandomOpenTest(f, zipfile.ZIP_DEFLATED)
@skipUnless(zlib, "requires zlib")
def testReadlineDeflated(self):
for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
self.zipReadlineTest(f, zipfile.ZIP_DEFLATED)
@skipUnless(zlib, "requires zlib")
def testReadlinesDeflated(self):
for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
self.zipReadlinesTest(f, zipfile.ZIP_DEFLATED)
@skipUnless(zlib, "requires zlib")
def testIterlinesDeflated(self):
for f in (TESTFN2, TemporaryFile(), io.BytesIO()):
self.zipIterlinesTest(f, zipfile.ZIP_DEFLATED)
@skipUnless(zlib, "requires zlib")
def testLowCompression(self):
# Checks for cases where compressed data is larger than original
# Create the ZIP archive
@ -248,6 +263,7 @@ class TestsWithSourceFile(unittest.TestCase):
self.assertEqual(openobj.read(1), b'1')
self.assertEqual(openobj.read(1), b'2')
def testAbsoluteArcnames(self):
zipfp = zipfile.ZipFile(TESTFN2, "w", zipfile.ZIP_STORED)
zipfp.write(TESTFN, "/absolute")
@ -388,8 +404,8 @@ class TestsWithSourceFile(unittest.TestCase):
orig_zip.close()
def tearDown(self):
os.remove(TESTFN)
os.remove(TESTFN2)
support.unlink(TESTFN)
support.unlink(TESTFN2)
class TestZip64InSmallFiles(unittest.TestCase):
# These tests test the ZIP64 functionality without using large files,
@ -506,8 +522,8 @@ class TestZip64InSmallFiles(unittest.TestCase):
def tearDown(self):
zipfile.ZIP64_LIMIT = self._limit
os.remove(TESTFN)
os.remove(TESTFN2)
support.unlink(TESTFN)
support.unlink(TESTFN2)
class PyZipFileTests(unittest.TestCase):
def testWritePyfile(self):
@ -1007,7 +1023,7 @@ class TestsWithMultipleOpens(unittest.TestCase):
zipf.close()
def tearDown(self):
os.remove(TESTFN2)
support.unlink(TESTFN2)
class TestWithDirectory(unittest.TestCase):
def setUp(self):
@ -1034,7 +1050,7 @@ class TestWithDirectory(unittest.TestCase):
def tearDown(self):
shutil.rmtree(TESTFN2)
if os.path.exists(TESTFN):
os.remove(TESTFN)
support.unlink(TESTFN)
class UniversalNewlineTests(unittest.TestCase):