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

* Fix conflicts

1 files changed, 6 insertions, 0 deletions

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)")