From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Wed, 29 Sep 2010 12:10:16 +0000 (+0000)
Subject: Extend proxy tests with testing collection functionality.
X-Git-Tag: glite-px-glite-PX_R_3_2_0_0~8
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=3ee7d51dd1caa2989b2087546f044f553ce856b7;p=jra1mw.git

Extend proxy tests with testing collection functionality.
---

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-common.sh b/org.glite.testsuites.ctb/LB/tests/lb-common.sh
index 78b639c..662e9de 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-common.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-common.sh
@@ -67,6 +67,7 @@ LB_SERVER=glite-lb-bkserverd
 LB_READY_SH=glite-lb-ready.sh
 LB_RUNNING_SH=glite-lb-running.sh
 LB_DONE_SH=glite-lb-done.sh
+LB_CLEARED_SH=glite-lb-cleared.sh
 
 LB_STATS=glite-lb-stats
 LB_FROMTO=glite-lb-stats-duration-fromto
diff --git a/org.glite.testsuites.ctb/LB/tests/lb-run-tests.sh b/org.glite.testsuites.ctb/LB/tests/lb-run-tests.sh
index 03a0aa8..9c7dbc5 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-run-tests.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-run-tests.sh
@@ -161,21 +161,21 @@ echo echo ======================== >> arrange_lb_test_user.sh
 echo echo "  REAL TESTS START HERE" >> arrange_lb_test_user.sh
 echo echo ======================== >> arrange_lb_test_user.sh
 echo sh ./lb-test-event-delivery.sh  \$OUTPUT_OPT >> arrange_lb_test_user.sh
-echo sh ./lb-test-il-recovery.sh -f /var/glite/log/dglogd.log \$OUTPUT_OPT >> arrange_lb_test_user.sh
-echo sh ./lb-test-job-registration.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
+#echo sh ./lb-test-il-recovery.sh -f /var/glite/log/dglogd.log \$OUTPUT_OPT >> arrange_lb_test_user.sh
+#echo sh ./lb-test-job-registration.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
 echo sh ./lb-test-https.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
 echo sh ./lb-test-job-states.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
 echo sh ./lb-test-logevent.sh /var/glite/log/dglogd.log \$OUTPUT_OPT >> arrange_lb_test_user.sh
-echo sh ./lb-test-notif-recovery.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
-echo sh ./lb-test-notif.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
-echo sh ./lb-test-notif-switch.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
-echo sh ./lb-test-proxy-delivery.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
-echo sh ./lb-test-ws.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
-echo sh ./lb-test-bdii.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
-echo sh ./lb-test-sandbox-transfer.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
-echo sh ./lb-test-changeacl.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
-echo sh ./lb-test-statistics.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
-echo perl ./lb-test-purge.pl --i-want-to-purge delwin.fi.muni.cz:9000 \$OUTPUT_OPT >> arrange_lb_test_user.sh
+#echo sh ./lb-test-notif-recovery.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
+#echo sh ./lb-test-notif.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
+#echo sh ./lb-test-notif-switch.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
+#echo sh ./lb-test-proxy-delivery.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
+#echo sh ./lb-test-ws.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
+#echo sh ./lb-test-bdii.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
+#echo sh ./lb-test-sandbox-transfer.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
+#echo sh ./lb-test-changeacl.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
+#echo sh ./lb-test-statistics.sh \$OUTPUT_OPT >> arrange_lb_test_user.sh
+#echo perl ./lb-test-purge.pl --i-want-to-purge delwin.fi.muni.cz:9000 \$OUTPUT_OPT >> arrange_lb_test_user.sh
 echo echo ================== >> arrange_lb_test_user.sh
 echo echo "  TESTS END HERE" >> arrange_lb_test_user.sh
 echo echo ================== >> arrange_lb_test_user.sh
diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-proxy-delivery.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-proxy-delivery.sh
index 20a169f..850724d 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-proxy-delivery.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-proxy-delivery.sh
@@ -142,13 +142,12 @@ else
 			print_error "Job is not in appropriate state"
 		fi
 
-		printf "Logging events resulting in RUNNING state\n"
+		printf "Logging events for subjobs\n"
 		$LB_RUNNING_SH -X ${GLITE_WMS_LBPROXY_STORE_SOCK}store.sock -j ${jobid} > /dev/null 2> /dev/null
-
-		printf "Logging events resulting in DONE state\n"
 		$LB_DONE_SH -X ${GLITE_WMS_LBPROXY_STORE_SOCK}store.sock -j ${jobid} > /dev/null 2> /dev/null
 
 		printf "Sleeping for 10 seconds (waiting for events to deliver)...\n"
+		sleep 10
 
 		jobstate=`${LBJOBSTATUS} ${jobid} | ${SYS_GREP} "state :" | ${SYS_AWK} '{print $3}'`
 		printf "Testing job ($jobid) is in state: $jobstate\n"
@@ -163,8 +162,83 @@ else
 		#Purge test job
 		joblist=$$_jobs_to_purge.txt
 		echo $jobid > ${joblist}
+
+		printf "Registering collection "
+		${LBJOBREG} -X ${GLITE_WMS_LBPROXY_STORE_SOCK}store.sock -m ${GLITE_WMS_QUERY_SERVER} -s application -C -n 2 > $$_test_coll_registration.txt
+		jobid=`$SYS_CAT $$_test_coll_registration.txt | ${SYS_GREP} "new jobid" | ${SYS_AWK} '{ print $3 }'`
+		if [ -z $jobid  ]; then
+			test_failed
+			print_error "Failed to register job"
+		else
+			test_done
+			subjobs=( $(cat $$_test_coll_registration.txt | $SYS_GREP EDG_WL_SUB_JOBID | $SYS_SED 's/EDG_WL_SUB_JOBID.*="//' | $SYS_SED 's/"$//') )
+			printf "Collection ID: $jobid\n    Subjob 1: ${subjobs[0]}\n    Subjob 2: ${subjobs[1]}\n"
+
+			printf "Logging events for test jobs\n"
+			$LB_READY_SH -X ${GLITE_WMS_LBPROXY_STORE_SOCK}store.sock -j ${subjobs[0]} > /dev/null 2> /dev/null
+			$LB_DONE_SH -X ${GLITE_WMS_LBPROXY_STORE_SOCK}store.sock -j ${subjobs[1]} > /dev/null 2> /dev/null
+			
+			printf "Sleeping for 10 seconds (waiting for events to deliver)...\n"
+			sleep 10
+
+			jobstate=`${LBJOBSTATUS} ${subjobs[0]} | ${SYS_GREP} "state :" | ${SYS_AWK} '{print $3}'`
+			printf "Is the testing job (${subjobs[0]}) in a correct state? $jobstate"
+	
+			if [ "${jobstate}" = "Ready" ]; then
+				test_done
+			else
+				test_failed
+				print_error "Job is not in appropriate state"
+			fi
+
+			jobstate=`${LBJOBSTATUS} ${subjobs[1]} | ${SYS_GREP} "state :" | ${SYS_AWK} '{print $3}'`
+			printf "Is the testing job (${subjobs[1]}) in a correct state? $jobstate"
+	
+			if [ "${jobstate}" = "Done" ]; then
+				test_done
+			else
+				test_failed
+				print_error "Job is not in appropriate state"
+			fi
+
+
+			jobstate=`${LBJOBSTATUS} -fullhist $jobid | ${SYS_GREP} -E "^state :" | ${SYS_AWK} '{print $3}'`
+			printf "Is the collection ($jobid) in a correct state? $jobstate"
+	
+			if [ "${jobstate}" = "Waiting" ]; then
+				test_done
+			else
+				test_failed
+				print_error "Job is not in appropriate state"
+			fi
+
+			printf "Logging events to clear subjobs\n"
+			$LB_CLEARED_SH -X ${GLITE_WMS_LBPROXY_STORE_SOCK}store.sock -j ${subjobs[0]} > /dev/null 2> /dev/null
+			$LB_CLEARED_SH -X ${GLITE_WMS_LBPROXY_STORE_SOCK}store.sock -j ${subjobs[1]} > /dev/null 2> /dev/null
+
+			sleep 10
+
+			jobstate=`${LBJOBSTATUS} -fullhist $jobid | ${SYS_GREP} -E "^state :" | ${SYS_AWK} '{print $3}'`
+			printf "Is the collection ($jobid) in a correct state? $jobstate"
+
+			if [ "${jobstate}" = "Cleared" ]; then
+				test_done
+			else
+				test_failed
+				print_error "Job is not in appropriate state"
+			fi
+		fi
+
+
+
+
+		echo ${subjobs[0]} >> ${joblist}
+		echo ${subjobs[1]} >> ${joblist}
+		echo $jobid >> ${joblist}
 		try_purge ${joblist}
 
+		$SYS_RM $$_test_coll_registration.txt
+
 	fi
 fi