1 files changed, 19 insertions, 22 deletions

diff --git a/bitbake/lib/toaster/contrib/tts/urlcheck.py b/bitbake/lib/toaster/contrib/tts/urlcheck.py
index a94af5000b..86d7caac2a 100644
--- a/bitbake/lib/toaster/contrib/tts/urlcheck.py
+++ b/bitbake/lib/toaster/contrib/tts/urlcheck.py
@@ -7,38 +7,35 @@ import time
 import config
 import urllist
 
-# TODO: spawn server here
-BASEURL="http://localhost:8000/"
-
-#def print_browserlog(url):
-#    driver = webdriver.Firefox()
-#    driver.get(url)
-#    body = driver.find_element_by_tag_name("body")
-#    body.send_keys(Keys.CONTROL + 't')
-#    for i in driver.get_log('browser'):
-#        print(i)
-#    driver.close()
-
 
 # TODO: turn to a test
-def validate_html(url):
+def validate_html5(url):
     h = httplib2.Http(".cache")
+    status = "Failed"
+    errors = -1
+    warnings = -1
+
     # TODO: the w3c-validator must be a configurable setting
-    urlrequest = "http://icarus.local/w3c-validator/check?doctype=HTML5&uri="+url
+    urlrequest = config.W3C_VALIDATOR+url
     try:
         resp, content = h.request(urlrequest, "HEAD")
-        if resp['x-w3c-validator-status'] == "Abort":
-            config.logger.error("FAILed call %s" % url)
-        else:
-            config.logger.error("url %s is %s\terrors %s warnings %s (check at %s)" % (url, resp['x-w3c-validator-status'], resp['x-w3c-validator-errors'], resp['x-w3c-validator-warnings'], urlrequest))
+        if resp['x-w3c-validator-status'] != "Abort":
+            status = resp['x-w3c-validator-status']
+            errors = int(resp['x-w3c-validator-errors'])
+            warnings = int(resp['x-w3c-validator-warnings'])
     except Exception as e:
         config.logger.warn("Failed validation call: %s" % e.__str__())
-
-    print("done %s" % url)
+    return (status, errors, warnings)
 
 if __name__ == "__main__":
+    print("Testing %s with %s" % (config.TOASTER_BASEURL, config.W3C_VALIDATOR))
+
+    def print_validation(url):
+        status, errors, warnings = validate_html5(url)
+        config.logger.error("url %s is %s\terrors %s warnings %s (check at %s)" % (url, status, errors, warnings, config.W3C_VALIDATOR+url))
+
     if len(sys.argv) > 1:
-        validate_html(sys.argv[1])
+        print_validation(sys.argv[1])
     else:
         for url in urllist.URLS:
-            validate_html(BASEURL+url)
+            print_validation(config.TOASTER_BASEURL+url)