summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_bz2.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2010-04-27 23:55:59 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2010-04-27 23:55:59 (GMT)
commit6a10281d3359de890519c23d0318742018c843a3 (patch)
tree71fdda13733f42f287602b72b60260cdc9afa6ba /Lib/test/test_bz2.py
parentc73a05f775013980a2a0de1c2a65b8542ee0bfa6 (diff)
downloadcpython-6a10281d3359de890519c23d0318742018c843a3.zip
cpython-6a10281d3359de890519c23d0318742018c843a3.tar.gz
cpython-6a10281d3359de890519c23d0318742018c843a3.tar.bz2
Issue #7449, last part (11): fix many tests if thread support is disabled
* Use try/except ImportError or test_support.import_module() to import thread and threading modules * Add @unittest.skipUnless(threading, ...) to testcases using threads
Diffstat (limited to 'Lib/test/test_bz2.py')
-rw-r--r--Lib/test/test_bz2.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py
index 0541535..555cdeb 100644
--- a/Lib/test/test_bz2.py
+++ b/Lib/test/test_bz2.py
@@ -7,7 +7,11 @@ from cStringIO import StringIO
import os
import subprocess
import sys
-import threading
+
+try:
+ import threading
+except ImportError:
+ threading = None
bz2 = import_module('bz2')
from bz2 import BZ2File, BZ2Compressor, BZ2Decompressor
@@ -307,6 +311,7 @@ class BZ2FileTest(BaseTest):
else:
self.fail("1 // 0 didn't raise an exception")
+ @unittest.skipUnless(threading, 'Threading required for this test.')
def testThreading(self):
# Using a BZ2File from several threads doesn't deadlock (issue #7205).
data = "1" * 2**20