[Checkins] SVN: zc.testbrowser/trunk/src/zc/testbrowser/tests.py Support the tests which do not start a Browser

[Justas Sadzevičius]

Log message for revision 80110:
  Support the tests which do not start a Browser
  

Changed:
  U   zc.testbrowser/trunk/src/zc/testbrowser/tests.py

-=-
Modified: zc.testbrowser/trunk/src/zc/testbrowser/tests.py
===================================================================
--- zc.testbrowser/trunk/src/zc/testbrowser/tests.py	2007-09-26 15:03:09 UTC (rev 80109)
+++ zc.testbrowser/trunk/src/zc/testbrowser/tests.py	2007-09-26 15:26:45 UTC (rev 80110)
@@ -425,14 +425,14 @@
     ])
 
 def serve_requests(server):
-    global server_stopped
     global server_stop
-    server_stop = False
     while not server_stop:
         server.handle_request()
-    server.socket.close()
+    server.server_close()
 
 def setUpServer(test):
+    global server_stop
+    server_stop = False
     port = random.randint(20000,30000)
     test.globs['TEST_PORT'] = port
     server = BaseHTTPServer.HTTPServer(('localhost', port), TestHandler)
@@ -445,7 +445,10 @@
     global server_stop
     server_stop = True
     # make a request, so the last call to `handle_one_request` will return
-    urllib.urlretrieve('http://localhost:%d/' % test.globs['TEST_PORT'])
+    try:
+        urllib.urlretrieve('http://localhost:%d/' % test.globs['TEST_PORT'])
+    except IOError:
+        pass # it's ok, server is already dead
     test.globs['web_server_thread'].join()
 
 def setUpReal(test):