summaryrefslogtreecommitdiff
path: root/testing/test_soledad/u1db_tests
diff options
context:
space:
mode:
authorefkin <efkin@riseup.net>2017-03-13 20:20:19 +0100
committerKali Kaneko <kali@leap.se>2017-03-17 17:52:56 +0100
commitba3fcb08eafd389bdbf0ab9c59577a25c8d8126d (patch)
tree24f41600853a07318a035c5de4fc11f8e10fdd6a /testing/test_soledad/u1db_tests
parent1034d3107b57f03d7ed2257aef39cede2f6686ef (diff)
[test] Prepare tests for python3 compatibility
Diffstat (limited to 'testing/test_soledad/u1db_tests')
-rw-r--r--testing/test_soledad/u1db_tests/__init__.py9
-rw-r--r--testing/test_soledad/u1db_tests/test_https.py2
2 files changed, 8 insertions, 3 deletions
diff --git a/testing/test_soledad/u1db_tests/__init__.py b/testing/test_soledad/u1db_tests/__init__.py
index ba776864..36db548d 100644
--- a/testing/test_soledad/u1db_tests/__init__.py
+++ b/testing/test_soledad/u1db_tests/__init__.py
@@ -23,11 +23,16 @@ import socket
import tempfile
import threading
import json
+import sys
+from six import StringIO
from wsgiref import simple_server
-from pysqlcipher import dbapi2
-from StringIO import StringIO
+
+if sys.version_info[0] < 3:
+ from pysqlcipher import dbapi2
+else:
+ from pysqlcipher3 import dbapi2
import testscenarios
from twisted.trial import unittest
diff --git a/testing/test_soledad/u1db_tests/test_https.py b/testing/test_soledad/u1db_tests/test_https.py
index baffa723..2e75afd1 100644
--- a/testing/test_soledad/u1db_tests/test_https.py
+++ b/testing/test_soledad/u1db_tests/test_https.py
@@ -84,7 +84,7 @@ class TestHttpSyncTargetHttpsSupport(tests.TestCaseWithServer):
remote_target = self.getSyncTarget('localhost', 'test')
try:
remote_target.record_sync_info('other-id', 2, 'T-id')
- except ssl.SSLError, e:
+ except ssl.SSLError as e:
self.assertIn("certificate verify failed", str(e))
else:
self.fail("certificate verification should have failed.")