diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-05-23 16:33:17 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-05-23 16:33:17 -0300 |
| commit | 8cef16cd458801b1513bbcd6849edc4599204b6f (patch) | |
| tree | c53614e9d5f0e88f0a0bb4e89cd08ef2ea768227 /src/leap/soledad/tests/test_soledad.py | |
| parent | eb7cd9f51ae2661aea6d36a6660b324ed06193c9 (diff) | |
| parent | 6fc38f043e51131647e2a16dad8e1abd10440821 (diff) | |
Merge remote-tracking branch 'drebs/feature/2491-soledad-server-create-the-shared-database-in-couch' into develop
Diffstat (limited to 'src/leap/soledad/tests/test_soledad.py')
| -rw-r--r-- | src/leap/soledad/tests/test_soledad.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/leap/soledad/tests/test_soledad.py b/src/leap/soledad/tests/test_soledad.py index 45cd7eb2..5eef039f 100644 --- a/src/leap/soledad/tests/test_soledad.py +++ b/src/leap/soledad/tests/test_soledad.py @@ -41,7 +41,7 @@ from leap.soledad.backends.leap_backend import LeapDocument class AuxMethodsTestCase(BaseSoledadTest): def test__init_dirs(self): - sol = self._soledad_instance(prefix='/_init_dirs') + sol = self._soledad_instance(prefix='_init_dirs') sol._init_dirs() local_db_dir = os.path.dirname(sol.local_db_path) secrets_path = os.path.dirname(sol.secrets_path) @@ -94,8 +94,12 @@ class AuxMethodsTestCase(BaseSoledadTest): local_db_path='value_2', server_url='value_1', cert_file=None) - self.assertEqual(self.tempdir+'value_3', sol.secrets_path) - self.assertEqual(self.tempdir+'value_2', sol.local_db_path) + self.assertEqual( + os.path.join(self.tempdir, 'value_3'), + sol.secrets_path) + self.assertEqual( + os.path.join(self.tempdir, 'value_2'), + sol.local_db_path) self.assertEqual('value_1', sol.server_url) |