git://scientific.zcu.cz / jra1mw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e090d86)
- rm generalized
authorZdeněk Šustr <sustr4@cesnet.cz>
Thu, 21 Jan 2010 20:04:56 +0000 (20:04 +0000)
committerZdeněk Šustr <sustr4@cesnet.cz>
Thu, 21 Jan 2010 20:04:56 +0000 (20:04 +0000)
- il recovery test fixed to allow il run under a different account.

16 files changed:
org.glite.testsuites.ctb/LB/tests/lb-common.sh patch | blob | blame | history
org.glite.testsuites.ctb/LB/tests/lb-test-event-delivery.sh patch | blob | blame | history
org.glite.testsuites.ctb/LB/tests/lb-test-https.sh patch | blob | blame | history
org.glite.testsuites.ctb/LB/tests/lb-test-il-recovery.sh patch | blob | blame | history
org.glite.testsuites.ctb/LB/tests/lb-test-job-registration.sh patch | blob | blame | history
org.glite.testsuites.ctb/LB/tests/lb-test-job-states.sh patch | blob | blame | history
org.glite.testsuites.ctb/LB/tests/lb-test-logevent.sh patch | blob | blame | history
org.glite.testsuites.ctb/LB/tests/lb-test-logger-local.sh patch | blob | blame | history
org.glite.testsuites.ctb/LB/tests/lb-test-logger-remote.sh patch | blob | blame | history
org.glite.testsuites.ctb/LB/tests/lb-test-notif-recovery.sh patch | blob | blame | history
org.glite.testsuites.ctb/LB/tests/lb-test-notif-switch.sh patch | blob | blame | history
org.glite.testsuites.ctb/LB/tests/lb-test-notif.sh patch | blob | blame | history
org.glite.testsuites.ctb/LB/tests/lb-test-proxy-delivery.sh patch | blob | blame | history
org.glite.testsuites.ctb/LB/tests/lb-test-server-local.sh patch | blob | blame | history
org.glite.testsuites.ctb/LB/tests/lb-test-server-remote.sh patch | blob | blame | history
org.glite.testsuites.ctb/LB/tests/lb-test-ws.sh patch | blob | blame | history

diff --git a/org.glite.testsuites.ctb/LB/tests/lb-common.sh b/org.glite.testsuites.ctb/LB/tests/lb-common.sh
index cd7fa6f..62c70ae 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/tests/lb-common.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-common.sh
@@ -76,6 +76,8 @@ SYS_AWK=awk
 SYS_ECHO=echo
 SYS_DOMAINNAME=domainname
 SYS_CURL=curl
+SYS_RM="rm -f"
+SYS_CHMOD=chmod
 
 # not used at the moment
 DEBUG=2
@@ -207,7 +209,7 @@ function try_purge()
 
                         ${LBPURGE} -j ${joblist}
 
-                        rm ${joblist}
+                        $SYS_RM ${joblist}
        
 }
 
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 fee7120..05b8300 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-event-delivery.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-event-delivery.sh
@@ -162,7 +162,7 @@ test_end
 
 if [ $flag -ne 1 ]; then
        cat $logfile
-       rm $logfile
+       $SYS_RM $logfile
 fi
 exit $TEST_OK
 
diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-https.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-https.sh
index 219f786..923bcde 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-https.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-https.sh
@@ -141,7 +141,7 @@ else
                                                test_done
                                        fi
 
-                                       rm https.$$.tmp
+                                       $SYS_RM https.$$.tmp
 
                                fi
 
@@ -167,7 +167,7 @@ else
                                                test_done
                                        fi
 
-                                       rm https.$$.tmp
+                                       $SYS_RM https.$$.tmp
 
                                fi
 
@@ -215,7 +215,7 @@ else
                                                test_done
                                        fi
 
-                                       rm https.$$.tmp
+                                       $SYS_RM https.$$.tmp
 
                                 fi
 
@@ -249,7 +249,7 @@ test_end
 
 if [ $flag -ne 1 ]; then
        cat $logfile
-       rm $logfile
+       $SYS_RM $logfile
 fi
 exit $TEST_OK
 
diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-il-recovery.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-il-recovery.sh
index 2744d2a..328e703 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-il-recovery.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-il-recovery.sh
@@ -157,6 +157,10 @@ else
                        # log events:
                        printf "Generating events resulting in CLEARED state\n"
 
+                       #Make sure the il is able to access the file, whatever account it is running under. 
+                       $SYS_TOUCH $EVENTFILE.$UNIQUE
+                       $SYS_CHMOD 666 $EVENTFILE.$UNIQUE
+
                        generate_done_events "$EVENTFILE.$UNIQUE" "$USERIDENTITY" "$DOMAINNAME" $jobid
 
                        #Stopping interlogger (if required)
@@ -197,7 +201,7 @@ test_end
 
 if [ $flag -ne 1 ]; then
        cat $logfile
-       rm $logfile
+       $SYS_RM $logfile
 fi
 exit $TEST_OK
 
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 fd916a1..985dc4d 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-job-registration.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-job-registration.sh
@@ -133,7 +133,7 @@ test_end
 
 if [ $flag -ne 1 ]; then
        cat $logfile
-       rm $logfile
+       $SYS_RM $logfile
 fi
 exit $TEST_OK
 
diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-job-states.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-job-states.sh
index 2aeb507..8a3b42d 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-job-states.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-job-states.sh
@@ -219,7 +219,7 @@ test_end
 
 if [ $flag -ne 1 ]; then
        cat $logfile
-       rm $logfile
+       $SYS_RM $logfile
 fi
 exit $TEST_OK
 
diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-logevent.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-logevent.sh
index bfe670d..5e5c37d 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-logevent.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-logevent.sh
@@ -269,8 +269,8 @@ else
                        fi
 
                        echo Cleaning up
-                       rm events.tested.$$.txt
-                       rm events.reference.$$.txt
+                       $SYS_RM events.tested.$$.txt
+                       $SYS_RM events.reference.$$.txt
                else
                        test_failed
                        echo ""
@@ -297,7 +297,7 @@ test_end
 
 if [ $flag -ne 1 ]; then
        cat $logfile
-       rm $logfile
+       $SYS_RM $logfile
 fi
 exit $TEST_OK
 
diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-logger-local.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-logger-local.sh
index 9a8f9dc..4e34452 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-logger-local.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-logger-local.sh
@@ -129,7 +129,7 @@ test_end
 
 if [ $flag -ne 1 ]; then
        cat $logfile
-       rm $logfile
+       $SYS_RM $logfile
 fi
 exit $TEST_OK
 
diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-logger-remote.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-logger-remote.sh
index 28ebd84..183c0c6 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-logger-remote.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-logger-remote.sh
@@ -115,7 +115,7 @@ test_end
 
 if [ $flag -ne 1 ]; then
        cat $logfile
-       rm $logfile
+       $SYS_RM $logfile
 fi
 exit $TEST_OK
 
diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-notif-recovery.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-notif-recovery.sh
index 6477be5..14aa6b6 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-notif-recovery.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-notif-recovery.sh
@@ -150,7 +150,7 @@ else
                                test_failed
                        fi
 
-                       rm $$_notifications.txt
+                       $SYS_RM $$_notifications.txt
 
                        #Drop notification
                        printf "Dropping the test notification (${notifid})"
@@ -176,7 +176,7 @@ test_end
 
 if [ $flag -ne 1 ]; then
        cat $logfile
-       rm $logfile
+       $SYS_RM $logfile
 fi
 exit $TEST_OK
 
diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-notif-switch.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-notif-switch.sh
index c76bc5c..95d9082 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-notif-switch.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-notif-switch.sh
@@ -150,7 +150,7 @@ else
                                test_failed
                        fi
 
-                       rm $$_notifications.txt
+                       $SYS_RM $$_notifications.txt
 
                        printf "Changing notification ... "
                        $LBNOTIFY change ${notifid} ${otherjobid}
@@ -197,7 +197,7 @@ else
                                test_failed
                        fi
 
-                       rm $$_notifications.txt
+                       $SYS_RM $$_notifications.txt
 
                        #Drop notification
                        printf "Dropping the test notification (${notifid})"
@@ -224,7 +224,7 @@ test_end
 
 if [ $flag -ne 1 ]; then
        cat $logfile
-       rm $logfile
+       $SYS_RM $logfile
 fi
 exit $TEST_OK
 
diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-notif.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-notif.sh
index dad79a8..1faaddb 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-notif.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-notif.sh
@@ -149,7 +149,7 @@ else
                                test_failed
                        fi
 
-                       rm $$_notifications.txt
+                       $SYS_RM $$_notifications.txt
 
                        #Drop notification
                        printf "Dropping the test notification (${notifid})"
@@ -175,7 +175,7 @@ test_end
 
 if [ $flag -ne 1 ]; then
        cat $logfile
-       rm $logfile
+       $SYS_RM $logfile
 fi
 exit $TEST_OK
 
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 baf5992..04f3c8d 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-proxy-delivery.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-proxy-delivery.sh
@@ -157,7 +157,7 @@ test_end
 
 if [ $flag -ne 1 ]; then
        cat $logfile
-       rm $logfile
+       $SYS_RM $logfile
 fi
 exit $TEST_OK
 
diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-server-local.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-server-local.sh
index 8a095a5..2b93ccc 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-server-local.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-server-local.sh
@@ -168,7 +168,7 @@ test_end
 
 if [ $flag -ne 1 ]; then
        cat $logfile
-       rm $logfile
+       $SYS_RM $logfile
 fi
 exit $TEST_OK
 
diff --git a/org.glite.testsuites.ctb/LB/tests/lb-test-server-remote.sh b/org.glite.testsuites.ctb/LB/tests/lb-test-server-remote.sh
index d558f16..2bfae45 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-server-remote.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-server-remote.sh
@@ -134,7 +134,7 @@ test_end
 
 if [ $flag -ne 1 ]; then
        cat $logfile
-       rm $logfile
+       $SYS_RM $logfile
 fi
 exit $TEST_OK
 
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 0068ce2..d37d77b 100755 (executable)
--- a/org.glite.testsuites.ctb/LB/tests/lb-test-ws.sh
+++ b/org.glite.testsuites.ctb/LB/tests/lb-test-ws.sh
@@ -145,7 +145,7 @@ test_end
 
 if [ $flag -ne 1 ]; then
        cat $logfile
-       rm $logfile
+       $SYS_RM $logfile
 fi
 exit $TEST_OK
 
jra1mw project from LCG CVS.