From: Stefan Krah <skrah@bytereef.org>
Date: Wed, 22 Jan 2014 12:18:09 +0000 (+0100)
Subject: Fix test failures --without-threads.
X-Git-Tag: v2.7.8~97
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70fdd79c928eb07dfb20943e822fbecb5911b814;p=thirdparty%2FPython%2Fcpython.git

Fix test failures --without-threads.
---

diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py
index 31d41e621cd6..a7f2267f2820 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