diff options
| author | efkin <efkin@riseup.net> | 2017-03-13 20:20:19 +0100 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2017-03-17 17:52:56 +0100 |
| commit | ba3fcb08eafd389bdbf0ab9c59577a25c8d8126d (patch) | |
| tree | 24f41600853a07318a035c5de4fc11f8e10fdd6a /testing/tests/couch | |
| parent | 1034d3107b57f03d7ed2257aef39cede2f6686ef (diff) | |
[test] Prepare tests for python3 compatibility
Diffstat (limited to 'testing/tests/couch')
| -rw-r--r-- | testing/tests/couch/common.py | 2 | ||||
| -rw-r--r-- | testing/tests/couch/test_atomicity.py | 2 | ||||
| -rw-r--r-- | testing/tests/couch/test_backend.py | 4 | ||||
| -rw-r--r-- | testing/tests/couch/test_sync.py | 4 | ||||
| -rw-r--r-- | testing/tests/couch/test_sync_target.py | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/testing/tests/couch/common.py b/testing/tests/couch/common.py index 84790059..3c272f6e 100644 --- a/testing/tests/couch/common.py +++ b/testing/tests/couch/common.py @@ -1,5 +1,5 @@ from uuid import uuid4 -from urlparse import urljoin +from six.moves.urllib.parse import urljoin from couchdb.client import Server from leap.soledad.common import couch diff --git a/testing/tests/couch/test_atomicity.py b/testing/tests/couch/test_atomicity.py index a3ae0314..48e1c01d 100644 --- a/testing/tests/couch/test_atomicity.py +++ b/testing/tests/couch/test_atomicity.py @@ -21,7 +21,7 @@ import os import pytest import threading -from urlparse import urljoin +from six.moves.urllib.parse import urljoin from twisted.internet import defer from uuid import uuid4 diff --git a/testing/tests/couch/test_backend.py b/testing/tests/couch/test_backend.py index 4fad11cf..9dfa22ac 100644 --- a/testing/tests/couch/test_backend.py +++ b/testing/tests/couch/test_backend.py @@ -19,7 +19,7 @@ Test ObjectStore and Couch backend bits. """ from uuid import uuid4 -from urlparse import urljoin +from six.moves.urllib.parse import urljoin from testscenarios import TestWithScenarios from twisted.trial import unittest @@ -28,7 +28,7 @@ from leap.soledad.common import couch from test_soledad.util import CouchDBTestCase from test_soledad.u1db_tests import test_backends -from common import COUCH_SCENARIOS +from .common import COUCH_SCENARIOS # ----------------------------------------------------------------------------- diff --git a/testing/tests/couch/test_sync.py b/testing/tests/couch/test_sync.py index bccbfe43..c353518e 100644 --- a/testing/tests/couch/test_sync.py +++ b/testing/tests/couch/test_sync.py @@ -8,8 +8,8 @@ from test_soledad.util import CouchDBTestCase from test_soledad.util import sync_via_synchronizer from test_soledad.u1db_tests import DatabaseBaseTests -from common import simple_doc -from common import COUCH_SCENARIOS +from .common import simple_doc +from .common import COUCH_SCENARIOS sync_scenarios = [] diff --git a/testing/tests/couch/test_sync_target.py b/testing/tests/couch/test_sync_target.py index e792fb76..0370a6d1 100644 --- a/testing/tests/couch/test_sync_target.py +++ b/testing/tests/couch/test_sync_target.py @@ -10,9 +10,9 @@ from test_soledad.util import CouchDBTestCase from test_soledad.util import make_local_db_and_target from test_soledad.u1db_tests import DatabaseBaseTests -from common import simple_doc -from common import nested_doc -from common import COUCH_SCENARIOS +from .common import simple_doc +from .common import nested_doc +from .common import COUCH_SCENARIOS target_scenarios = [ |