diff options
| -rw-r--r-- | test/requests/link_checker.py | 18 | ||||
| -rwxr-xr-x | test/requests/test-website.py | 6 | ||||
| -rw-r--r-- | wqflask/wqflask/user_manager.py | 3 |
3 files changed, 22 insertions, 5 deletions
diff --git a/test/requests/link_checker.py b/test/requests/link_checker.py index 256bf6ef..64553ed8 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) @@ -25,24 +27,34 @@ 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) + 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) internal_links = filter(is_internal_link, links) external_links = filter(lambda x: not is_internal_link(x), links) - external_links.append("http://somenon-existentsite.brr") + # external_links.append("http://somenon-existentsite.brr") for link in internal_links: verify_link(host+link) diff --git a/test/requests/test-website.py b/test/requests/test-website.py index 2bef6eb1..118c9df1 100755 --- a/test/requests/test-website.py +++ b/test/requests/test-website.py @@ -8,12 +8,16 @@ import argparse from link_checker import check_links from mapping_tests import check_mapping 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) @@ -32,6 +36,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)") diff --git a/wqflask/wqflask/user_manager.py b/wqflask/wqflask/user_manager.py index c55649f3..755d64da 100644 --- a/wqflask/wqflask/user_manager.py +++ b/wqflask/wqflask/user_manager.py @@ -55,7 +55,7 @@ logger = getLogger(__name__) from base.data_set import create_datasets_list import requests -from utility.elasticsearch_tools import get_elasticsearch_connection, get_user_by_unique_column, save_user +from utility.elasticsearch_tools import es, get_elasticsearch_connection, get_user_by_unique_column, save_user THREE_DAYS = 60 * 60 * 24 * 3 #THREE_DAYS = 45 @@ -466,7 +466,6 @@ def password_reset(): @app.route("/n/password_reset_step2", methods=('POST',)) def password_reset_step2(): - from utility.elasticsearch_tools import es logger.debug("in password_reset request.url is:", request.url) errors = [] |