diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-05-15 20:25:00 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-05-15 20:25:00 -0300 |
| commit | f216391f92ac0a52e11e9b13c149c8d40b446aeb (patch) | |
| tree | 42d99a0a8e35d38bb168320b8a9841e290f978f8 /src/leap/soledad/tests/u1db_tests | |
| parent | 021078750d24162d24d7474f8b1fe97ef9467784 (diff) | |
| parent | 7e6f458af4c7b51f414d6303942fec10dd56d2d3 (diff) | |
Merge remote-tracking branch 'drebs/feature/2349-add-mac-auth-3' into develop
Diffstat (limited to 'src/leap/soledad/tests/u1db_tests')
| -rw-r--r-- | src/leap/soledad/tests/u1db_tests/test_https.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/leap/soledad/tests/u1db_tests/test_https.py b/src/leap/soledad/tests/u1db_tests/test_https.py index b4b14722..62180f8c 100644 --- a/src/leap/soledad/tests/u1db_tests/test_https.py +++ b/src/leap/soledad/tests/u1db_tests/test_https.py @@ -74,7 +74,8 @@ class TestHttpSyncTargetHttpsSupport(tests.TestCaseWithServer): # class with one that will do HTTPS independent of the platform. In # order to maintain the compatibility with u1db default tests, we undo # that replacement here. - http_client._VerifiedHTTPSConnection = soledad.old__VerifiedHTTPSConnection + http_client._VerifiedHTTPSConnection = \ + soledad.old__VerifiedHTTPSConnection super(TestHttpSyncTargetHttpsSupport, self).setUp() def getSyncTarget(self, host, path=None): |