diff options
| author | drebs <drebs@leap.se> | 2013-05-13 00:16:51 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-05-13 15:49:51 -0300 |
| commit | 187b7c19b6f613433d192d035c26fcc016e2f493 (patch) | |
| tree | 6b036c6d8a3646b3bb7859e2f982b8724fe75308 /src/leap/soledad/tests/test_crypto.py | |
| parent | 3cefb8291c69ff4354f5b4cfde1d92117aac3d26 (diff) | |
Remove bootstrap param from Soledad.
Diffstat (limited to 'src/leap/soledad/tests/test_crypto.py')
| -rw-r--r-- | src/leap/soledad/tests/test_crypto.py | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/leap/soledad/tests/test_crypto.py b/src/leap/soledad/tests/test_crypto.py index 8f9145c8..61c5f5b0 100644 --- a/src/leap/soledad/tests/test_crypto.py +++ b/src/leap/soledad/tests/test_crypto.py @@ -216,9 +216,8 @@ class RecoveryDocumentTestCase(BaseSoledadTest): def test_import_recovery_document_raw(self): rd = self._soledad.export_recovery_document(None) s = self._soledad_instance(user='anotheruser@leap.se', prefix='/2') - s._init_dirs() - s._crypto = SoledadCrypto(s) s.import_recovery_document(rd, None) + s._set_secret_id(self._soledad._secret_id) self.assertEqual(self._soledad._uuid, s._uuid, 'Failed setting user uuid.') self.assertEqual(self._soledad._get_storage_secret(), @@ -228,8 +227,6 @@ class RecoveryDocumentTestCase(BaseSoledadTest): def test_import_recovery_document_crypt(self): rd = self._soledad.export_recovery_document('123456') s = self._soledad_instance(user='anotheruser@leap.se', prefix='3') - s._init_dirs() - s._crypto = SoledadCrypto(s) s.import_recovery_document(rd, '123456') self.assertEqual(self._soledad._uuid, s._uuid, 'Failed setting user uuid.') @@ -242,17 +239,5 @@ class CryptoMethodsTestCase(BaseSoledadTest): def test__gen_secret(self): sol = self._soledad_instance(user='user@leap.se', prefix='/3') - sol._init_dirs() - sol._crypto = SoledadCrypto(sol) - self.assertFalse(sol._has_secret(), "Should not have a secret at " - "this point") - sol._gen_secret() - self.assertTrue(sol._has_secret(), "Could not generate secret.") - - def test__has_secret(self): - sol = self._soledad_instance(user='leap@leap.se', prefix='/5') - sol._init_dirs() - sol._crypto = SoledadCrypto(sol) - self.assertFalse(sol._has_secret()) - sol._gen_secret() - self.assertTrue(sol._has_secret()) + self.assertTrue(sol._has_secret(), "Should have a secret at " + "this point") |