fix tests that fail because of changed linkchecker output

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

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

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

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

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

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)

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)