diff options
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/test_soledad/u1db_tests/__init__.py | 2 | ||||
| -rw-r--r-- | testing/test_soledad/u1db_tests/test_open.py | 2 | ||||
| -rw-r--r-- | testing/test_soledad/util.py | 4 | ||||
| -rw-r--r-- | testing/tests/blobs/test_blob_manager.py | 4 | ||||
| -rw-r--r-- | testing/tests/blobs/test_decrypter_buffer.py | 6 | ||||
| -rw-r--r-- | testing/tests/blobs/test_sqlcipher_client_backend.py | 2 | ||||
| -rw-r--r-- | testing/tests/client/test_aux_methods.py | 2 | ||||
| -rw-r--r-- | testing/tests/server/test_blobs_server.py | 4 | ||||
| -rw-r--r-- | testing/tests/sqlcipher/test_async.py | 4 | ||||
| -rw-r--r-- | testing/tests/sqlcipher/test_backend.py | 8 | ||||
| -rw-r--r-- | testing/tests/sync/test_sync_target.py | 6 |
11 files changed, 22 insertions, 22 deletions
diff --git a/testing/test_soledad/u1db_tests/__init__.py b/testing/test_soledad/u1db_tests/__init__.py index ccbb6ca6..2a4415a6 100644 --- a/testing/test_soledad/u1db_tests/__init__.py +++ b/testing/test_soledad/u1db_tests/__init__.py @@ -41,7 +41,7 @@ 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 +from leap.soledad.client._db import sqlite if sys.version_info[0] < 3: from pysqlcipher import dbapi2 diff --git a/testing/test_soledad/u1db_tests/test_open.py b/testing/test_soledad/u1db_tests/test_open.py index eaaee72f..4ca0c4a7 100644 --- a/testing/test_soledad/u1db_tests/test_open.py +++ b/testing/test_soledad/u1db_tests/test_open.py @@ -28,7 +28,7 @@ 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.client._database import sqlite +from leap.soledad.client._db import sqlite @skip("Skiping tests imported from U1DB.") diff --git a/testing/test_soledad/util.py b/testing/test_soledad/util.py index 0335d544..b814d5ca 100644 --- a/testing/test_soledad/util.py +++ b/testing/test_soledad/util.py @@ -47,8 +47,8 @@ from leap.soledad.client import Soledad from leap.soledad.client import http_target from leap.soledad.client import auth from leap.soledad.client._crypto import is_symmetrically_encrypted -from leap.soledad.client._database.sqlcipher import SQLCipherDatabase -from leap.soledad.client._database.sqlcipher import SQLCipherOptions +from leap.soledad.client._db.sqlcipher import SQLCipherDatabase +from leap.soledad.client._db.sqlcipher import SQLCipherOptions from leap.soledad.server import SoledadApp diff --git a/testing/tests/blobs/test_blob_manager.py b/testing/tests/blobs/test_blob_manager.py index 85f08d1e..d0bd57fc 100644 --- a/testing/tests/blobs/test_blob_manager.py +++ b/testing/tests/blobs/test_blob_manager.py @@ -19,8 +19,8 @@ Tests for BlobManager. """ from twisted.trial import unittest from twisted.internet import defer -from leap.soledad.client._database.blobs import BlobManager, BlobDoc, FIXED_REV -from leap.soledad.client._database.blobs import BlobAlreadyExistsError +from leap.soledad.client._db.blobs import BlobManager, BlobDoc, FIXED_REV +from leap.soledad.client._db.blobs import BlobAlreadyExistsError from io import BytesIO from mock import Mock import pytest diff --git a/testing/tests/blobs/test_decrypter_buffer.py b/testing/tests/blobs/test_decrypter_buffer.py index edaa66e2..83fbaad3 100644 --- a/testing/tests/blobs/test_decrypter_buffer.py +++ b/testing/tests/blobs/test_decrypter_buffer.py @@ -24,9 +24,9 @@ from mock import Mock from twisted.trial import unittest from twisted.internet import defer -from leap.soledad.client._database.blobs import DecrypterBuffer -from leap.soledad.client._database.blobs import BlobManager -from leap.soledad.client._database.blobs import FIXED_REV +from leap.soledad.client._db.blobs import DecrypterBuffer +from leap.soledad.client._db.blobs import BlobManager +from leap.soledad.client._db.blobs import FIXED_REV from leap.soledad.client import _crypto diff --git a/testing/tests/blobs/test_sqlcipher_client_backend.py b/testing/tests/blobs/test_sqlcipher_client_backend.py index 1ce0af77..b67215e8 100644 --- a/testing/tests/blobs/test_sqlcipher_client_backend.py +++ b/testing/tests/blobs/test_sqlcipher_client_backend.py @@ -19,7 +19,7 @@ Tests for sqlcipher backend on blobs client. """ from twisted.trial import unittest from twisted.internet import defer -from leap.soledad.client._database.blobs import SQLiteBlobBackend +from leap.soledad.client._db.blobs import SQLiteBlobBackend from io import BytesIO import pytest diff --git a/testing/tests/client/test_aux_methods.py b/testing/tests/client/test_aux_methods.py index da33255c..1eb676c7 100644 --- a/testing/tests/client/test_aux_methods.py +++ b/testing/tests/client/test_aux_methods.py @@ -22,7 +22,7 @@ import os from pytest import inlineCallbacks from leap.soledad.client import Soledad -from leap.soledad.client._database.adbapi import U1DBConnectionPool +from leap.soledad.client._db.adbapi import U1DBConnectionPool from leap.soledad.client._secrets.util import SecretsError from test_soledad.util import BaseSoledadTest diff --git a/testing/tests/server/test_blobs_server.py b/testing/tests/server/test_blobs_server.py index 2fd66224..092a0524 100644 --- a/testing/tests/server/test_blobs_server.py +++ b/testing/tests/server/test_blobs_server.py @@ -26,8 +26,8 @@ from twisted.internet import defer from treq._utils import set_global_pool from leap.soledad.server import _blobs as server_blobs -from leap.soledad.client._database.blobs import BlobManager -from leap.soledad.client._database.blobs import BlobAlreadyExistsError +from leap.soledad.client._db.blobs import BlobManager +from leap.soledad.client._db.blobs import BlobAlreadyExistsError class BlobServerTestCase(unittest.TestCase): diff --git a/testing/tests/sqlcipher/test_async.py b/testing/tests/sqlcipher/test_async.py index dac6c6b9..5c220cc4 100644 --- a/testing/tests/sqlcipher/test_async.py +++ b/testing/tests/sqlcipher/test_async.py @@ -20,8 +20,8 @@ import hashlib from twisted.internet import defer from test_soledad.util import BaseSoledadTest -from leap.soledad.client._database import adbapi -from leap.soledad.client._database import sqlcipher +from leap.soledad.client._db import adbapi +from leap.soledad.client._db import sqlcipher class ASyncSQLCipherRetryTestCase(BaseSoledadTest): diff --git a/testing/tests/sqlcipher/test_backend.py b/testing/tests/sqlcipher/test_backend.py index 4f614fb3..68f8f9f2 100644 --- a/testing/tests/sqlcipher/test_backend.py +++ b/testing/tests/sqlcipher/test_backend.py @@ -29,10 +29,10 @@ from leap.soledad.common.l2db import query_parser # soledad stuff. from leap.soledad.common.document import SoledadDocument -from leap.soledad.client._database.sqlite import SQLitePartialExpandDatabase -from leap.soledad.client._database.sqlcipher import SQLCipherDatabase -from leap.soledad.client._database.sqlcipher import SQLCipherOptions -from leap.soledad.client._database.sqlcipher import DatabaseIsNotEncrypted +from leap.soledad.client._db.sqlite import SQLitePartialExpandDatabase +from leap.soledad.client._db.sqlcipher import SQLCipherDatabase +from leap.soledad.client._db.sqlcipher import SQLCipherOptions +from leap.soledad.client._db.sqlcipher import DatabaseIsNotEncrypted # u1db tests stuff. from test_soledad import u1db_tests as tests diff --git a/testing/tests/sync/test_sync_target.py b/testing/tests/sync/test_sync_target.py index e1bd7de1..bfa322dc 100644 --- a/testing/tests/sync/test_sync_target.py +++ b/testing/tests/sync/test_sync_target.py @@ -32,9 +32,9 @@ from twisted.internet import defer from leap.soledad.client import http_target as target from leap.soledad.client.http_target.fetch_protocol import DocStreamReceiver -from leap.soledad.client._database.sqlcipher import SQLCipherU1DBSync -from leap.soledad.client._database.sqlcipher import SQLCipherOptions -from leap.soledad.client._database.sqlcipher import SQLCipherDatabase +from leap.soledad.client._db.sqlcipher import SQLCipherU1DBSync +from leap.soledad.client._db.sqlcipher import SQLCipherOptions +from leap.soledad.client._db.sqlcipher import SQLCipherDatabase from leap.soledad.client import _crypto from leap.soledad.common import l2db |