summaryrefslogtreecommitdiff
path: root/testing/test_soledad/u1db_tests
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2017-04-29 16:40:55 +0200
committerdrebs <drebs@leap.se>2017-05-01 21:10:18 +0200
commita2a41830f72ae014d3b4dba591c6bfc85ffeb062 (patch)
treeb853c88c3830df52c6f0a2b544ce65b02927816e /testing/test_soledad/u1db_tests
parenta9580838817c2fbc883253f6df0edc29fcd4c947 (diff)
[refactor] create client _database module
Diffstat (limited to 'testing/test_soledad/u1db_tests')
-rw-r--r--testing/test_soledad/u1db_tests/__init__.py7
-rw-r--r--testing/test_soledad/u1db_tests/test_open.py11
2 files changed, 10 insertions, 8 deletions
diff --git a/testing/test_soledad/u1db_tests/__init__.py b/testing/test_soledad/u1db_tests/__init__.py
index 1575b859..ccbb6ca6 100644
--- a/testing/test_soledad/u1db_tests/__init__.py
+++ b/testing/test_soledad/u1db_tests/__init__.py
@@ -37,11 +37,12 @@ from twisted.internet import reactor
from leap.soledad.common.l2db import errors
from leap.soledad.common.l2db import Document
from leap.soledad.common.l2db.backends import inmemory
-from leap.soledad.common.l2db.backends import sqlite_backend
from leap.soledad.common.l2db.remote import server_state
from leap.soledad.common.l2db.remote import http_app
from leap.soledad.common.l2db.remote import http_target
+from leap.soledad.client._database import sqlite
+
if sys.version_info[0] < 3:
from pysqlcipher import dbapi2
else:
@@ -140,7 +141,7 @@ def copy_memory_database_for_test(test, db):
def make_sqlite_partial_expanded_for_test(test, replica_uid):
- db = sqlite_backend.SQLitePartialExpandDatabase(':memory:')
+ db = sqlite.SQLitePartialExpandDatabase(':memory:')
db._set_replica_uid(replica_uid)
return db
@@ -151,7 +152,7 @@ def copy_sqlite_partial_expanded_for_test(test, db):
# CORRECTLY DETECT IT HAPPENING SO THAT WE CAN RAISE ERRORS RATHER THAN
# CORRUPT USER DATA. USE SYNC INSTEAD, OR WE WILL SEND NINJA TO YOUR
# HOUSE.
- new_db = sqlite_backend.SQLitePartialExpandDatabase(':memory:')
+ new_db = sqlite.SQLitePartialExpandDatabase(':memory:')
tmpfile = StringIO()
for line in db._db_handle.iterdump():
if 'sqlite_sequence' not in line: # work around bug in iterdump
diff --git a/testing/test_soledad/u1db_tests/test_open.py b/testing/test_soledad/u1db_tests/test_open.py
index b572fba0..eaaee72f 100644
--- a/testing/test_soledad/u1db_tests/test_open.py
+++ b/testing/test_soledad/u1db_tests/test_open.py
@@ -27,7 +27,8 @@ from test_soledad.u1db_tests.test_backends import TestAlternativeDocument
from leap.soledad.common.l2db import errors
from leap.soledad.common.l2db import open as u1db_open
-from leap.soledad.common.l2db.backends import sqlite_backend
+
+from leap.soledad.client._database import sqlite
@skip("Skiping tests imported from U1DB.")
@@ -47,7 +48,7 @@ class TestU1DBOpen(tests.TestCase):
db = u1db_open(self.db_path, create=True)
self.addCleanup(db.close)
self.assertTrue(os.path.exists(self.db_path))
- self.assertIsInstance(db, sqlite_backend.SQLiteDatabase)
+ self.assertIsInstance(db, sqlite.SQLiteDatabase)
def test_open_with_factory(self):
db = u1db_open(self.db_path, create=True,
@@ -56,7 +57,7 @@ class TestU1DBOpen(tests.TestCase):
self.assertEqual(TestAlternativeDocument, db._factory)
def test_open_existing(self):
- db = sqlite_backend.SQLitePartialExpandDatabase(self.db_path)
+ db = sqlite.SQLitePartialExpandDatabase(self.db_path)
self.addCleanup(db.close)
doc = db.create_doc_from_json(tests.simple_doc)
# Even though create=True, we shouldn't wipe the db
@@ -66,8 +67,8 @@ class TestU1DBOpen(tests.TestCase):
self.assertEqual(doc, doc2)
def test_open_existing_no_create(self):
- db = sqlite_backend.SQLitePartialExpandDatabase(self.db_path)
+ db = sqlite.SQLitePartialExpandDatabase(self.db_path)
self.addCleanup(db.close)
db2 = u1db_open(self.db_path, create=False)
self.addCleanup(db2.close)
- self.assertIsInstance(db2, sqlite_backend.SQLitePartialExpandDatabase)
+ self.assertIsInstance(db2, sqlite.SQLitePartialExpandDatabase)