diff --git a/tests/checker/data/Bookmarks.result b/tests/checker/data/Bookmarks.result index 66ec50ee..0810797f 100644 --- a/tests/checker/data/Bookmarks.result +++ b/tests/checker/data/Bookmarks.result @@ -7,7 +7,6 @@ valid url http://example.com/ cache key http://example.com/ -real url http://www.iana.org/domains/example/ +real url http://example.com/ name Testlink -info Redirected to `http://www.iana.org/domains/example/'. valid diff --git a/tests/checker/data/archive.html.result b/tests/checker/data/archive.html.result index f540d9cc..a4cd630e 100644 --- a/tests/checker/data/archive.html.result +++ b/tests/checker/data/archive.html.result @@ -12,7 +12,5 @@ valid url http://www.example.com cache key http://www.example.com -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'. +real url http://www.example.com valid diff --git a/tests/checker/data/file.doc.result b/tests/checker/data/file.doc.result index 907cb14f..b2b13da2 100644 --- a/tests/checker/data/file.doc.result +++ b/tests/checker/data/file.doc.result @@ -7,8 +7,7 @@ valid url http://www.example.org/ cache key http://www.example.org/ -real url http://www.iana.org/domains/example +real url http://www.example.com/ name Example.org -info Redirected to `http://www.iana.org/domains/example/'. -info Redirected to `http://www.iana.org/domains/example'. +info Redirected to `http://www.example.com/'. valid diff --git a/tests/checker/data/http_lowercase.html.result b/tests/checker/data/http_lowercase.html.result index 7d5b20f7..56e81a36 100644 --- a/tests/checker/data/http_lowercase.html.result +++ b/tests/checker/data/http_lowercase.html.result @@ -6,9 +6,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.example.com/ name l1 -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/http_quotes.html.result b/tests/checker/data/http_quotes.html.result index 2735d020..c0ac0010 100644 --- a/tests/checker/data/http_quotes.html.result +++ b/tests/checker/data/http_quotes.html.result @@ -6,10 +6,8 @@ valid url http://example.com/ cache key http://example.com/ -real url http://www.iana.org/domains/example +real url http://example.com/ name unquoted -info Redirected to `http://www.iana.org/domains/example/'. -info Redirected to `http://www.iana.org/domains/example'. valid url /stalter&sohn @@ -20,8 +18,6 @@ error url http://www.example.com/ cache key http://www.example.com/ -real url http://www.iana.org/domains/example +real url http://www.example.com/ name no beginning quote 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/http_slash.html.result b/tests/checker/data/http_slash.html.result index e00c5077..9e3b490d 100644 --- a/tests/checker/data/http_slash.html.result +++ b/tests/checker/data/http_slash.html.result @@ -6,10 +6,8 @@ valid url http://www.example.com/1 cache key http://www.example.com/1 -real url http://www.iana.org/domains/example +real url http://www.example.com/1 name ok example -info Redirected to `http://www.iana.org/domains/example/'. -info Redirected to `http://www.iana.org/domains/example'. valid url http:/www.example.com/2 @@ -26,10 +24,8 @@ error url //www.example.com/4 cache key http://www.example.com/4 -real url http://www.iana.org/domains/example +real url http://www.example.com/4 name no scheme example -info Redirected to `http://www.iana.org/domains/example/'. -info Redirected to `http://www.iana.org/domains/example'. valid url http:// diff --git a/tests/checker/data/misc.html.result b/tests/checker/data/misc.html.result index 527fc048..89ae37fe 100644 --- a/tests/checker/data/misc.html.result +++ b/tests/checker/data/misc.html.result @@ -7,9 +7,7 @@ valid url http://www.example.com/ cache key http://www.example.com/ -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'. +real url http://www.example.com/ 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 2a4c4f9a..ea00f43f 100644 --- a/tests/checker/data/plist_binary/Bookmarks.plist.result +++ b/tests/checker/data/plist_binary/Bookmarks.plist.result @@ -7,16 +7,12 @@ valid url http://www.example.com/ cache key http://www.example.com/ -real url http://www.iana.org/domains/example +real url http://www.example.com/ 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.example.net/ 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 b0634f09..22f05038 100644 --- a/tests/checker/data/plist_xml/Bookmarks.plist.result +++ b/tests/checker/data/plist_xml/Bookmarks.plist.result @@ -9,16 +9,12 @@ valid url http://www.example.com/ cache key http://www.example.com/ -real url http://www.iana.org/domains/example +real url http://www.example.com/ 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.example.net/ 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 fbe28d8f..1ea7438d 100644 --- a/tests/checker/data/redir.html.result +++ b/tests/checker/data/redir.html.result @@ -6,9 +6,7 @@ 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.example.com/ 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 c447bb54..f3d6973e 100644 --- a/tests/checker/test_http_misc.py +++ b/tests/checker/test_http_misc.py @@ -39,9 +39,7 @@ 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"info Redirected to `http://www.iana.org/domains/example/'.", - u"info Redirected to `http://www.iana.org/domains/example'.", + u"real url http://www.example.org/", u"valid", ] self.direct(url, resultlines, recursionlevel=1) diff --git a/tests/checker/test_urllen.py b/tests/checker/test_urllen.py index e57499c4..1971235b 100644 --- a/tests/checker/test_urllen.py +++ b/tests/checker/test_urllen.py @@ -28,16 +28,12 @@ class TestURLLength(LinkCheckTest): def test_url_warn(self): 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 %(rurl)s" % attrs, - u"info Redirected to `%(nurl)s'." % attrs, - u"info Redirected to `%(rurl)s'." % attrs, + u"real url %(url)s" % attrs, u"warning URL length 279 is longer than 255.", - u"valid", + u"error", ] self.direct(url, resultlines) diff --git a/tests/checker/test_whitespace.py b/tests/checker/test_whitespace.py index 5fbdf694..a35188c8 100644 --- a/tests/checker/test_whitespace.py +++ b/tests/checker/test_whitespace.py @@ -29,30 +29,22 @@ class TestWhitespace (LinkCheckTest): # Leading whitespace 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 %(rurl)s" % attrs, - u"info Redirected to `%(nurl)s'." % attrs, - u"info Redirected to `%(rurl)s'." % attrs, + u"real url %(surl)s" % attrs, u"warning Leading or trailing whitespace in URL `%(url)s'." % attrs, u"valid", ] self.direct(url, resultlines) 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 %(rurl)s" % attrs, - u"info Redirected to `%(nurl)s'." % attrs, - u"info Redirected to `%(rurl)s'." % attrs, + u"real url %(surl)s" % attrs, u"warning Leading or trailing whitespace in URL `%(url)s'." % attrs, u"valid", ] @@ -61,27 +53,19 @@ class TestWhitespace (LinkCheckTest): def test_trailing_whitespace (self): # 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" % rurl, - u"info Redirected to `%s'." % nurl, - u"info Redirected to `%s'." % rurl, + u"real url %s" % url.strip(), 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" % rurl, - u"info Redirected to `%s'." % nurl, - u"info Redirected to `%s'." % rurl, + u"real url %s" % url.strip(), u"warning Leading or trailing whitespace in URL `%s'." % url, u"valid", ]