From 73d38769b92d565cdae5a0c65550dd8c27e728f3 Mon Sep 17 00:00:00 2001 From: Sean-M Date: Thu, 21 Feb 2013 10:46:29 -0500 Subject: [PATCH] improved test functionality --- Testing/script/config.xml | 2 ++ Testing/script/regression.py | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Testing/script/config.xml b/Testing/script/config.xml index 2fc320fc16..c5482529ae 100644 --- a/Testing/script/config.xml +++ b/Testing/script/config.xml @@ -35,4 +35,6 @@ It is up to the user to distinguish between the paths when adding to this file. + + \ No newline at end of file diff --git a/Testing/script/regression.py b/Testing/script/regression.py index 249f66dcde..4dfb6c8431 100644 --- a/Testing/script/regression.py +++ b/Testing/script/regression.py @@ -381,13 +381,14 @@ def run_config_test(config_file): if file_exists(value): values.append(value) html_add_images(values) + images = [] # Run the test for each file in the configuration global args if(args.contin): #set all times an image has been processed to 0 for element in parsed.getElementsByTagName("image"): value = element.getAttribute("value").encode().decode("utf-8") - counts[value] = 0 + images.append(value) #Begin infiniloop if(newDay()): global daycount @@ -402,6 +403,8 @@ def run_config_test(config_file): pid = subprocess.Popen(nxtproc, stdout=subprocess.PIPE) sys.exit() + for img in images + run_test(img, 0 ) else: for img in values: if file_exists(img): @@ -1609,6 +1612,8 @@ def send_email(): global errorem global attachl global html + if(not args.config) + sys.exit() element = parsed.getElementsByTagName("email")[0] toval = element.getAttribute("value").encode().decode("utf-8") element = parsed.getElementsByTagName("mail_server")[0]