summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Krah <skrah@bytereef.org>2014-01-22 12:18:09 (GMT)
committerStefan Krah <skrah@bytereef.org>2014-01-22 12:18:09 (GMT)
commit70fdd79c928eb07dfb20943e822fbecb5911b814 (patch)
tree176cf429b837695dc622881949403dcf8293dc08
parentb190b33f6445df81aeb0b35021a5a1651e930dec (diff)
downloadcpython-70fdd79c928eb07dfb20943e822fbecb5911b814.zip
cpython-70fdd79c928eb07dfb20943e822fbecb5911b814.tar.gz
cpython-70fdd79c928eb07dfb20943e822fbecb5911b814.tar.bz2
Fix test failures --without-threads.
-rw-r--r--Lib/test/test_nntplib.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py
index 31d41e6..a7f2267 100644
--- a/Lib/test/test_nntplib.py
+++ b/Lib/test/test_nntplib.py
@@ -1,7 +1,13 @@
import socket
-import threading
import nntplib
import time
+import unittest
+
+try:
+ import threading
+except ImportError:
+ threading = None
+
from unittest import TestCase
from test import test_support
@@ -41,6 +47,7 @@ class BaseServerTest(TestCase):
self.evt.wait()
+@unittest.skipUnless(threading, 'threading required')
class ServerTests(BaseServerTest):
evil = False
@@ -49,6 +56,7 @@ class ServerTests(BaseServerTest):
nntp.sock.close()
+@unittest.skipUnless(threading, 'threading required')
class EvilServerTests(BaseServerTest):
evil = True