From e327b7a7251f8050ae652aaced3ddeab6638ccac Mon Sep 17 00:00:00 2001
From: Erik Kooistra <kooistra@astron.nl>
Date: Tue, 12 Jun 2018 10:48:29 +0000
Subject: [PATCH] Corrected check PASSED with get_test_result().
---
applications/apertif/commissioning/tests/batch_test.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/applications/apertif/commissioning/tests/batch_test.py b/applications/apertif/commissioning/tests/batch_test.py
index 168127714b..c34ce01bde 100644
--- a/applications/apertif/commissioning/tests/batch_test.py
+++ b/applications/apertif/commissioning/tests/batch_test.py
@@ -171,10 +171,12 @@ def get_test_result(machines):
tc.set_result('FAILED')
elif cm.find_string_in_file(logFilename, 'Test result: PASSED')>=0:
tc.append_log(3, '%s test went OK' % mi)
+ elif cm.find_string_in_file(logFilename, 'Utility result: PASSED')>=0:
+ tc.append_log(3, '%s test went OK' % mi)
else:
# This check will detect if the command did not complete on the machine, e.g. due to a Python error in the script
tc.append_log(2, '%s test result unknown' % mi)
- tc.set_result('FAILED')
+ #tc.set_result('FAILED')
###############################################################################
@@ -214,7 +216,7 @@ for lcu in LCUS:
tc.append_log_file(3, log_filename)
# Update machine test result in global tc object
- get_test_result(MACHINES)
+ get_test_result(LCUS)
################################################################################
## Run commands that simulatenously dishes and central in foreground
--
GitLab