summaryrefslogtreecommitdiff
path: root/testing/tests
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2017-01-26 18:37:45 -0200
committerKali Kaneko <kali@leap.se>2017-02-09 17:41:44 +0100
commit47c357213b4e39c6ced818de7eeb401e52bf92b9 (patch)
treeebababb3a094278c8792d4f9b33c3e56028d1384 /testing/tests
parentc9cb1a814b6bfaa40de3c35a590f39d5fb0ce18e (diff)
[refactor] move wsgi sync setup to its own module
Conflicts: server/src/leap/soledad/server/_wsgi.py server/src/leap/soledad/server/entrypoint.py server/src/leap/soledad/server/resource.py testing/tests/server/test__resource.py
Diffstat (limited to 'testing/tests')
-rw-r--r--testing/tests/conftest.py2
-rw-r--r--testing/tests/server/test_auth.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/testing/tests/conftest.py b/testing/tests/conftest.py
index 1ff1cbb7..decfb0a9 100644
--- a/testing/tests/conftest.py
+++ b/testing/tests/conftest.py
@@ -103,7 +103,7 @@ class SoledadServer(object):
'--logfile=%s' % self._logfile,
'--pidfile=%s' % self._pidfile,
'web',
- '--wsgi=leap.soledad.server.application.wsgi_application',
+ '--class=leap.soledad.server.entrypoint.SoledadEntrypoint',
'--port=2424'
])
diff --git a/testing/tests/server/test_auth.py b/testing/tests/server/test_auth.py
index 5b215650..8ef35177 100644
--- a/testing/tests/server/test_auth.py
+++ b/testing/tests/server/test_auth.py
@@ -31,7 +31,7 @@ from twisted.web.test import test_httpauth
from leap.soledad.server.auth import SoledadRealm
from leap.soledad.server.auth import TokenChecker
from leap.soledad.server.auth import TokenCredentialFactory
-from leap.soledad.server.resource import SoledadResource
+from leap.soledad.server._resource import SoledadResource
class SoledadRealmTestCase(unittest.TestCase):