From 266706b259a939a2454b0e1ebf1b377be8414644 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= <sustr4@cesnet.cz>
Date: Wed, 4 May 2011 13:34:33 +0000
Subject: [PATCH] Detect srv version, skip tests for bugs fixed in L&B 3

---
 org.glite.testsuites.ctb/LB/tests/lb-test-ws.sh | 39 +++++++++++++++----------
 1 file changed, 24 insertions(+), 15 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 42d8a1a..3490ce2 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-ws.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-ws.sh
@@ -135,17 +135,21 @@ else
 			fi
 
 			#(regresion-test Savannah Bug 77002)
-			printf "Checking if doneCode unset for job not yet done..."
-		
-			doneCode=`${LBWSJOBSTATUS} -m ${servername}:${GLITE_LB_SERVER_WPORT} -j ${jobid} | ${SYS_GREP} status | ${SYS_GREP} doneCode | ${SYS_SED} 's/^.*<doneCode>//' | ${SYS_SED} 's/<\/doneCode>.*$//'`
+			printf "Checking if doneCode unset for job not yet done... "
+                	check_srv_version '>=' "2.2"
+	                if [ $? = 0 ]; then
+				doneCode=`${LBWSJOBSTATUS} -m ${servername}:${GLITE_LB_SERVER_WPORT} -j ${jobid} | ${SYS_GREP} status | ${SYS_GREP} doneCode | ${SYS_SED} 's/^.*<doneCode>//' | ${SYS_SED} 's/<\/doneCode>.*$//'`
 
-			printf "($doneCode)"
+				printf "($doneCode)"
 
-			if [ "$doneCode" == "" ]; then
-				test_done
+				if [ "$doneCode" == "" ]; then
+					test_done
+				else
+					test_failed
+					print_error "doneCode value $doneCode unexpected"
+				fi
 			else
-				test_failed
-				print_error "doneCode value $doneCode unexpected"
+				test_skipped
 			fi
 
 			printf "Is it possible to retrieve events?"
@@ -200,13 +204,18 @@ else
                 fi
 
 		printf "Getting WS interface version... "
-                wsglifver=`$LBWSGETVERSION -i -m ${servername}:${GLITE_LB_SERVER_WPORT} | $SYS_SED 's/^.*Interface version:\s*//'`
-                if [ "$wsglifver" == "" ]; then
-	                test_failed
-                else
-        	        printf "$wsglifver"
-                        test_done
-                fi
+               	check_srv_version '>=' "2.2"
+                if [ $? = 0 ]; then
+	                wsglifver=`$LBWSGETVERSION -i -m ${servername}:${GLITE_LB_SERVER_WPORT} | $SYS_SED 's/^.*Interface version:\s*//'`
+        	        if [ "$wsglifver" == "" ]; then
+	        	        test_failed
+	                else
+        		        printf "$wsglifver"
+                	        test_done
+	                fi
+		else
+			test_skipped
+		fi
 
 		printf "Check if test runs on server... "
 		localname=`$SYS_HOSTNAME -f`
-- 
1.8.2.3