diff --git a/tests/test-url.py b/tests/test-url.py index aa4a6e3ed0c9d080626b97bc2164d82aa90b0333_dGVzdHMvdGVzdC11cmwucHk=..5c8353692123ba43cbefc76746bb5b48e1c6d29b_dGVzdHMvdGVzdC11cmwucHk= 100644 --- a/tests/test-url.py +++ b/tests/test-url.py @@ -4,6 +4,9 @@ if a != b: print (a, b) +def cert(cn): + return dict(subject=((('commonName', cn),),)) + from mercurial.url import _verifycert # Test non-wildcard certificates @@ -7,11 +10,11 @@ from mercurial.url import _verifycert # Test non-wildcard certificates -check(_verifycert({'subject': ((('commonName', 'example.com'),),)}, 'example.com'), - None) -check(_verifycert({'subject': ((('commonName', 'example.com'),),)}, 'www.example.com'), - 'certificate is for example.com') -check(_verifycert({'subject': ((('commonName', 'www.example.com'),),)}, 'example.com'), - 'certificate is for www.example.com') +check(_verifycert(cert('example.com'), 'example.com'), + None) +check(_verifycert(cert('example.com'), 'www.example.com'), + 'certificate is for example.com') +check(_verifycert(cert('www.example.com'), 'example.com'), + 'certificate is for www.example.com') # Test wildcard certificates @@ -16,10 +19,10 @@ # Test wildcard certificates -check(_verifycert({'subject': ((('commonName', '*.example.com'),),)}, 'www.example.com'), - None) -check(_verifycert({'subject': ((('commonName', '*.example.com'),),)}, 'example.com'), - 'certificate is for *.example.com') -check(_verifycert({'subject': ((('commonName', '*.example.com'),),)}, 'w.w.example.com'), - 'certificate is for *.example.com') +check(_verifycert(cert('*.example.com'), 'www.example.com'), + None) +check(_verifycert(cert('*.example.com'), 'example.com'), + 'certificate is for *.example.com') +check(_verifycert(cert('*.example.com'), 'w.w.example.com'), + 'certificate is for *.example.com') # Avoid some pitfalls @@ -24,10 +27,10 @@ # Avoid some pitfalls -check(_verifycert({'subject': ((('commonName', '*.foo'),),)}, 'foo'), - 'certificate is for *.foo') -check(_verifycert({'subject': ((('commonName', '*o'),),)}, 'foo'), - 'certificate is for *o') +check(_verifycert(cert('*.foo'), 'foo'), + 'certificate is for *.foo') +check(_verifycert(cert('*o'), 'foo'), + 'certificate is for *o') import time lastyear = time.gmtime().tm_year - 1 nextyear = time.gmtime().tm_year + 1 @@ -30,11 +33,15 @@ import time lastyear = time.gmtime().tm_year - 1 nextyear = time.gmtime().tm_year + 1 -check(_verifycert({'notAfter': 'May 9 00:00:00 %s GMT' % lastyear}, 'example.com'), - 'certificate expired May 9 00:00:00 %s GMT' % lastyear) -check(_verifycert({'notBefore': 'May 9 00:00:00 %s GMT' % nextyear}, 'example.com'), - 'certificate not valid before May 9 00:00:00 %s GMT' % nextyear) -check(_verifycert({'notAfter': 'Sep 29 15:29:48 %s GMT' % nextyear, 'subject': ()}, 'example.com'), - 'no commonName found in certificate') +check(_verifycert({'notAfter': 'May 9 00:00:00 %s GMT' % lastyear}, + 'example.com'), + 'certificate expired May 9 00:00:00 %s GMT' % lastyear) +check(_verifycert({'notBefore': 'May 9 00:00:00 %s GMT' % nextyear}, + 'example.com'), + 'certificate not valid before May 9 00:00:00 %s GMT' % nextyear) +check(_verifycert({'notAfter': 'Sep 29 15:29:48 %s GMT' % nextyear, + 'subject': ()}, + 'example.com'), + 'no commonName found in certificate') check(_verifycert(None, 'example.com'), @@ -40,2 +47,2 @@ check(_verifycert(None, 'example.com'), - 'no certificate received') + 'no certificate received')