summaryrefslogtreecommitdiff
path: root/src/leap/soledad/tests/test_sqlcipher.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-05-23 16:33:17 -0300
committerTomás Touceda <chiiph@leap.se>2013-05-23 16:33:17 -0300
commit8cef16cd458801b1513bbcd6849edc4599204b6f (patch)
treec53614e9d5f0e88f0a0bb4e89cd08ef2ea768227 /src/leap/soledad/tests/test_sqlcipher.py
parenteb7cd9f51ae2661aea6d36a6660b324ed06193c9 (diff)
parent6fc38f043e51131647e2a16dad8e1abd10440821 (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_sqlcipher.py')
-rw-r--r--src/leap/soledad/tests/test_sqlcipher.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/leap/soledad/tests/test_sqlcipher.py b/src/leap/soledad/tests/test_sqlcipher.py
index 60261111..5bfb8de6 100644
--- a/src/leap/soledad/tests/test_sqlcipher.py
+++ b/src/leap/soledad/tests/test_sqlcipher.py
@@ -773,7 +773,7 @@ class SQLCipherEncryptionTest(BaseLeapTest):
os.unlink(dbfile)
def setUp(self):
- self.DB_FILE = self.tempdir + '/test.db'
+ self.DB_FILE = os.path.join(self.tempdir, 'test.db')
self._delete_dbfiles()
def tearDown(self):