changeset 37874:0dcd03637d36

tests: fix error case in test-url.py's doctest This required some careful attention, so I wanted to split it out from the uninteresting bits that'll be in the next change. Differential Revision: https://phab.mercurial-scm.org/D3469
author Augie Fackler <augie@google.com>
date Fri, 27 Apr 2018 00:08:21 -0400
parents bb1b15acfd06
children 078c3eec2d5c
files tests/test-url.py
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-url.py	Fri Apr 27 00:06:08 2018 -0400
+++ b/tests/test-url.py	Fri Apr 27 00:08:21 2018 -0400
@@ -236,7 +236,8 @@
 
 def test_url():
     """
-    >>> from mercurial.util import url
+    >>> from mercurial import error, pycompat
+    >>> from mercurial.util import forcebytestr, url
 
     This tests for edge cases in url.URL's parsing algorithm. Most of
     these aren't useful for documentation purposes, so they aren't
@@ -349,10 +350,11 @@
 
     Non-localhost file URL:
 
-    >>> u = url('file://mercurial-scm.org/foo')
-    Traceback (most recent call last):
-      File "<stdin>", line 1, in ?
-    Abort: file:// URLs can only refer to localhost
+    >>> try:
+    ...   u = url(b'file://mercurial-scm.org/foo')
+    ... except error.Abort as e:
+    ...   forcebytestr(e)
+    'file:// URLs can only refer to localhost'
 
     Empty URL: