1 files changed, 24 insertions, 1 deletions
diff --git a/service/test/support/integration/soledad_test_base.py b/service/test/support/integration/soledad_test_base.py
index 5fed3a12..1e3e3094 100644
--- a/service/test/support/integration/soledad_test_base.py
+++ b/service/test/support/integration/soledad_test_base.py
@@ -13,7 +13,12 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+from uuid import uuid4
+from leap.mail.adaptors.soledad import SoledadMailAdaptor
+from leap.mail.mail import Message
+from twisted.internet import defer
 from twisted.trial import unittest
+from pixelated.adapter.mailstore import LeapMailStore
 from test.support.integration.app_test_client import AppTestClient
 from leap.common.events.flags import set_events_enabled
 
@@ -23,10 +28,28 @@ class SoledadTestBase(unittest.TestCase, AppTestClient):
     DEFERRED_TIMEOUT = 120
     DEFERRED_TIMEOUT_LONG = 300
 
+    @defer.inlineCallbacks
     def setUp(self):
         set_events_enabled(False)
-        return self.start_client()
+        super(SoledadTestBase, self).setUp()
+        self.adaptor = SoledadMailAdaptor()
+        self.mbox_uuid = str(uuid4())
+        yield self.start_client()
+        self.store = LeapMailStore(self.soledad)
 
     def tearDown(self):
         set_events_enabled(True)
         self.cleanup()
+
+    @defer.inlineCallbacks
+    def _create_mail_in_soledad(self, mail):
+        message = self._convert_mail_to_leap_message(mail)
+        yield self.adaptor.initialize_store(self.soledad)
+        yield self.adaptor.create_msg(self.soledad, message)
+
+        defer.returnValue(message.get_wrapper().mdoc.doc_id)
+
+    def _convert_mail_to_leap_message(self, mail):
+        message = self.adaptor.get_msg_from_string(Message, mail.as_string())
+        message.get_wrapper().set_mbox_uuid(self.mbox_uuid)
+        return message