diff options
Diffstat (limited to 'src/leap/soledad')
| -rw-r--r-- | src/leap/soledad/tests/test_crypto.py | 2 | ||||
| -rw-r--r-- | src/leap/soledad/tests/test_leap_backend.py | 2 | ||||
| -rw-r--r-- | src/leap/soledad/tests/test_soledad.py | 3 | ||||
| -rw-r--r-- | src/leap/soledad/tests/test_sqlcipher.py | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/src/leap/soledad/tests/test_crypto.py b/src/leap/soledad/tests/test_crypto.py index 5432856e..ae84dad3 100644 --- a/src/leap/soledad/tests/test_crypto.py +++ b/src/leap/soledad/tests/test_crypto.py @@ -233,7 +233,6 @@ class CryptoMethodsTestCase(BaseSoledadTest): self.assertTrue( secret_id_2 == hashlib.sha256(sol.storage_secret).hexdigest()) - def test__has_secret(self): sol = self._soledad_instance(user='user@leap.se') self.assertTrue(sol._has_secret(), "Should have a secret at " @@ -248,7 +247,6 @@ class CryptoMethodsTestCase(BaseSoledadTest): self.assertFalse(sol._has_secret()) - class MacAuthTestCase(BaseSoledadTest): def test_decrypt_with_wrong_mac_raises(self): diff --git a/src/leap/soledad/tests/test_leap_backend.py b/src/leap/soledad/tests/test_leap_backend.py index d04ee412..6914e869 100644 --- a/src/leap/soledad/tests/test_leap_backend.py +++ b/src/leap/soledad/tests/test_leap_backend.py @@ -688,7 +688,7 @@ class LeapDatabaseSyncTargetTests( self.assertEqual( [(doc.doc_id, doc.rev, 1), (doc2.doc_id, doc2.rev, 2)], - [c[:-3]+c[-2:-1] for c in self.other_changes]) + [c[:-3] + c[-2:-1] for c in self.other_changes]) self.assertEqual( json.loads(tests.simple_doc), json.loads(self.other_changes[0][2])) diff --git a/src/leap/soledad/tests/test_soledad.py b/src/leap/soledad/tests/test_soledad.py index f78d60f0..09711f19 100644 --- a/src/leap/soledad/tests/test_soledad.py +++ b/src/leap/soledad/tests/test_soledad.py @@ -265,7 +265,6 @@ class SoledadSignalingTestCase(BaseSoledadTest): ADDRESS, ) - def test_sync_signals(self): """ Test Soledad emits SOLEDAD_CREATING_KEYS signal. @@ -291,7 +290,7 @@ class SoledadSignalingTestCase(BaseSoledadTest): soledad.events.signal.reset_mock() sol = self._soledad_instance() # mock the sync target - LeapSyncTarget.get_sync_info = Mock(return_value=[0,0,0,0,2]) + LeapSyncTarget.get_sync_info = Mock(return_value=[0, 0, 0, 0, 2]) # mock our generation so soledad thinks there's new data to sync sol._db._get_generation = Mock(return_value=1) # check for new data to sync diff --git a/src/leap/soledad/tests/test_sqlcipher.py b/src/leap/soledad/tests/test_sqlcipher.py index dfc5577b..9741bd4e 100644 --- a/src/leap/soledad/tests/test_sqlcipher.py +++ b/src/leap/soledad/tests/test_sqlcipher.py @@ -745,7 +745,7 @@ class SQLCipherSyncTargetTests( self.assertEqual( [(doc.doc_id, doc.rev, 1), (doc2.doc_id, doc2.rev, 2)], - [c[:2]+c[3:4] for c in self.other_changes]) + [c[:2] + c[3:4] for c in self.other_changes]) self.assertEqual( json.dumps(tests.simple_doc), json.dumps(self.other_changes[0][2])) |