Ensure that OAuthServerMock is running before proceeding test

integration/conftest.py

@@ -59,12 +59,10 @@ def oaas(request):
     extra_conf = marker.kwargs if marker else {}
     config = merge_dicts(proxy_conf, oaas_state, extra_conf)
 
-    process = OAuthServerMock(config=config, port=oaas_port, server='cherrypy')
+    process = BottleServer(OAuthServerMock(config), port=oaas_port)
     process.start()
     request.addfinalizer(process.terminate)
 
-    sleep(0.1)
-
 
 @fixture(scope='module')
 def http():

integration/support/oaas_mock.py

@@ -1,16 +1,26 @@
+from . import free_tcp_port
+
 from base64 import b64decode
-from bottle import Bottle, ConfigDict, HTTPError, LocalRequest, redirect
 import json
 from multiprocessing import Process
 
-__all__ = ['OAuthServerMock']
+from bottle import Bottle, ConfigDict, HTTPError, LocalRequest, abort, redirect
+import requests
+from requests import ConnectionError
+from retry import retry
+
+__all__ = ['OAuthServerMock', 'BottleServer']
 
 
-def OAuthServerMock(config, **run_opts):
+def OAuthServerMock(config):
     conf = ConfigDict().load_dict(config)
     app = Bottle()
     request = LocalRequest()
 
+    @app.get('/')
+    def get_root():
+        abort(200, 'OK')
+
     @app.get('/authorize')
     def get_authorize():
         query = request.query
@@ -91,10 +101,30 @@ def get_userinfo():
     def handle_error(error):
         return error.body
 
-    def _run():
-        app.run(**run_opts)
+    return app
+
+
+class BottleServer(Process):
+
+    def __init__(self, bottle_app, port=free_tcp_port(), server='cherrypy',
+                 check_url=None, bottle_opts={}):
+        opts = {'port': port, 'server': server, **bottle_opts}
+
+        super().__init__(target=bottle_app.run, kwargs=opts, daemon=True)
+        self._check_url = check_url or "http://%s:%d" % (opts.get('host', 'localhost'), port)
+
+    def start(self):
+        super().start()
+
+        try:  # sanity check
+            self._request_check_url()
+        except ConnectionError as e:
+            self.terminate()
+            raise e
 
-    return Process(target=_run, daemon=True)
+    @retry(ConnectionError, tries=20, delay=0.1)
+    def _request_check_url(self):
+        return requests.get(self._check_url)
 
 
 class OAASError(HTTPError):