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/sync | |
parent | 1034d3107b57f03d7ed2257aef39cede2f6686ef (diff) |
[test] Prepare tests for python3 compatibility
Diffstat (limited to 'testing/tests/sync')
-rw-r--r-- | testing/tests/sync/test_sync.py | 2 | ||||
-rw-r--r-- | testing/tests/sync/test_sync_mutex.py | 2 | ||||
-rw-r--r-- | testing/tests/sync/test_sync_target.py | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/testing/tests/sync/test_sync.py b/testing/tests/sync/test_sync.py index 76757c5b..bce20894 100644 --- a/testing/tests/sync/test_sync.py +++ b/testing/tests/sync/test_sync.py @@ -18,7 +18,7 @@ import json import threading import time -from urlparse import urljoin +from six.moves.urllib.parse import urljoin from mock import Mock from twisted.internet import defer diff --git a/testing/tests/sync/test_sync_mutex.py b/testing/tests/sync/test_sync_mutex.py index 432a3cd2..a9335973 100644 --- a/testing/tests/sync/test_sync_mutex.py +++ b/testing/tests/sync/test_sync_mutex.py @@ -25,7 +25,7 @@ be two concurrent synchronization processes at the same time. import time import uuid -from urlparse import urljoin +from six.moves.urllib.parse import urljoin from twisted.internet import defer diff --git a/testing/tests/sync/test_sync_target.py b/testing/tests/sync/test_sync_target.py index 25136ba1..a54a02ee 100644 --- a/testing/tests/sync/test_sync_target.py +++ b/testing/tests/sync/test_sync_target.py @@ -17,13 +17,14 @@ """ Test Leap backend bits: sync target """ -import cStringIO import os import time import json import random import string import shutil + +from six import StringIO as cStringIO from uuid import uuid4 from testscenarios import TestWithScenarios |