From 8e5231a1aac3ef10a1c180f6e79c6383dbba4dc8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Tue, 27 Apr 2010 13:00:48 +0000
Subject: [PATCH] Tuning test output for LB >= 2.0 (no lb4agu yet).

---
 org.glite.testsuites.ctb/LB/tests/lb-test-ws.sh | 38 ++++++++++++++-----------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-ws.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-ws.sh
index 94ff4ec..65824ac 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-ws.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-ws.sh
@@ -90,7 +90,7 @@ test_start
 
 # check_binaries
 printf "Testing if all binaries are available"
-check_binaries $GRIDPROXYINFO $SYS_GREP $SYS_SED $SYS_AWK $LB4AGUACTINFO $LBJOBREG $LBWSJOBSTATUS $LBWSJOBLOG
+check_binaries $GRIDPROXYINFO $SYS_GREP $SYS_SED $SYS_AWK $LBJOBREG $LBWSJOBSTATUS $LBWSJOBLOG
 if [ $? -gt 0 ]; then
 	test_failed
 else
@@ -145,23 +145,27 @@ else
 			fi
 
 			printf "Is it possible to retrieve AGU activity info?"
-
-			${LB4AGUACTINFO} -j ${jobid} -m ${servername}:${GLITE_LB_SERVER_WPORT} | $SYS_GREP "${jobid}" >> /dev/null
-	                if [ $? = 0 ]; then
-				test_done
+			check_binaries ${LB4AGUACTINFO} ${LB4AGUACTSTATUS}
+			if [ $? -gt 0 ]; then
+				test_missed
 			else
-				test_failed
-				print_error "Job Activity Info returned"
-			fi
-
-			printf "Does AGU activity status return correct state?"
-
-			${LB4AGUACTSTATUS} -j ${jobid} -m ${servername}:${GLITE_LB_SERVER_WPORT} | $SYS_GREP "urn:org.glite.lb:Submitted" >> /dev/null
-	                if [ $? = 0 ]; then
-				test_done
-			else
-				test_failed
-				print_error "Reported status is Running"
+				${LB4AGUACTINFO} -j ${jobid} -m ${servername}:${GLITE_LB_SERVER_WPORT} | $SYS_GREP "${jobid}" >> /dev/null
+		                if [ $? = 0 ]; then
+					test_done
+				else
+					test_failed
+					print_error "Job Activity Info returned"
+				fi
+
+				printf "Does AGU activity status return correct state?"
+
+				${LB4AGUACTSTATUS} -j ${jobid} -m ${servername}:${GLITE_LB_SERVER_WPORT} | $SYS_GREP "urn:org.glite.lb:Submitted" >> /dev/null
+		                if [ $? = 0 ]; then
+					test_done
+				else
+					test_failed
+					print_error "Reported status is Running"
+				fi
 			fi
 
 			#Purge test job
-- 
1.8.2.3