Include AGU methods in WS testing.

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-common.sh b/org.glite.testsuites.ctb/LB/tests/lb-common.sh
index 7978efd..c392e19 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/tests/lb-common.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-common.sh
@@ -54,6 +54,8 @@ LBMON=glite-lb-lbmon
 LBNOTIFY=glite-lb-notify
 LBPURGE=glite-lb-purge
 LBPARSEEFILE=glite-lb-parse_eventsfile
+LB4AGUACTINFO=glite-lb-ws_lb4agu_GetActivityInfo
+LB4AGUACTSTATUS=glite-lb-ws_lb4agu_GetActivityStatus
 
 LB_LOGD=glite-lb-logd 
 LB_INTERLOGD=glite-lb-interlogd

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 b7b3bb1..94ff4ec 100755 (executable)
--- 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
+check_binaries $GRIDPROXYINFO $SYS_GREP $SYS_SED $SYS_AWK $LB4AGUACTINFO $LBJOBREG $LBWSJOBSTATUS $LBWSJOBLOG
 if [ $? -gt 0 ]; then
        test_failed
 else
@@ -144,6 +144,26 @@ else
                                print_error "Job has not been submitted"
                        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
+                       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
+
                        #Purge test job
                        joblist=$$_jobs_to_purge.txt
                        echo $jobid > ${joblist}