From f5100138ff2ff5785c0a91cdf9531ae0446c928e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Dlouh=C3=BD?= Date: Tue, 14 Feb 2017 10:47:15 +0100 Subject: [PATCH] fix tests that fail because of changed linkchecker output --- tests/checker/data/file.html.result | 6 ------ tests/checker/data/http.html.result | 5 ----- tests/checker/data/http_lowercase.html.result | 6 ------ tests/checker/data/http_slash.html.result | 6 ------ tests/checker/data/misc.html.result | 10 ---------- tests/checker/test_file.py | 5 ----- tests/checker/test_http_redirect.py | 7 ------- 7 files changed, 45 deletions(-) diff --git a/tests/checker/data/file.html.result b/tests/checker/data/file.html.result index 702e8994..a43ee61d 100644 --- a/tests/checker/data/file.html.result +++ b/tests/checker/data/file.html.result @@ -10,9 +10,3 @@ real url javascript:loadthis() name javascript url info Javascript URL ignored. valid - -url file.html -cache key file://%(curdir)s/%(datadir)s/file.html -real url file://%(curdir)s/%(datadir)s/file.html -name relative url -valid diff --git a/tests/checker/data/http.html.result b/tests/checker/data/http.html.result index 1a816a2e..344c4a57 100644 --- a/tests/checker/data/http.html.result +++ b/tests/checker/data/http.html.result @@ -9,11 +9,6 @@ real url clsid:12345-67890 info Clsid URL ignored. valid -url -cache key http://localhost:%(port)d/%(datadir)s/http.html -real url http://localhost:%(port)d/%(datadir)s/http.html -valid - url dns://www.example.org cache key dns://www.example.org real url dns://www.example.org diff --git a/tests/checker/data/http_lowercase.html.result b/tests/checker/data/http_lowercase.html.result index f79a8d3f..f3e62b9e 100644 --- a/tests/checker/data/http_lowercase.html.result +++ b/tests/checker/data/http_lowercase.html.result @@ -8,9 +8,3 @@ cache key http://www.example.com/ real url http://www.example.com/ name l1 valid - -url HTTP://WWW.EXAMPLE.COM/ -cache key http://www.example.com/ -real url http://www.example.com/ -name l2 -valid diff --git a/tests/checker/data/http_slash.html.result b/tests/checker/data/http_slash.html.result index 9b2ec171..837bf676 100644 --- a/tests/checker/data/http_slash.html.result +++ b/tests/checker/data/http_slash.html.result @@ -38,9 +38,3 @@ cache key http://www.example.com/ real url http://www.example.com/ name ok example valid - -url //www.example.com/ -cache key http://www.example.com/ -real url http://www.example.com/ -name no scheme example -valid diff --git a/tests/checker/data/misc.html.result b/tests/checker/data/misc.html.result index 9d77f8a6..e1868d8f 100644 --- a/tests/checker/data/misc.html.result +++ b/tests/checker/data/misc.html.result @@ -4,11 +4,6 @@ real url file://%(curdir)s/%(datadir)s/misc.html name %(datadir)s/misc.html valid -url -cache key file://%(curdir)s/%(datadir)s/misc.html -real url file://%(curdir)s/%(datadir)s/misc.html -valid - url http://www.example.com/ cache key http://www.example.com/ real url http://www.example.com/ @@ -19,11 +14,6 @@ cache key file://%(curdir)s/%(datadir)s/favicon.ico real url file://%(curdir)s/%(datadir)s/favicon.ico valid -url favicon.ico -cache key file://%(curdir)s/%(datadir)s/favicon.ico -real url file://%(curdir)s/%(datadir)s/favicon.ico -valid - url test.swf cache key file://%(curdir)s/%(datadir)s/test.swf real url file://%(curdir)s/%(datadir)s/test.swf diff --git a/tests/checker/test_file.py b/tests/checker/test_file.py index ef42017f..3d77898c 100644 --- a/tests/checker/test_file.py +++ b/tests/checker/test_file.py @@ -169,10 +169,5 @@ class TestFile (LinkCheckTest): u"real url %s" % nurl3, u"name t.txt", u"valid", - u"url t.txt", - u"cache key %s" % nurl3, - u"real url %s" % nurl3, - u"name External link", - u"valid", ] self.direct(url, resultlines, recursionlevel=2) diff --git a/tests/checker/test_http_redirect.py b/tests/checker/test_http_redirect.py index 36df0739..f212d98e 100644 --- a/tests/checker/test_http_redirect.py +++ b/tests/checker/test_http_redirect.py @@ -57,13 +57,6 @@ class TestHttpRedirect (HttpServerTest): u"real url %s" % rurl, u"info Redirected to `%s'." % rurl, u"valid", - u"url newurl.html", - u"cache key %s" % nurl, - u"real url %s" % rurl, - u"name Recursive Redirect", - # XXX the info is copied from the cached result - u"info Redirected to `%s'." % rurl, - u"valid", ] self.direct(url, resultlines, recursionlevel=99)