summaryrefslogtreecommitdiff
path: root/common/src/leap/soledad/common/tests/test_sqlcipher_sync.py
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-04-28 21:40:43 -0400
committerKali Kaneko <kali@leap.se>2016-07-12 03:09:24 +0200
commitb5aa97e9f88934dd73af84f212c95775f97769a9 (patch)
tree382b243aca84daf0d400a79cef95b84935632d7f /common/src/leap/soledad/common/tests/test_sqlcipher_sync.py
parent7abf86737562b5c79e902921df722f01e71178e6 (diff)
[refactor] make tests use l2db submodule
From this moment on, we embed a fork of u1db called l2db.
Diffstat (limited to 'common/src/leap/soledad/common/tests/test_sqlcipher_sync.py')
-rw-r--r--common/src/leap/soledad/common/tests/test_sqlcipher_sync.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/common/src/leap/soledad/common/tests/test_sqlcipher_sync.py b/common/src/leap/soledad/common/tests/test_sqlcipher_sync.py
index 439fc070..42cfa6b7 100644
--- a/common/src/leap/soledad/common/tests/test_sqlcipher_sync.py
+++ b/common/src/leap/soledad/common/tests/test_sqlcipher_sync.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# test_sqlcipher.py
-# Copyright (C) 2013 LEAP
+# Copyright (C) 2013-2016 LEAP
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -17,20 +17,19 @@
"""
Test sqlcipher backend sync.
"""
-
-
import os
-from u1db import sync
-from u1db import vectorclock
-from u1db import errors
from uuid import uuid4
from testscenarios import TestWithScenarios
+from leap.soledad.common.l2db import sync
+from leap.soledad.common.l2db import vectorclock
+from leap.soledad.common.l2db import errors
+
from leap.soledad.common.crypto import ENC_SCHEME_KEY
-from leap.soledad.client.http_target import SoledadHTTPSyncTarget
from leap.soledad.client.crypto import decrypt_doc_dict
+from leap.soledad.client.http_target import SoledadHTTPSyncTarget
from leap.soledad.common.tests import u1db_tests as tests
from leap.soledad.common.tests.test_sqlcipher import SQLCIPHER_SCENARIOS