Merge branch 'testing' of https://github.com/genenetwork/genenetwork2 into testing

* Fix conflicts

2 files changed, 23 insertions, 7 deletions

diff --git a/test/requests/link_checker.py b/test/requests/link_checker.py
index a75327f0..715f330c 100644
--- a/test/requests/link_checker.py
+++ b/test/requests/link_checker.py
@@ -4,6 +4,8 @@ import requests
 from lxml.html import parse
 from requests.exceptions import ConnectionError
 
+DO_FAIL=False  # fail on error
+
 def is_root_link(link):
     pattern = re.compile("^/$")
     return pattern.match(link)
@@ -29,28 +31,36 @@ def get_links(doc):
               , doc.cssselect("a")))
 
 def verify_link(link):
+    if link[0] == "#":
+        # local link on page
+        return
+    print("verifying "+link)
     try:
-        result = requests.get(link, timeout=20)
+        result = requests.get(link, timeout=20, verify=False)
         if result.status_code == 200:
             print(link+" ==> OK")
+        elif result.status_code == 307:
+            print(link+" ==> REDIRECT")
         else:
             print("ERROR: link `"+link+"` failed with status "
                   , result.status_code)
-    except Exception as ex:
-        print("ERROR: ("+link+")", ex)
+
+            if DO_FAIL:
+                raise Exception("Failed verify")
+    except ConnectionError as ex:
+        print("ERROR: ", link, ex)
+        if DO_FAIL:
+            raise ex
 
 def check_page(host, start_url):
     print("")
-    print("Checking links in page `"+start_url+"`")
+    print("Checking links host "+host+" in page `"+start_url+"`")
     doc = parse(start_url).getroot()
     links = get_links(doc)
     in_page_links = filter(is_in_page_link, links)
     internal_links = filter(is_internal_link, links)
     external_links = filter(lambda x: not (is_internal_link(x) or is_in_page_link(x)), links)
 
-    for link in in_page_links:
-        verify_link(start_url+link)
-
     for link in internal_links:
         verify_link(host+link)
 
diff --git a/test/requests/test-website.py b/test/requests/test-website.py
index f03c148a..a33fe708 100755
--- a/test/requests/test-website.py
+++ b/test/requests/test-website.py
@@ -9,12 +9,16 @@ from link_checker import check_links
 from mapping_tests import check_mapping
 from navigation_tests import check_navigation
 from main_web_functionality import check_main_web_functionality
+import link_checker
+import sys
 
 print("Mechanical Rob firing up...")
 
 def run_all(args_obj, parser):
     print("")
     print("Running all tests.")
+    print(args_obj)
+    link_checker.DO_FAIL = args_obj.fail
     check_main_web_functionality(args_obj, parser)
     check_links(args_obj, parser)
     check_mapping(args_obj, parser)
@@ -33,6 +37,8 @@ This is Mechanical-Rob - an automated web server tester for
 """
 parser = argparse.ArgumentParser(description=desc)
 
+parser.add_argument("--fail", help="Fail and stop on any error", action="store_true")
+
 parser.add_argument("-d", "--database", metavar="DB", type=str
                     , default="db_webqtl_s"
                     , help="Use database (default db_webqtl_s)")