From 9b564a2529326668a0752b3b103bffc145d94417 Mon Sep 17 00:00:00 2001
From: Folker Bernitt <fbernitt@thoughtworks.com>
Date: Tue, 21 Jul 2015 12:35:26 +0000
Subject: Added some calls to super for tests based on test_abstract_leap.py.

---
 .../unit/bitmask_libraries/test_abstract_leap.py   | 36 ++++++++++++----------
 .../test/unit/bitmask_libraries/test_session.py    |  8 +++--
 service/test/unit/bitmask_libraries/test_smtp.py   |  1 +
 .../test/unit/bitmask_libraries/test_soledad.py    |  2 ++
 4 files changed, 28 insertions(+), 19 deletions(-)

(limited to 'service/test/unit/bitmask_libraries')

diff --git a/service/test/unit/bitmask_libraries/test_abstract_leap.py b/service/test/unit/bitmask_libraries/test_abstract_leap.py
index 64de09bc..a61bbd39 100644
--- a/service/test/unit/bitmask_libraries/test_abstract_leap.py
+++ b/service/test/unit/bitmask_libraries/test_abstract_leap.py
@@ -22,25 +22,27 @@ from mock import Mock, MagicMock
 
 
 class AbstractLeapTest(unittest.TestCase):
-    _uuid = str(uuid4())
-    _session_id = str(uuid4())
-    _token = str(uuid4())
 
-    leap_home = os.path.join(tempfile.mkdtemp(), 'leap')
+    def setUp(self):
+        self._uuid = str(uuid4())
+        self._session_id = str(uuid4())
+        self._token = str(uuid4())
 
-    config = Mock(leap_home=leap_home, bootstrap_ca_cert_bundle='/some/path/to/ca_cert', ca_cert_bundle='/some/path/to/provider_ca_cert', gpg_binary='/path/to/gpg')
-    provider = Mock(config=config, server_name='some-server.test', domain='some-server.test',
-                    api_uri='https://api.some-server.test:4430', api_version='1')
-    soledad = Mock()
-    soledad_session = Mock(soledad=soledad)
-    auth = Mock(username='test_user',
-                api_server_name='some-server.test',
-                uuid=_uuid,
-                session_id=_session_id,
-                token=_token)
+        self.leap_home = os.path.join(tempfile.mkdtemp(), 'leap')
 
-    nicknym = MagicMock()
+        self.config = Mock(leap_home=self.leap_home, bootstrap_ca_cert_bundle='/some/path/to/ca_cert', ca_cert_bundle='/some/path/to/provider_ca_cert', gpg_binary='/path/to/gpg')
+        self.provider = Mock(config=self.config, server_name='some-server.test', domain='some-server.test',
+                             api_uri='https://api.some-server.test:4430', api_version='1')
+        self.soledad = Mock()
+        self.soledad_session = Mock(soledad=self.soledad)
+        self.auth = Mock(username='test_user',
+                         api_server_name='some-server.test',
+                         uuid=self._uuid,
+                         session_id=self._session_id,
+                         token=self._token)
 
-    soledad_account = MagicMock()
+        self.nicknym = MagicMock()
 
-    mail_fetcher_mock = MagicMock()
+        self.soledad_account = MagicMock()
+
+        self.mail_fetcher_mock = MagicMock()
diff --git a/service/test/unit/bitmask_libraries/test_session.py b/service/test/unit/bitmask_libraries/test_session.py
index ea73af8c..3aa8c8c7 100644
--- a/service/test/unit/bitmask_libraries/test_session.py
+++ b/service/test/unit/bitmask_libraries/test_session.py
@@ -18,22 +18,26 @@ from mock import MagicMock
 
 from pixelated.bitmask_libraries.session import LeapSession
 from test_abstract_leap import AbstractLeapTest
+from twisted.internet import defer
 
 
 class SessionTest(AbstractLeapTest):
 
     def setUp(self):
+        super(SessionTest, self).setUp()
         self.mail_fetcher_mock = MagicMock()
         self.smtp_mock = MagicMock()
 
     def tearDown(self):
         self.mail_fetcher_mock = MagicMock()
 
-    def test_background_jobs_are_started(self):
+    @defer.inlineCallbacks
+    def test_background_jobs_are_started_during_initial_sync(self):
         self.config.start_background_jobs = True
 
         with patch('pixelated.bitmask_libraries.session.reactor.callFromThread', new=_execute_func) as _:
-            self._create_session()
+            session = self._create_session()
+            yield session.initial_sync()
 
             self.mail_fetcher_mock.startService.assert_called_once_with()
 
diff --git a/service/test/unit/bitmask_libraries/test_smtp.py b/service/test/unit/bitmask_libraries/test_smtp.py
index ec51c56b..9481c488 100644
--- a/service/test/unit/bitmask_libraries/test_smtp.py
+++ b/service/test/unit/bitmask_libraries/test_smtp.py
@@ -42,6 +42,7 @@ class LeapSmtpTest(AbstractLeapTest):
     keymanager = MagicMock()
 
     def setUp(self):
+        super(LeapSmtpTest, self).setUp()
         self.provider.fetch_smtp_json.return_value = {
             'hosts': {
                 'leap-mx': {
diff --git a/service/test/unit/bitmask_libraries/test_soledad.py b/service/test/unit/bitmask_libraries/test_soledad.py
index 49691178..9e0047de 100644
--- a/service/test/unit/bitmask_libraries/test_soledad.py
+++ b/service/test/unit/bitmask_libraries/test_soledad.py
@@ -23,6 +23,8 @@ from test_abstract_leap import AbstractLeapTest
 class SoledadSessionTest(AbstractLeapTest):
 
     def setUp(self):
+        super(SoledadSessionTest, self).setUp()
+
         # given
         self.provider.fetch_soledad_json.return_value = {'hosts': {
             'couch1': {
-- 
cgit v1.2.3