diff options
Diffstat (limited to 'src/leap/soledad/tests')
| -rw-r--r-- | src/leap/soledad/tests/__init__.py | 1 | ||||
| -rw-r--r-- | src/leap/soledad/tests/test_soledad.py | 76 |
2 files changed, 15 insertions, 62 deletions
diff --git a/src/leap/soledad/tests/__init__.py b/src/leap/soledad/tests/__init__.py index a30193d3..149228e5 100644 --- a/src/leap/soledad/tests/__init__.py +++ b/src/leap/soledad/tests/__init__.py @@ -54,6 +54,7 @@ class BaseSoledadTest(BaseLeapTest): '123', secret_path=self.tempdir+prefix+secret_path, local_db_path=self.tempdir+prefix+local_db_path, + server_url='', # Soledad will fail if not given an url. bootstrap=bootstrap) diff --git a/src/leap/soledad/tests/test_soledad.py b/src/leap/soledad/tests/test_soledad.py index 1ddfb6a0..1ce9adb7 100644 --- a/src/leap/soledad/tests/test_soledad.py +++ b/src/leap/soledad/tests/test_soledad.py @@ -44,8 +44,8 @@ class AuxMethodsTestCase(BaseSoledadTest): def test__init_dirs(self): sol = self._soledad_instance(prefix='/_init_dirs') sol._init_dirs() - local_db_dir = os.path.dirname(sol._config.get_local_db_path()) - secret_path = os.path.dirname(sol._config.get_secret_path()) + local_db_dir = os.path.dirname(sol.local_db_path) + secret_path = os.path.dirname(sol.secret_path) self.assertTrue(os.path.isdir(local_db_dir)) self.assertTrue(os.path.isdir(secret_path)) @@ -61,81 +61,33 @@ class AuxMethodsTestCase(BaseSoledadTest): from leap.soledad.backends.sqlcipher import SQLCipherDatabase self.assertIsInstance(sol._db, SQLCipherDatabase) - def test__init_config_default(self): - """ - Test if configuration defaults point to the correct place. - """ - sol = Soledad('leap@leap.se', passphrase='123', bootstrap=False) - self.assertTrue(bool(re.match( - '.*/\.config/leap/soledad/secret.gpg', - sol._config.get_secret_path()))) - self.assertTrue(bool(re.match( - '.*/\.config/leap/soledad/soledad.u1db', - sol._config.get_local_db_path()))) - self.assertEqual( - 'http://provider/soledad/shared', - sol._config.get_shared_db_url()) - def test__init_config_defaults(self): """ Test if configuration defaults point to the correct place. """ - # we use regexp match here because HOME environment variable is - # changed by the BaseLeapTest class but BaseConfig does not capture - # that change. - sol = Soledad('leap@leap.se', passphrase='123', bootstrap=False) - self.assertTrue(bool(re.match( - '.*/\.config/leap/soledad/secret.gpg', - sol._config.get_secret_path()))) - self.assertTrue(bool(re.match( - '.*/\.config/leap/soledad/soledad.u1db', - sol._config.get_local_db_path()))) - self.assertEqual( - 'http://provider/soledad/shared', - sol._config.get_shared_db_url()) - - def test__init_config_from_file(self): - """ - Test if configuration is correctly read from file. - """ - # we use regexp match here because HOME environment variable is - # changed by the BaseLeapTest class but BaseConfig does not capture - # that change. - config_values = { - "secret_path": "value_1", - "local_db_path": "value_2", - "shared_db_url": "value_3" - } - tmpfile = tempfile.mktemp(dir=self.tempdir) - f = open(tmpfile, 'w') - f.write(json.dumps(config_values)) - f.close() - sol = Soledad( - 'leap@leap.se', - passphrase='123', - bootstrap=False, - config_path=tmpfile) - self.assertEqual('value_1', sol._config.get_secret_path()) - self.assertEqual('value_2', sol._config.get_local_db_path()) - self.assertEqual('value_3', sol._config.get_shared_db_url()) + sol = Soledad('leap@leap.se', passphrase='123', bootstrap=False, + server_url='') # otherwise Soledad will fail. + self.assertEquals( + os.path.join(sol.DEFAULT_PREFIX, 'secret.gpg'), + sol.secret_path) + self.assertEquals( + os.path.join(sol.DEFAULT_PREFIX, 'soledad.u1db'), + sol.local_db_path) def test__init_config_from_params(self): """ Test if configuration is correctly read from file. """ - # we use regexp match here because HOME environment variable is - # changed by the BaseLeapTest class but BaseConfig does not capture - # that change. sol = Soledad( 'leap@leap.se', passphrase='123', bootstrap=False, secret_path='value_3', local_db_path='value_2', - shared_db_url='value_1') - self.assertEqual('value_3', sol._config.get_secret_path()) - self.assertEqual('value_2', sol._config.get_local_db_path()) - self.assertEqual('value_1', sol._config.get_shared_db_url()) + server_url='value_1') + self.assertEqual('value_3', sol.secret_path) + self.assertEqual('value_2', sol.local_db_path) + self.assertEqual('value_1', sol.server_url) class SoledadSharedDBTestCase(BaseSoledadTest): |