summaryrefslogtreecommitdiff
path: root/service/test/support/integration
diff options
context:
space:
mode:
authorVicente Luchi <vicente.luchi@gmail.com>2015-01-24 17:01:40 -0200
committerDuda Dornelles <ddornell@thoughtworks.com>2015-01-24 17:01:40 -0200
commit2fb15ab3f6ed53434803791df9a38879e44b1195 (patch)
tree4ee91b0e560d5721a5ac725befd5a235e3dabc5a /service/test/support/integration
parentcc2886f1346105a54f2b1182fa1f5d38214f9d0e (diff)
#184 - not creating empty tags anymore
Diffstat (limited to 'service/test/support/integration')
-rw-r--r--service/test/support/integration/app_test_client.py2
-rw-r--r--service/test/support/integration/soledad_test_base.py10
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