diff --git a/tests/checker/data/archive.html.result b/tests/checker/data/archive.html.result index 3f378653..f540d9cc 100644 --- a/tests/checker/data/archive.html.result +++ b/tests/checker/data/archive.html.result @@ -12,6 +12,7 @@ valid url http://www.example.com cache key http://www.example.com -real url http://www.iana.org/domains/example/ +real url http://www.iana.org/domains/example info Redirected to `http://www.iana.org/domains/example/'. +info Redirected to `http://www.iana.org/domains/example'. valid diff --git a/tests/checker/data/misc.html.result b/tests/checker/data/misc.html.result index c675aa88..527fc048 100644 --- a/tests/checker/data/misc.html.result +++ b/tests/checker/data/misc.html.result @@ -7,8 +7,9 @@ valid url http://www.example.com/ cache key http://www.example.com/ -real url http://www.iana.org/domains/example/ +real url http://www.iana.org/domains/example info Redirected to `http://www.iana.org/domains/example/'. +info Redirected to `http://www.iana.org/domains/example'. valid url favicon.ico diff --git a/tests/checker/data/plist_binary/Bookmarks.plist.result b/tests/checker/data/plist_binary/Bookmarks.plist.result index b8d79ecd..2a4c4f9a 100644 --- a/tests/checker/data/plist_binary/Bookmarks.plist.result +++ b/tests/checker/data/plist_binary/Bookmarks.plist.result @@ -7,14 +7,16 @@ valid url http://www.example.com/ cache key http://www.example.com/ -real url http://www.iana.org/domains/example/ +real url http://www.iana.org/domains/example name Imadoofus info Redirected to `http://www.iana.org/domains/example/'. +info Redirected to `http://www.iana.org/domains/example'. valid url http://www.example.net/ cache key http://www.example.net/ -real url http://www.iana.org/domains/example/ +real url http://www.iana.org/domains/example name Imanotherdoofus info Redirected to `http://www.iana.org/domains/example/'. +info Redirected to `http://www.iana.org/domains/example'. valid diff --git a/tests/checker/data/plist_xml/Bookmarks.plist.result b/tests/checker/data/plist_xml/Bookmarks.plist.result index 59124762..b0634f09 100644 --- a/tests/checker/data/plist_xml/Bookmarks.plist.result +++ b/tests/checker/data/plist_xml/Bookmarks.plist.result @@ -9,14 +9,16 @@ valid url http://www.example.com/ cache key http://www.example.com/ -real url http://www.iana.org/domains/example/ +real url http://www.iana.org/domains/example name Imadoofus info Redirected to `http://www.iana.org/domains/example/'. +info Redirected to `http://www.iana.org/domains/example'. valid url http://www.example.net/ cache key http://www.example.net/ -real url http://www.iana.org/domains/example/ +real url http://www.iana.org/domains/example name Imanotherdoofus info Redirected to `http://www.iana.org/domains/example/'. +info Redirected to `http://www.iana.org/domains/example'. valid diff --git a/tests/checker/data/redir.html.result b/tests/checker/data/redir.html.result index 686c9679..fbe28d8f 100644 --- a/tests/checker/data/redir.html.result +++ b/tests/checker/data/redir.html.result @@ -6,8 +6,9 @@ valid url redirect_newhost.html cache key http://localhost:%(port)d/%(datadir)s/redirect_newhost.html -real url http://www.iana.org/domains/example/ +real url http://www.iana.org/domains/example name redirect to new host info Redirected to `http://www.example.com/'. info Redirected to `http://www.iana.org/domains/example/'. +info Redirected to `http://www.iana.org/domains/example'. valid diff --git a/tests/checker/test_http_misc.py b/tests/checker/test_http_misc.py index 1a8e750f..73149458 100644 --- a/tests/checker/test_http_misc.py +++ b/tests/checker/test_http_misc.py @@ -39,8 +39,9 @@ class TestHttpMisc (HttpServerTest): u"valid", u"url http://www.example.org/", u"cache key http://www.example.org/", - u"real url http://www.iana.org/domains/example/", + u"real url http://www.iana.org/domains/example", u"info Redirected to `http://www.iana.org/domains/example/'.", + u"info Redirected to `http://www.iana.org/domains/example'.", u"valid", ] self.direct(url, resultlines, recursionlevel=1) diff --git a/tests/checker/test_urllen.py b/tests/checker/test_urllen.py index e19dcef5..86d34d9b 100644 --- a/tests/checker/test_urllen.py +++ b/tests/checker/test_urllen.py @@ -29,11 +29,13 @@ class TestURLLength(LinkCheckTest): url = u"http://www.example.org/%s" % (u"a" * 256) attrs = self.get_attrs(url=url) attrs['nurl'] = u"http://www.iana.org/domains/example/" + attrs['rurl'] = u"http://www.iana.org/domains/example" resultlines = [ u"url %(url)s" % attrs, u"cache key %(url)s" % attrs, - u"real url %(nurl)s" % attrs, + u"real url %(rurl)s" % attrs, u"info Redirected to `%(nurl)s'." % attrs, + u"info Redirected to `%(rurl)s'." % attrs, u"warning URL length 279 is longer than 255.", u"valid", ] diff --git a/tests/checker/test_whitespace.py b/tests/checker/test_whitespace.py index 201ca7b9..71069b64 100644 --- a/tests/checker/test_whitespace.py +++ b/tests/checker/test_whitespace.py @@ -30,12 +30,14 @@ class TestWhitespace (LinkCheckTest): url = u" http://www.example.org/" attrs = self.get_attrs(url=url) attrs['nurl'] = "http://www.iana.org/domains/example/" + attrs['rurl'] = "http://www.iana.org/domains/example" attrs['surl'] = url.strip() resultlines = [ u"url %(surl)s" % attrs, u"cache key %(surl)s" % attrs, - u"real url %(nurl)s" % attrs, + u"real url %(rurl)s" % attrs, u"info Redirected to `%(nurl)s'." % attrs, + u"info Redirected to `%(rurl)s'." % attrs, u"warning Leading or trailing whitespace in URL `%(url)s'." % attrs, u"valid", ] @@ -43,12 +45,14 @@ class TestWhitespace (LinkCheckTest): url = u"\nhttp://www.example.org/" attrs = self.get_attrs(url=url) attrs['nurl'] = "http://www.iana.org/domains/example/" + attrs['rurl'] = "http://www.iana.org/domains/example" attrs['surl'] = url.strip() resultlines = [ u"url %(surl)s" % attrs, u"cache key %(surl)s" % attrs, - u"real url %(nurl)s" % attrs, + u"real url %(rurl)s" % attrs, u"info Redirected to `%(nurl)s'." % attrs, + u"info Redirected to `%(rurl)s'." % attrs, u"warning Leading or trailing whitespace in URL `%(url)s'." % attrs, u"valid", ] @@ -58,22 +62,26 @@ class TestWhitespace (LinkCheckTest): # Trailing whitespace url = u"http://www.example.org/ " nurl = "http://www.iana.org/domains/example/" + rurl = "http://www.iana.org/domains/example" resultlines = [ u"url %s" % url.strip(), u"cache key %s" % url.strip(), - u"real url %s" % nurl, + u"real url %s" % rurl, u"info Redirected to `%s'." % nurl, + u"info Redirected to `%s'." % rurl, u"warning Leading or trailing whitespace in URL `%s'." % url, u"valid", ] self.direct(url, resultlines) url = u"http://www.example.org/\n" nurl = "http://www.iana.org/domains/example/" + rurl = "http://www.iana.org/domains/example" resultlines = [ u"url %s" % url.strip(), u"cache key %s" % url.strip(), - u"real url %s" % nurl, + u"real url %s" % rurl, u"info Redirected to `%s'." % nurl, + u"info Redirected to `%s'." % rurl, u"warning Leading or trailing whitespace in URL `%s'." % url, u"valid", ]