Running functional tests behind tornado proxy: breaking the build :)

3 files changed, 120 insertions, 105 deletions

diff --git a/service/test/support/dispatcher/__init__.py b/service/test/support/dispatcher/__init__.py
index f1045042..3407b019 100644
--- a/service/test/support/dispatcher/__init__.py
+++ b/service/test/support/dispatcher/__init__.py
@@ -13,110 +13,5 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
-import traceback
-import sys
 
-from tornado.httpclient import AsyncHTTPClient
-from tornado.httpserver import HTTPServer
-import tornado.ioloop
-import tornado.web
-import tornado.escape
-from tornado import gen
 
-
-class MainHandler(tornado.web.RequestHandler):
-
-    @tornado.web.asynchronous
-    @gen.engine
-    def get(self):
-        self.forward('3333', '127.0.0.1')
-
-    @tornado.web.asynchronous
-    @gen.engine
-    def post(self):
-        self.get()
-
-    @tornado.web.asynchronous
-    @gen.engine
-    def put(self):
-        self.get()
-
-    @tornado.web.asynchronous
-    @gen.engine
-    def delete(self):
-        self.get()
-
-    def handle_response(self, response):
-        if response.error and not isinstance(response.error, tornado.httpclient.HTTPError):
-            print(self.request.uri)
-            print(response.error)
-            self.set_status(500)
-            self.write("Internal server error:\n" + str(response.error))
-            self.finish()
-        else:
-            self.set_status(response.code)
-            for header in ("Date", "Cache-Control", "Server", "Content-Type", "Location"):
-                v = response.headers.get(header)
-                if v:
-                    self.set_header(header, v)
-            if response.body:
-                self.write(response.body)
-            self.finish()
-
-    def forward(self, port=None, host=None):
-        url = "%s://%s:%s%s" % (
-            'http', host or "127.0.0.1", port or 80, self.request.uri)
-        try:
-            tornado.httpclient.AsyncHTTPClient().fetch(
-                tornado.httpclient.HTTPRequest(
-                    url=url,
-                    method=self.request.method,
-                    body=None if not self.request.body else self.request.body,
-                    headers=self.request.headers,
-                    follow_redirects=False,
-                    request_timeout=10),
-                self.handle_response)
-        except tornado.httpclient.HTTPError, x:
-            if hasattr(x, 'response') and x.response:
-                self.handle_response(x.response)
-        except Exception, e:
-            self.set_status(500)
-            self.write("Internal server error:\n" + ''.join(traceback.format_exception(*sys.exc_info())))
-            self.finish()
-
-
-def _create_app():
-    app = tornado.web.Application(
-        [
-            (r"/.*", MainHandler)
-        ],
-        xsrf_cookies=False,
-        debug=True)
-    return app
-
-
-class Proxy:
-
-    def __init__(self):
-        pass
-
-    def serve_forever(self):
-        app = _create_app()
-        self._server = HTTPServer(app)
-        self._server.listen(port='8888', address='127.0.0.1')
-        self._ioloop = tornado.ioloop.IOLoop.instance()
-        self._ioloop.start()  # this is a blocking call, server has stopped on next line
-        self._ioloop = None
-
-    def shutdown(self):
-        if self._ioloop:
-            self._server.stop()
-            self._ioloop.stop()
-
-
-proxy = Proxy()
-try:
-    proxy.serve_forever()
-except Exception:
-    proxy.shutdown()
diff --git a/service/test/support/dispatcher/proxy.py b/service/test/support/dispatcher/proxy.py
new file mode 100644
index 00000000..31645848
--- /dev/null
+++ b/service/test/support/dispatcher/proxy.py
@@ -0,0 +1,112 @@
+from __future__ import print_function
+import multiprocessing
+import traceback
+import sys
+import time
+
+from tornado.httpclient import AsyncHTTPClient
+from tornado.httpserver import HTTPServer
+import tornado.ioloop
+import tornado.web
+import tornado.escape
+from tornado import gen
+
+
+class MainHandler(tornado.web.RequestHandler):
+    __slots__ = '_app_port'
+
+    def initialize(self, app_port):
+        self._app_port = app_port
+
+    @tornado.web.asynchronous
+    @gen.engine
+    def get(self):
+        self.forward(self._app_port, '127.0.0.1')
+
+    @tornado.web.asynchronous
+    @gen.engine
+    def post(self):
+        self.get()
+
+    @tornado.web.asynchronous
+    @gen.engine
+    def put(self):
+        self.get()
+
+    @tornado.web.asynchronous
+    @gen.engine
+    def delete(self):
+        self.get()
+
+    def handle_response(self, response):
+        if response.error and not isinstance(response.error, tornado.httpclient.HTTPError):
+            print(self.request.uri)
+            print(response.error)
+            self.set_status(500)
+            self.write("Internal server error:\n" + str(response.error))
+            self.finish()
+        else:
+            self.set_status(response.code)
+            for header in ("Date", "Cache-Control", "Server", "Content-Type", "Location"):
+                v = response.headers.get(header)
+                if v:
+                    self.set_header(header, v)
+            if response.body:
+                self.write(response.body)
+            self.finish()
+
+    def forward(self, port=None, host=None):
+        url = "%s://%s:%s%s" % (
+            'http', host or "127.0.0.1", port or 80, self.request.uri)
+        try:
+            tornado.httpclient.AsyncHTTPClient().fetch(
+                tornado.httpclient.HTTPRequest(
+                    url=url,
+                    method=self.request.method,
+                    body=None if not self.request.body else self.request.body,
+                    headers=self.request.headers,
+                    follow_redirects=False,
+                    request_timeout=10),
+                self.handle_response)
+        except tornado.httpclient.HTTPError, x:
+            if hasattr(x, 'response') and x.response:
+                self.handle_response(x.response)
+        except Exception, e:
+            self.set_status(500)
+            self.write("Internal server error:\n" + ''.join(traceback.format_exception(*sys.exc_info())))
+            self.finish()
+
+
+class Proxy:
+
+    def __init__(self, proxy_port, app_port):
+        self._proxy_port = proxy_port
+        self._app_port = app_port
+
+    def _create_app(self):
+        app = tornado.web.Application(
+            [
+                (r"/.*", MainHandler, dict(app_port=self._app_port))
+            ],
+            xsrf_cookies=False,
+            debug=True)
+        return app
+
+    def serve_forever(self):
+        app = self._create_app()
+        self._server = HTTPServer(app)
+        self._server.listen(port=self._proxy_port, address='127.0.0.1')
+        self._ioloop = tornado.ioloop.IOLoop.instance()
+        self._ioloop.start()  # this is a blocking call, server has stopped on next line
+        self._ioloop = None
+
+    def shutdown(self):
+        if self._ioloop:
+            self._server.stop()
+            self._ioloop.stop()
+
+    def run_on_a_thread(self):
+        process = multiprocessing.Process(target=self.serve_forever)
+        process.start()
+        time.sleep(1)  # just let it start
+        return lambda: process.terminate()
diff --git a/service/test/support/dispatcher/run.py b/service/test/support/dispatcher/run.py
new file mode 100644
index 00000000..98627ba7
--- /dev/null
+++ b/service/test/support/dispatcher/run.py
@@ -0,0 +1,8 @@
+from test.support.dispatcher.proxy import Proxy
+
+if __name__ in ('main', '__main__'):
+    proxy = Proxy(proxy_port='8888', app_port='3333')
+    try:
+        proxy.serve_forever()
+    except Exception, e:
+        proxy.shutdown()
\ No newline at end of file