From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Thu, 9 Aug 2012 07:28:38 +0000 (+0000)
Subject: Test extended to query for jobs through the jobtype attribute
X-Git-Tag: glite-lbjp-common-gss_R_3_2_4_1~18
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=fb639c83f08edc768107bc46b4170eee0cd95cfd;p=jra1mw.git

Test extended to query for jobs through the jobtype attribute
---

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-sandbox-transfer.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-sandbox-transfer.sh
index 8c16ced..0be76b1 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-sandbox-transfer.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-sandbox-transfer.sh
@@ -290,6 +290,31 @@ fi
 
 			fi
 
+			check_srv_version '>=' "2.4"
+			if [ $? -eq 0 ]; then
+				test_done
+
+				printf "Querying through EDG_WLL_QUERY_ATTR_JOB_TYPE... input SB... "
+				printf "job_type=file_transfer\njobid<>\"https://$GLITE_WMS_QUERY_SERVER/none\"\n" > query_input.$$.txt
+				${LBQUERYEXT} -C -m $GLITE_WMS_QUERY_SERVER -i query_input.$$.txt > query_output.$$.txt 2> /dev/null
+				$SYS_GREP $isbjobid query_output.$$.txt > /dev/null 2> /dev/null
+				if [ $? -gt 0 ]; then test_failed && print_error "Test job not included among results" && cat query_output.$$.txt; else test_done; fi
+				printf "output SB... "
+				$SYS_GREP $osbjobid query_output.$$.txt > /dev/null 2> /dev/null
+				if [ $? -gt 0 ]; then test_failed && print_error "Test job not included among results" && cat query_output.$$.txt; else test_done; fi
+
+				printf "Querying through EDG_WLL_QUERY_ATTR_JOB_TYPE... negative... input SB... "
+				printf "job_type<>file_transfer\njobid<>\"https://$GLITE_WMS_QUERY_SERVER/none\"\n" > query_input.$$.txt
+				${LBQUERYEXT} -C -m $GLITE_WMS_QUERY_SERVER -i query_input.$$.txt > query_output.$$.txt 2> /dev/null
+				$SYS_GREP $isbjobid query_output.$$.txt > /dev/null 2> /dev/null
+				if [ $? -eq 0 ]; then test_failed && print_error "Test job included among results" && cat query_output.$$.txt; else test_done; fi
+				printf "output SB... "
+				$SYS_GREP $osbjobid query_output.$$.txt > /dev/null 2> /dev/null
+				if [ $? -eq 0 ]; then test_failed && print_error "Test job included among results" && cat query_output.$$.txt; else test_done; fi
+			else
+				test_skipped
+			fi
+
 
 			#Purge test job
 			joblist=$$_jobs_to_purge.txt