[Checkins] SVN: gocept.selenium/trunk/src/gocept/selenium/wsgi/__init__.py don't hang indefinitely if the http server cannot be shut down, complain after a time-out instead

Thomas Lotze tl at gocept.com
Tue Jan 10 23:32:13 UTC 2012


Log message for revision 124024:
  don't hang indefinitely if the http server cannot be shut down, complain after a time-out instead

Changed:
  U   gocept.selenium/trunk/src/gocept/selenium/wsgi/__init__.py

-=-
Modified: gocept.selenium/trunk/src/gocept/selenium/wsgi/__init__.py
===================================================================
--- gocept.selenium/trunk/src/gocept/selenium/wsgi/__init__.py	2012-01-10 23:31:33 UTC (rev 124023)
+++ gocept.selenium/trunk/src/gocept/selenium/wsgi/__init__.py	2012-01-10 23:32:13 UTC (rev 124024)
@@ -1,6 +1,6 @@
 #############################################################################
 #
-# Copyright (c) 2010 Zope Foundation and Contributors.
+# Copyright (c) 2010-2012 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
@@ -54,7 +54,9 @@
 
     def tearDown(self):
         self.http.shutdown()
-        self.thread.join()
+        self.thread.join(5)
+        if not self.thread.isAlive():
+            raise RuntimeError('WSGI server could not be shut down')
         # Make the server really go away and give up the socket:
         self.http = None
         super(Layer, self).tearDown()



More information about the checkins mailing list