extract sitespeed timeout to own config

SAMPLE-config.py

@@ -33,6 +33,9 @@
 # Tells sitespeed if we should use it as a docker image or a npm package
 sitespeed_use_docker = True
 
+# Tells sitespeed max timeout for website calls
+sitespeed_timeout = 300
+
 # how many iterations of Sitespeed.io requests would you like? Has to be at least 2 not to fail
 sitespeed_iterations = 2
 

tests/css_validator_w3c.py

@@ -21,6 +21,11 @@
 css_review_group_errors = config.css_review_group_errors
 review_show_improvements_only = config.review_show_improvements_only
 sitespeed_use_docker = config.sitespeed_use_docker
+try:
+    sitespeed_timeout = config.sitespeed_timeout
+except:
+    # If sitespeed timeout is not set in config.py this will be the default
+    sitespeed_timeout = 600
 try:
     use_cache = config.cache_when_possible
     cache_time_delta = config.cache_time_delta
@@ -63,7 +68,7 @@ def run_test(_, langCode, url):
     sitespeed_arg += ' --postScript chrome-cookies.cjs --postScript chrome-versions.cjs'
 
     (result_folder_name, filename) = get_result(
-        url, sitespeed_use_docker, sitespeed_arg, request_timeout * 5)
+        url, sitespeed_use_docker, sitespeed_arg, sitespeed_timeout)
 
     # 1. Visit page like a normal user
     data = identify_files(filename)

tests/html_validator_w3c.py

@@ -14,6 +14,11 @@
 useragent = config.useragent
 review_show_improvements_only = config.review_show_improvements_only
 sitespeed_use_docker = config.sitespeed_use_docker
+try:
+    sitespeed_timeout = config.sitespeed_timeout
+except:
+    # If sitespeed timeout is not set in config.py this will be the default
+    sitespeed_timeout = 600
 try:
     use_cache = config.cache_when_possible
     cache_time_delta = config.cache_time_delta
@@ -55,7 +60,7 @@ def run_test(_, langCode, url):
     sitespeed_arg += ' --postScript chrome-cookies.cjs --postScript chrome-versions.cjs'
 
     (result_folder_name, filename) = get_result(
-        url, sitespeed_use_docker, sitespeed_arg, request_timeout * 5)
+        url, sitespeed_use_docker, sitespeed_arg, sitespeed_timeout)
 
     # 1. Visit page like a normal user
     data = identify_files(filename)

tests/sitespeed_base.py

@@ -100,7 +100,6 @@ def get_result(url, sitespeed_use_docker, sitespeed_arg, timeout):
         versions_json = json.loads(versions)
 
         if (os.path.exists(filename_old)):
-            print('A')
             modify_browsertime_content(filename_old, cookies_json, versions_json)
             cleanup_results_dir(filename_old, result_folder_name)
             return (result_folder_name, filename)

tests/software.py

@@ -30,6 +30,11 @@
 except:
     # If browser is not set in config.py this will be the default
     software_browser = 'chrome'
+try:
+    sitespeed_timeout = config.sitespeed_timeout
+except:
+    # If sitespeed timeout is not set in config.py this will be the default
+    sitespeed_timeout = 600
 try:
     use_cache = config.cache_when_possible
     cache_time_delta = config.cache_time_delta
@@ -104,7 +109,7 @@ def get_rating_from_sitespeed(url, _local, _):
     sitespeed_arg += ' --postScript chrome-cookies.cjs --postScript chrome-versions.cjs'
 
     (result_folder_name, filename) = get_result(
-        url, sitespeed_use_docker, sitespeed_arg, request_timeout * 5)
+        url, sitespeed_use_docker, sitespeed_arg, sitespeed_timeout)
 
 
     o = urlparse(url)

tests/tracking_validator.py

@@ -17,6 +17,11 @@
 useragent = config.useragent
 review_show_improvements_only = config.review_show_improvements_only
 sitespeed_use_docker = config.sitespeed_use_docker
+try:
+    sitespeed_timeout = config.sitespeed_timeout
+except:
+    # If sitespeed timeout is not set in config.py this will be the default
+    sitespeed_timeout = 600
 try:
     use_cache = config.cache_when_possible
     cache_time_delta = config.cache_time_delta
@@ -785,7 +790,7 @@ def get_rating_from_sitespeed(url, _local, _):
     sitespeed_arg += ' --postScript chrome-cookies.cjs --postScript chrome-versions.cjs'
 
     (result_folder_name, filename) = get_result(
-        url, sitespeed_use_docker, sitespeed_arg, request_timeout * 5)
+        url, sitespeed_use_docker, sitespeed_arg, sitespeed_timeout)
 
     http_archive_content = get_file_content(filename)