From b71746e76e729571b80959578203a4b71681fa27 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:49:44 +0000
Subject: [PATCH] Skip more irrelevant tests if the server has an older
 version.

---
 org.glite.testsuites.ctb/LB/tests/lb-test-ws.sh | 46 ++++++++++++-------------
 1 file changed, 23 insertions(+), 23 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 3490ce2..530677a 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-ws.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-ws.sh
@@ -213,37 +213,37 @@ else
         		        printf "$wsglifver"
                 	        test_done
 	                fi
-		else
-			test_skipped
-		fi
 
-		printf "Check if test runs on server... "
-		localname=`$SYS_HOSTNAME -f`
+			printf "Check if test runs on server... "
+			localname=`$SYS_HOSTNAME -f`
 
-                if [ "$servername" == "$localname" ]; then
-			printf "Get rpm version... "
-			rpmversion=`$SYS_RPM -qi glite-lb-ws-interface | $SYS_GREP -E "^Version" | $SYS_SED 's/^Version\s*:\s*//' | $SYS_SED 's/\s.*$//'`
+			if [ "$servername" == "$localname" ]; then
+				printf "Get rpm version... "
+				rpmversion=`$SYS_RPM -qi glite-lb-ws-interface | $SYS_GREP -E "^Version" | $SYS_SED 's/^Version\s*:\s*//' | $SYS_SED 's/\s.*$//'`
 
-	                if [ "$rpmversion" == "" ]; then
-				printf "Unable to detect rpm version"
-        	                test_skipped
-	                else
-                	        printf "$rpmversion"
-        	                test_done
+				if [ "$rpmversion" == "" ]; then
+					printf "Unable to detect rpm version"
+					test_skipped
+				else
+					printf "$rpmversion"
+					test_done
 
-				printf "Comparing versions ($wsglifver == $rpmversion)... "
+					printf "Comparing versions ($wsglifver == $rpmversion)... "
 
-		                if [ "$wsglifver" == "$rpmversion" ]; then
-                		        test_done
-		                else
-		                        test_failed
-					print_error "Reported version differs from that indicated by RPM"
+					if [ "$wsglifver" == "$rpmversion" ]; then
+						test_done
+					else
+						test_failed
+						print_error "Reported version differs from that indicated by RPM"
 		                fi
 	                fi
+			else
+				printf "No"
+                	        test_skipped
+	                fi
 		else
-			printf "No"
-                        test_skipped
-                fi
+			test_skipped
+		fi
 	fi
 fi
 
-- 
1.8.2.3