# HG changeset patch # User Augie Fackler # Date 1421180137 18000 # Node ID bd72e75f09e7b8ae6625ad3bad539b443a7f8a75 # Parent 02f4560b69b7ae7ad22fa2ca6181c81c5125d05e test-https: glob error messages more so we pass on Python 2.7.9 Python 2.7.9 cleans up how it stringifies SSL errors, so we have to look only for the important bit (certificate verify failed) rather than looking for specific ssl module goop (which is now unstable). diff -r 02f4560b69b7 -r bd72e75f09e7 tests/test-https.t --- a/tests/test-https.t Mon Jan 12 09:46:56 2015 -0800 +++ b/tests/test-https.t Tue Jan 13 15:15:37 2015 -0500 @@ -121,7 +121,7 @@ $ DISABLEOSXDUMMYCERT= #if osx $ hg clone https://localhost:$HGPORT/ copy-pull - abort: error: *:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed (glob) + abort: error: *certificate verify failed* (glob) [255] $ DISABLEOSXDUMMYCERT="--config=web.cacerts=" @@ -205,7 +205,7 @@ searching for changes no changes found $ hg -R copy-pull pull --config web.cacerts=pub-other.pem - abort: error: *:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed (glob) + abort: error: *certificate verify failed* (glob) [255] $ hg -R copy-pull pull --config web.cacerts=pub-other.pem --insecure warning: localhost certificate with fingerprint 91:4f:1a:ff:87:24:9c:09:b6:85:9b:88:b1:90:6d:30:75:64:91:ca not verified (check hostfingerprints or web.cacerts config setting) @@ -218,7 +218,7 @@ $ hg -R test serve -p $HGPORT1 -d --pid-file=hg1.pid --certificate=server-not-yet.pem $ cat hg1.pid >> $DAEMON_PIDS $ hg -R copy-pull pull --config web.cacerts=pub-not-yet.pem https://localhost:$HGPORT1/ - abort: error: *:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed (glob) + abort: error: *certificate verify failed* (glob) [255] Test server cert which no longer is valid @@ -226,7 +226,7 @@ $ hg -R test serve -p $HGPORT2 -d --pid-file=hg2.pid --certificate=server-expired.pem $ cat hg2.pid >> $DAEMON_PIDS $ hg -R copy-pull pull --config web.cacerts=pub-expired.pem https://localhost:$HGPORT2/ - abort: error: *:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed (glob) + abort: error: *certificate verify failed* (glob) [255] Fingerprints @@ -286,8 +286,8 @@ Test https with cert problems through proxy $ http_proxy=http://localhost:$HGPORT1/ hg -R copy-pull pull --config web.cacerts=pub-other.pem - abort: error: *:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed (glob) + abort: error: *certificate verify failed* (glob) [255] $ http_proxy=http://localhost:$HGPORT1/ hg -R copy-pull pull --config web.cacerts=pub-expired.pem https://localhost:$HGPORT2/ - abort: error: *:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed (glob) + abort: error: *certificate verify failed* (glob) [255]