diff options
| author | drebs <drebs@leap.se> | 2017-01-26 19:18:15 -0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2017-02-09 17:41:53 +0100 |
| commit | 1f1a9847117d23a767e99fe80484baf232375d36 (patch) | |
| tree | 17bb073965c0d9cb5c615644fa31e817d8d81412 | |
| parent | 7432b72471fa3de03d13b9d35f6004d14deae63d (diff) | |
[refactor] allow passing threadpool pool for server sync resource
| -rw-r--r-- | server/src/leap/soledad/server/_resource.py | 2 | ||||
| -rw-r--r-- | testing/tests/server/test__resource.py | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/server/src/leap/soledad/server/_resource.py b/server/src/leap/soledad/server/_resource.py index 1c4edade..046e20d1 100644 --- a/server/src/leap/soledad/server/_resource.py +++ b/server/src/leap/soledad/server/_resource.py @@ -36,10 +36,10 @@ class SoledadResource(Resource): """ def __init__(self, sync_pool=None): - sync_resource = get_sync_resource(sync_pool) conf = get_config() self._blobs_enabled = conf['soledad-server']['blobs'] server_info = ServerInfo(self._blobs_enabled) + sync_resource = get_sync_resource(sync_pool) self.children = { '': server_info, 'sync': sync_resource, diff --git a/testing/tests/server/test__resource.py b/testing/tests/server/test__resource.py index b5285195..2a387416 100644 --- a/testing/tests/server/test__resource.py +++ b/testing/tests/server/test__resource.py @@ -21,6 +21,7 @@ from twisted.trial import unittest from twisted.web.test.test_web import DummyRequest from twisted.web.error import Error from twisted.web.wsgi import WSGIResource +from twisted.internet import reactor from leap.soledad.server._resource import SoledadResource from leap.soledad.server._server_info import ServerInfo @@ -28,14 +29,14 @@ from leap.soledad.server._blobs import BlobsResource from leap.soledad.server.gzip_middleware import GzipMiddleware -conf_blobs_false = {'soledad-server': {'blobs': False}} +_pool = reactor.getThreadPool() class SoledadResourceTestCase(unittest.TestCase): def test_get_root(self): conf = {'soledad-server': {'blobs': None}} # doesn't matter - resource = SoledadResource(conf) + resource = SoledadResource(conf, sync_pool=_pool) path = '' request = DummyRequest([]) child = resource.getChild(path, request) @@ -43,7 +44,7 @@ class SoledadResourceTestCase(unittest.TestCase): def test_get_blobs_enabled(self): conf = {'soledad-server': {'blobs': True}} - resource = SoledadResource(conf) + resource = SoledadResource(conf, sync_pool=_pool) path = 'blobs' request = DummyRequest([]) child = resource.getChild(path, request) @@ -51,7 +52,7 @@ class SoledadResourceTestCase(unittest.TestCase): def test_get_blobs_disabled(self): conf = {'soledad-server': {'blobs': False}} - resource = SoledadResource(conf) + resource = SoledadResource(conf, sync_pool=_pool) path = 'blobs' request = DummyRequest([]) with self.assertRaises(Error): @@ -59,7 +60,7 @@ class SoledadResourceTestCase(unittest.TestCase): def test_get_sync(self): conf = {'soledad-server': {'blobs': None}} # doesn't matter - resource = SoledadResource(conf) + resource = SoledadResource(conf, sync_pool=_pool) path = 'sync' # if not 'blobs' or '', should be routed to sync request = DummyRequest([]) request.prepath = ['user-db'] |