diff options
| author | kali <kali@leap.se> | 2012-09-20 03:15:13 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-09-20 03:15:13 +0900 |
| commit | db704eecf513fcc48365844523557d6edab28293 (patch) | |
| tree | f37516c86c5d77f23f7e57d80ee4c39b3b651c3e /src/leap/eip/tests/test_checks.py | |
| parent | add7973b3d1633b2776cb90f237415c6cac65d99 (diff) | |
| parent | 50396fca082652dd1a1617e0d029c1c726e4c651 (diff) | |
Merge branch 'develop' into feature/systray-menu
Conflicts:
src/leap/app.py
Diffstat (limited to 'src/leap/eip/tests/test_checks.py')
| -rw-r--r-- | src/leap/eip/tests/test_checks.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/eip/tests/test_checks.py b/src/leap/eip/tests/test_checks.py index 952b10d2..42aa9cce 100644 --- a/src/leap/eip/tests/test_checks.py +++ b/src/leap/eip/tests/test_checks.py @@ -331,10 +331,10 @@ class ProviderCertCheckerHTTPSTests(BaseHTTPSServerTestCase, BaseLeapTest): fetcher.get(uri, verify=True) self.assertTrue( "SSL23_GET_SERVER_HELLO:unknown protocol" in exc.message) - with self.assertRaises(requests.exceptions.SSLError) as exc: + with self.assertRaises(eipexceptions.EIPBadCertError) as exc: checker.is_https_working(uri=uri, verify=True) self.assertTrue( - "SSL23_GET_SERVER_HELLO:unknown protocol" in exc.message) + "cert verification failed" in exc.message) # get cacert from testing.https_server cacert = where_cert('cacert.pem') |