diff options
| author | Victor Shyba <victor.shyba@gmail.com> | 2015-07-27 16:41:09 -0300 |
|---|---|---|
| committer | Folker Bernitt <fbernitt@thoughtworks.com> | 2015-08-11 17:00:28 +0200 |
| commit | 769d20969dda078b01fc82b5ecd27632936dbe4a (patch) | |
| tree | 5e980f180330ce103dad444242ffd6b37db75132 | |
| parent | 66420248e49f7f115fa113287828696613dbaff9 (diff) | |
fix attachment integration test
| -rw-r--r-- | service/test/integration/test_retrieve_attachment.py | 12 | ||||
| -rw-r--r-- | service/test/support/integration/app_test_client.py | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/service/test/integration/test_retrieve_attachment.py b/service/test/integration/test_retrieve_attachment.py index 2c446b42..fd6b2511 100644 --- a/service/test/integration/test_retrieve_attachment.py +++ b/service/test/integration/test_retrieve_attachment.py @@ -15,10 +15,12 @@ # along with Pixelated. If not, see <http://www.gnu.org/licenses/>. from test.support.integration.soledad_test_base import SoledadTestBase +from twisted.internet import defer class RetrieveAttachmentTest(SoledadTestBase): + @defer.inlineCallbacks def test_attachment_content_is_retrieved(self): ident = 'F4E99C1CEC4D300A4223A96CCABBE0304BDBC31C550A5A03E207A5E4C3C71A22' attachment_dict = {'content-disposition': 'attachment', @@ -28,12 +30,8 @@ class RetrieveAttachmentTest(SoledadTestBase): 'phash': ident, 'content-type': 'text/plain; charset=US-ASCII; name="attachment_pequeno.txt"'} - self.add_document_to_soledad(attachment_dict) + yield self.add_document_to_soledad(attachment_dict) - d = self.get_attachment(ident, 'base64') + attachment = yield self.get_attachment(ident, 'base64') - def _assert(attachment): - self.assertEquals('pequeno anexo :D\n', attachment) - d.addCallback(_assert) - - return d + self.assertEquals('pequeno anexo :D\n', attachment) diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py index 67cd9df0..db85f931 100644 --- a/service/test/support/integration/app_test_client.py +++ b/service/test/support/integration/app_test_client.py @@ -130,7 +130,7 @@ class AppTestClient(object): return self._render(request) def add_document_to_soledad(self, _dict): - self.soledad_querier.soledad.create_doc(_dict) + return self.soledad_querier.soledad.create_doc(_dict) @defer.inlineCallbacks def add_mail_to_inbox(self, input_mail): |