diff options
Diffstat (limited to 'service/test/support/integration')
| -rw-r--r-- | service/test/support/integration/app_test_client.py | 2 | ||||
| -rw-r--r-- | service/test/support/integration/soledad_test_base.py | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py index 860b9c40..e8f79d2b 100644 --- a/service/test/support/integration/app_test_client.py +++ b/service/test/support/integration/app_test_client.py @@ -106,7 +106,7 @@ class AppTestClient: time.sleep(1) return lambda: process.terminate() - def get(self, path, get_args, as_json=True): + def get(self, path, get_args='', as_json=True): request = request_mock(path) request.args = get_args return self._render(request, as_json) diff --git a/service/test/support/integration/soledad_test_base.py b/service/test/support/integration/soledad_test_base.py index 5892de60..f7693ad4 100644 --- a/service/test/support/integration/soledad_test_base.py +++ b/service/test/support/integration/soledad_test_base.py @@ -25,12 +25,6 @@ class SoledadTestBase(unittest.TestCase): DEFERRED_TIMEOUT = 120 DEFERRED_TIMEOUT_LONG = 300 - @classmethod - def setUpClass(cls): - from nose.twistedtools import threaded_reactor - - threaded_reactor() - def setUp(self): self.client = AppTestClient() @@ -66,6 +60,10 @@ class SoledadTestBase(unittest.TestCase): res, req = self.client.get('/tags', kwargs) return res + def get_mail(self, mail_ident): + res, req = self.client.get('/mail/%s' % mail_ident) + return res + def delete_mail(self, mail_ident): res, req = self.client.delete("/mail/%s" % mail_ident) return req |