summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--service/test/support/dispatcher/__init__.py15
-rw-r--r--service/test/support/dispatcher/proxy.py128
-rw-r--r--service/test/support/dispatcher/run.py24
-rw-r--r--service/test_requirements.txt1
4 files changed, 0 insertions, 168 deletions
diff --git a/service/test/support/dispatcher/__init__.py b/service/test/support/dispatcher/__init__.py
deleted file mode 100644
index 707e2265..00000000
--- a/service/test/support/dispatcher/__init__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright (c) 2014 ThoughtWorks Deutschland GmbH
-#
-# Pixelated is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Pixelated is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
diff --git a/service/test/support/dispatcher/proxy.py b/service/test/support/dispatcher/proxy.py
deleted file mode 100644
index ca3bbc41..00000000
--- a/service/test/support/dispatcher/proxy.py
+++ /dev/null
@@ -1,128 +0,0 @@
-#
-# Copyright (c) 2014 ThoughtWorks Deutschland GmbH
-#
-# Pixelated is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Pixelated is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# 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 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:
- 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
deleted file mode 100644
index d436da05..00000000
--- a/service/test/support/dispatcher/run.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (c) 2014 ThoughtWorks Deutschland GmbH
-#
-# Pixelated is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Pixelated is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# 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 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()
diff --git a/service/test_requirements.txt b/service/test_requirements.txt
index 80e4565f..b6b704c7 100644
--- a/service/test_requirements.txt
+++ b/service/test_requirements.txt
@@ -4,7 +4,6 @@ mock==2.0.0
httmock==1.2.2
mockito==0.5.2
funkload==1.16.1
-tornado==4.0.2
pep8==1.5.7
tempdir==0.6
coverage