summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
author?ric Araujo <merwok@netwok.org>2010-07-31 14:57:53 +0200
committer?ric Araujo <merwok@netwok.org>2010-07-31 14:57:53 +0200
commit4b683d28ccd28165ac428b3ccadd0ef29afe21a4 (patch)
tree405ea4fc9f195868018c7faf00a2fcdc53768ce6 /src
parent7176bc0e548ea4f8f4315242f69a244c4f55223a (diff)
downloaddisutils2-4b683d28ccd28165ac428b3ccadd0ef29afe21a4.tar.gz
Make the PyPI mock server always power off.
Previously, an error occuring during tearDown would cause the server to hang. Original fix by Alexis M?taireau.
Diffstat (limited to 'src')
-rw-r--r--src/distutils2/tests/pypi_server.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/distutils2/tests/pypi_server.py b/src/distutils2/tests/pypi_server.py
index 3927262..85cb8e3 100644
--- a/src/distutils2/tests/pypi_server.py
+++ b/src/distutils2/tests/pypi_server.py
@@ -7,8 +7,6 @@ before any use.
import Queue
import threading
-import time
-import urllib2
from BaseHTTPServer import HTTPServer
from SimpleHTTPServer import SimpleHTTPRequestHandler
import os.path
@@ -41,8 +39,8 @@ class PyPIServerTestCase(unittest.TestCase):
self.pypi.start()
def tearDown(self):
- super(PyPIServerTestCase, self).tearDown()
self.pypi.stop()
+ super(PyPIServerTestCase, self).tearDown()
class PyPIServer(threading.Thread):
"""PyPI Mocked server.