diff options
| author | Folker Bernitt <fbernitt@thoughtworks.com> | 2015-07-17 15:25:53 +0200 |
|---|---|---|
| committer | Folker Bernitt <fbernitt@thoughtworks.com> | 2015-08-11 17:00:24 +0200 |
| commit | 3fd817a57040846c37e8daafa587b85292dd8a76 (patch) | |
| tree | 3248ab30dd15c8b3edf55d1d6883fe500a72f86d | |
| parent | e3a98eb55bf9d74163876698424e96ab1dad9ac6 (diff) | |
Some more yields.
| -rw-r--r-- | service/pixelated/adapter/soledad/soledad_facade_mixin.py | 3 | ||||
| -rw-r--r-- | service/pixelated/adapter/soledad/soledad_writer_mixin.py | 2 | ||||
| -rw-r--r-- | service/test/integration/test_soledad_querier.py | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/service/pixelated/adapter/soledad/soledad_facade_mixin.py b/service/pixelated/adapter/soledad/soledad_facade_mixin.py index e5dbb458..d3baa64b 100644 --- a/service/pixelated/adapter/soledad/soledad_facade_mixin.py +++ b/service/pixelated/adapter/soledad/soledad_facade_mixin.py @@ -57,9 +57,10 @@ class SoledadDbFacadeMixin(object): def create_doc(self, doc): return self.soledad.create_doc(doc) + @defer.inlineCallbacks def create_docs(self, docs): for doc in docs: - self.create_doc(doc) + yield self.create_doc(doc) def delete_doc(self, doc): return self.soledad.delete_doc(doc) diff --git a/service/pixelated/adapter/soledad/soledad_writer_mixin.py b/service/pixelated/adapter/soledad/soledad_writer_mixin.py index 262351cb..43e5d323 100644 --- a/service/pixelated/adapter/soledad/soledad_writer_mixin.py +++ b/service/pixelated/adapter/soledad/soledad_writer_mixin.py @@ -38,7 +38,7 @@ class SoledadWriterMixin(SoledadDbFacadeMixin, object): mbox_doc = (yield self.get_mbox(mailbox_name))[0] uid = 1 + (yield self.get_lastuid(mbox_doc)) - self.create_docs(mail.get_for_save(next_uid=uid, mailbox=mailbox_name)) + yield self.create_docs(mail.get_for_save(next_uid=uid, mailbox=mailbox_name)) # FIXME need to update meta message (mdoc) # mbox_doc.content['lastuid'] = uid + 1 diff --git a/service/test/integration/test_soledad_querier.py b/service/test/integration/test_soledad_querier.py index f16a42ef..ea20fda7 100644 --- a/service/test/integration/test_soledad_querier.py +++ b/service/test/integration/test_soledad_querier.py @@ -42,7 +42,7 @@ class SoledadQuerierTest(SoledadTestBase): @defer.inlineCallbacks def test_remove_dup_mailboxes_keeps_the_one_with_the_highest_last_uid(self): - self.add_multiple_to_mailbox(3, 'INBOX') # by now we already have one inbox with 3 mails + yield self.add_multiple_to_mailbox(3, 'INBOX') # by now we already have one inbox with 3 mails yield self._create_mailbox('INBOX') # now we have a duplicate # make sure we have two |