diff options
| author | Toshio Kuratomi <toshio@fedoraproject.org> | 2010-06-10 23:45:50 -0400 |
|---|---|---|
| committer | Toshio Kuratomi <toshio@fedoraproject.org> | 2010-06-10 23:45:50 -0400 |
| commit | e7a6afa8537161befb62ca5cd638f2bbc35a5842 (patch) | |
| tree | 5aa498963aff6a3ad67123bf30fcaad170f6e408 /setuptools/tests/server.py | |
| parent | 7210ba8400fb48800ed4df24e25c2500423b70fa (diff) | |
| download | external_python_setuptools-e7a6afa8537161befb62ca5cd638f2bbc35a5842.tar.gz external_python_setuptools-e7a6afa8537161befb62ca5cd638f2bbc35a5842.tar.bz2 external_python_setuptools-e7a6afa8537161befb62ca5cd638f2bbc35a5842.zip | |
Fix race condition with the http server used in unittests
--HG--
branch : distribute
extra : rebase_source : e7093c7a63fe91ede0bdd52735e33ac780e95ec6
Diffstat (limited to 'setuptools/tests/server.py')
| -rw-r--r-- | setuptools/tests/server.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py index 5e5e3e61..f116a3fd 100644 --- a/setuptools/tests/server.py +++ b/setuptools/tests/server.py @@ -32,7 +32,10 @@ class IndexServer(HTTPServer): def stop(self): """self.shutdown is not supported on python < 2.6""" self._run = False - urllib2.urlopen('http://127.0.0.1:%s/' % self.server_port) + try: + urllib2.urlopen('http://127.0.0.1:%s/' % self.server_port, None, 5) + except urllib2.URLError: + pass self.thread.join() def base_url(self): |