[PATCH 3 of 8] tests: make test-url use absolute_import
Pulkit Goyal
7895pulkit at gmail.com
Tue Apr 12 13:37:40 EDT 2016
# HG changeset patch
# User Pulkit Goyal <7895pulkit at gmail.com>
# Date 1460480959 -19800
# Tue Apr 12 22:39:19 2016 +0530
# Node ID c30c2951ce4669b52049ffce3229dbca80df6622
# Parent a96a82811fe7dfafdf4a7eae84a7b0a2fa678f4b
tests: make test-url use absolute_import
diff --git a/tests/test-check-py3-compat.t b/tests/test-check-py3-compat.t
--- a/tests/test-check-py3-compat.t
+++ b/tests/test-check-py3-compat.t
@@ -66,7 +66,6 @@
tests/test-simplemerge.py not using absolute_import
tests/test-symlink-os-yes-fs-no.py not using absolute_import
tests/test-ui-color.py not using absolute_import
- tests/test-url.py not using absolute_import
#if py3exe
$ hg files 'set:(**.py)' | sed 's|\\|/|g' | xargs $PYTHON3 contrib/check-py3-compat.py
diff --git a/tests/test-url.py b/tests/test-url.py
--- a/tests/test-url.py
+++ b/tests/test-url.py
@@ -1,4 +1,6 @@
-from __future__ import print_function
+from __future__ import absolute_import, print_function
+
+import doctest
import os
def check(a, b):
@@ -8,58 +10,58 @@
def cert(cn):
return {'subject': ((('commonName', cn),),)}
-from mercurial.sslutil import _verifycert
+from mercurial import (
+ sslutil,
+)
# Test non-wildcard certificates
-check(_verifycert(cert('example.com'), 'example.com'),
+check(sslutil._verifycert(cert('example.com'), 'example.com'),
None)
-check(_verifycert(cert('example.com'), 'www.example.com'),
+check(sslutil._verifycert(cert('example.com'), 'www.example.com'),
'certificate is for example.com')
-check(_verifycert(cert('www.example.com'), 'example.com'),
+check(sslutil._verifycert(cert('www.example.com'), 'example.com'),
'certificate is for www.example.com')
# Test wildcard certificates
-check(_verifycert(cert('*.example.com'), 'www.example.com'),
+check(sslutil._verifycert(cert('*.example.com'), 'www.example.com'),
None)
-check(_verifycert(cert('*.example.com'), 'example.com'),
+check(sslutil._verifycert(cert('*.example.com'), 'example.com'),
'certificate is for *.example.com')
-check(_verifycert(cert('*.example.com'), 'w.w.example.com'),
+check(sslutil._verifycert(cert('*.example.com'), 'w.w.example.com'),
'certificate is for *.example.com')
# Test subjectAltName
san_cert = {'subject': ((('commonName', 'example.com'),),),
'subjectAltName': (('DNS', '*.example.net'),
('DNS', 'example.net'))}
-check(_verifycert(san_cert, 'example.net'),
+check(sslutil._verifycert(san_cert, 'example.net'),
None)
-check(_verifycert(san_cert, 'foo.example.net'),
+check(sslutil._verifycert(san_cert, 'foo.example.net'),
None)
# no fallback to subject commonName when subjectAltName has DNS
-check(_verifycert(san_cert, 'example.com'),
+check(sslutil._verifycert(san_cert, 'example.com'),
'certificate is for *.example.net, example.net')
# fallback to subject commonName when no DNS in subjectAltName
san_cert = {'subject': ((('commonName', 'example.com'),),),
'subjectAltName': (('IP Address', '8.8.8.8'),)}
-check(_verifycert(san_cert, 'example.com'), None)
+check(sslutil._verifycert(san_cert, 'example.com'), None)
# Avoid some pitfalls
-check(_verifycert(cert('*.foo'), 'foo'),
+check(sslutil._verifycert(cert('*.foo'), 'foo'),
'certificate is for *.foo')
-check(_verifycert(cert('*o'), 'foo'),
+check(sslutil._verifycert(cert('*o'), 'foo'),
'certificate is for *o')
-check(_verifycert({'subject': ()},
+check(sslutil._verifycert({'subject': ()},
'example.com'),
'no commonName or subjectAltName found in certificate')
-check(_verifycert(None, 'example.com'),
+check(sslutil._verifycert(None, 'example.com'),
'no certificate received')
# Unicode (IDN) certname isn't supported
-check(_verifycert(cert(u'\u4f8b.jp'), 'example.jp'),
+check(sslutil._verifycert(cert(u'\u4f8b.jp'), 'example.jp'),
'IDN in certificate not supported')
-import doctest
-
def test_url():
"""
>>> from mercurial.util import url
More information about the Mercurial-devel
mailing list