Group support features in vaurien.tests.support

Lower a bit the time.sleep() times.

vaurien/tests/support.py

@@ -1,4 +1,5 @@
 import sys
+import subprocess
 
 from vaurien.webserver import create_app
 
@@ -36,5 +37,12 @@ def start_vaurien_httpserver(port):
     server.serve_forever()
 
 
+def start_simplehttp_server(port=8888):
+    cmd = [sys.executable, '-m', 'SimpleHTTPServer', str(port)]
+    server = subprocess.Popen(cmd, stdout=subprocess.PIPE,
+                              stderr=subprocess.PIPE)
+    return server
+
+
 if __name__ == '__main__':
     start_vaurien_httpserver(int(sys.argv[1]))

vaurien/tests/test_http_proxy.py

@@ -5,7 +5,7 @@
 
 from vaurien.client import Client
 from vaurien.util import start_proxy, stop_proxy
-from vaurien.tests.util import start_web_server
+from vaurien.tests.support import start_simplehttp_server
 
 
 _PROXY = 'http://localhost:8000'
@@ -25,8 +25,8 @@ class TestHttpProxy(unittest.TestCase):
     def setUp(self):
         self._proxy_pid = start_proxy(options=_OPTIONS, log_level='error',
                                       log_output='/dev/null')
-        self._web = start_web_server()
-        time.sleep(.5)
+        self._web = start_simplehttp_server()
+        time.sleep(.3)
         try:
             if self._web.poll():
                 raise ValueError("Could not start the proxy")

vaurien/tests/test_proxy.py

@@ -5,7 +5,7 @@
 
 from vaurien.client import Client
 from vaurien.util import start_proxy, stop_proxy
-from vaurien.tests.util import start_web_server
+from vaurien.tests.support import start_simplehttp_server
 
 
 _PROXY = 'http://localhost:8000'
@@ -16,8 +16,8 @@ class TestSimpleProxy(unittest.TestCase):
     def setUp(self):
         self._proxy_pid = start_proxy(log_output='/dev/null',
                                       log_level='error')
-        self._web = start_web_server()
-        time.sleep(.5)
+        self._web = start_simplehttp_server()
+        time.sleep(.2)
         try:
             if self._web.poll():
                 raise ValueError("Could not start the proxy")