summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-05-02 14:14:16 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-05-02 14:14:16 (GMT)
commit59bec36b1c19960e03c94d1f7617459d69e8b28c (patch)
tree750a8c54dbfc9ad8dbde73db6ff68f180d2f5d17 /Lib/test
parent714b8dc501067d9ceccc8e07517b4d8a4b4465df (diff)
parentcafa2efedbaa4e0d4023e1cde48fc8f58d1a44cb (diff)
downloadcpython-59bec36b1c19960e03c94d1f7617459d69e8b28c.zip
cpython-59bec36b1c19960e03c94d1f7617459d69e8b28c.tar.gz
cpython-59bec36b1c19960e03c94d1f7617459d69e8b28c.tar.bz2
(Merge 3.2) logging: don't define QueueListener if Python has no thread support
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_logging.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 7a723e0..bf0ad77 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -2634,6 +2634,8 @@ class QueueHandlerTest(BaseTest):
self.assertEqual(data.name, self.que_logger.name)
self.assertEqual((data.msg, data.args), (msg, None))
+ @unittest.skipUnless(hasattr(logging.handlers, 'QueueListener'),
+ 'logging.handlers.QueueListener required for this test')
def test_queue_listener(self):
handler = TestHandler(Matcher())
listener = logging.handlers.QueueListener(self.queue, handler)