From ca29e54bf1323f39b8de1766b304d892e600303f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= <sustr4@cesnet.cz>
Date: Fri, 14 Nov 2008 10:05:32 +0000
Subject: [PATCH] Clean up after running the tests.

---
 org.glite.testsuites.ctb/LB/tests/lb-common.sh     |  2 ++
 .../LB/tests/lb-test-event-delivery.sh             |  2 +-
 .../LB/tests/lb-test-job-registration.sh           | 32 ++++++++++++++++------
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-common.sh b/org.glite.testsuites.ctb/LB/tests/lb-common.sh
index 2a0f3fd..0181f8c 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-common.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-common.sh
@@ -32,6 +32,8 @@ LBJOBSTATUS=glite-lb-job_status
 LBPURGE=glite-lb-purge
 LBCHANGEACL=glite-lb-change_acl
 LBMON=glite-lb-lbmon
+LBNOTIFY=glite-lb-notify
+LBPURGE=glite-lb-purge
 
 LB_LOGD=glite-lb-logd 
 LB_INTERLOGD=glite-lb-interlogd
diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-event-delivery.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-event-delivery.sh
index a1f16d0..836d1ef 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-event-delivery.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-event-delivery.sh
@@ -12,7 +12,7 @@ Prerequisities:
    - environment variables set:
 
      GLITE_LB_SERVER_PORT - if nondefault port (9000) is used
-     GLITE_LB_IL_SOCK - if nondevailt socket at /tmp/interlogger.sock is used
+     GLITE_LB_IL_SOCK - if nondefault socket at /tmp/interlogger.sock is used
      GLITE_LB_LOGGER_PORT - if nondefault port (9002) is used 	
 
 Tests called:
diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-job-registration.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-job-registration.sh
index 05d4829..ef645d5 100755
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-job-registration.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-job-registration.sh
@@ -104,17 +104,33 @@ else
 			print_error "Failed to register job"
 		else
 			test_done
-		fi
 
-		jobstate=`${LBJOBSTATUS} ${jobid} | $SYS_GREP "state :" | ${SYS_AWK} '{print $3}'`
-		printf "Is the testing job ($jobid) in a correct state? $jobstate"
+			# Check result
+			jobstate=`${LBJOBSTATUS} ${jobid} | $SYS_GREP "state :" | ${SYS_AWK} '{print $3}'`
+			printf "Is the testing job ($jobid) in a correct state? $jobstate"
+
+			if [ "${jobstate}" = "Submitted" ]; then
+				test_done
+			else
+				test_failed
+				print_error "Job has not been submitted"
+			fi
+
+			#Purge test job
+			joblist=$$_jobs_to_purge.txt
+			echo $jobid > ${joblist}
+
+			printf "Purging test job (Trying the best, result will not be tested)\n"
+
+			${LBPURGE} -j ${joblist}
+
+			rm ${joblist}
+
 
-		if [ "${jobstate}" = "Submitted" ]; then
-			test_done
-		else
-			test_failed
-			print_error "Job has not been submitted"
 		fi
+
+		
+		
 	fi
 fi
 
-- 
1.8.2.3