summaryrefslogtreecommitdiff
path: root/service/test/support/integration
diff options
context:
space:
mode:
authorVictor Shyba <victor.shyba@gmail.com>2015-07-17 22:12:08 +0200
committerFolker Bernitt <fbernitt@thoughtworks.com>2015-08-11 17:00:24 +0200
commit422c434224c965385a21d0d2948b005b6d44cccb (patch)
tree6a8bd9ff9ccc6c10994aed36f3cbc897fff35b62 /service/test/support/integration
parent27ad1503842dd92d4d3a8697f3aec8140446780a (diff)
fix integration test_search
Diffstat (limited to 'service/test/support/integration')
-rw-r--r--service/test/support/integration/app_test_client.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py
index e5c845cc..e139d879 100644
--- a/service/test/support/integration/app_test_client.py
+++ b/service/test/support/integration/app_test_client.py
@@ -170,13 +170,15 @@ class AppTestClient(object):
tags = 'tag:%s' % tag
return self.search(tags, page, window)
+ @defer.inlineCallbacks
def search(self, query, page=1, window=100):
- res, req = self.get("/mails", {
+ res, _ = self.get("/mails", {
'q': [query],
'w': [str(window)],
'p': [str(page)]
})
- return [ResponseMail(m) for m in res['mails']]
+ res = yield res
+ defer.returnValue([ResponseMail(m) for m in res['mails']])
def get_attachment(self, ident, encoding):
res, req = self.get("/attachment/%s" % ident, {'encoding': [encoding]}, as_json=False)