summaryrefslogtreecommitdiff
path: root/testing/tests
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2016-12-19 09:43:03 -0200
committerKali Kaneko <kali@leap.se>2017-02-09 17:41:37 +0100
commit6043f7966b64d6922987bca9137a524fb06a3379 (patch)
tree70f5416685405c084fbc5e4451565c460cb2203e /testing/tests
parent994eaa79b274c3c37af42cb343c41b5dec6e8d19 (diff)
[refactor] separate url mapper, avoid hanging tests
Because the wsgi resource has its own threadpool, tests might get confused when shutting down and the reactor may get clogged waiting for the threadpool to be stopped. By refactoring the URLMapper to its own module, server tests can avoid loading the resource module, where the wsgi threadpool resides, so the threapool will not be started.
Diffstat (limited to 'testing/tests')
-rw-r--r--testing/tests/server/test_server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/testing/tests/server/test_server.py b/testing/tests/server/test_server.py
index 12f6fb20..39d8e8c3 100644
--- a/testing/tests/server/test_server.py
+++ b/testing/tests/server/test_server.py
@@ -43,7 +43,7 @@ from leap.soledad.client import _crypto
from leap.soledad.client import Soledad
from leap.soledad.server.config import load_configuration
from leap.soledad.server.config import CONFIG_DEFAULTS
-from leap.soledad.server.auth import URLMapper
+from leap.soledad.server.url_mapper import URLMapper
class ServerAuthorizationTestCase(BaseSoledadTest):