* Corrected path for beakerlib.vim syntax hilight
* Seperate tests using rlPhase instead of rlLog
* PIDFILE creation/cleanup is handled by the daemon, so modify the PIDFILE and LOCKFILE tests to consider this
---
tests/initscripts/tests/avahi/runtest.sh | 59 +++++++++++++++---------------
1 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/tests/initscripts/tests/avahi/runtest.sh b/tests/initscripts/tests/avahi/runtest.sh
index 00769d7..ccca252 100755
--- a/tests/initscripts/tests/avahi/runtest.sh
+++ b/tests/initscripts/tests/avahi/runtest.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# vim: dict=/usr/share/rhts-library/dictionary.vim cpt=.,w,b,u,t,i,k
+# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# runtest.sh of /CoreOS/avahi/Sanity/initscript
@@ -35,7 +35,6 @@ PACKAGE="avahi"
rlJournalStart
rlPhaseStartSetup
- rlAssertRpm $PACKAGE
rlAssertRpm "avahi"
rlAssertRpm "avahi-dnsconfd"
rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
@@ -52,55 +51,55 @@ rlJournalStart
for ACTION in "start" "stop" "restart" "force-reload" "status" ; do
rlRun "grep -i \"usage.*$ACTION\" /etc/init.d/$SERVICE"
done
+ rlPhaseEnd
+ rlPhaseStartTest "$SERVICE - start"
if [ $SERVICE == "avahi-dnsconfd" ] ; then
rlServiceStart avahi-daemon
fi
- rlLog ">>>>>>>>> service start"
rlRun "service $SERVICE start" 0 " Service must start without problem"
rlRun "service $SERVICE status" 0 " Then Status command "
rlRun "service $SERVICE start" 0 " Already started service "
rlRun "service $SERVICE status" 0 " Again status command "
+ rlPhaseEnd
- rlLog ">>>>>>>>> service restart"
+ rlPhaseStartTest "$SERVICE - restart"
rlRun "service $SERVICE restart" 0 " Restarting of service"
rlRun "service $SERVICE status" 0 " Status command "
+ rlPhaseEnd
- rlLog ">>>>>>>>> service stop"
+ rlPhaseStartTest "$SERVICE - stop"
rlRun "service $SERVICE stop" 0 " Stopping service "
rlRun "service $SERVICE status" 3 " Status of stopped service "
rlRun "service $SERVICE stop" 0 " Stopping service again "
rlRun "service $SERVICE status" 3 " Status of stopped service "
+ rlPhaseEnd
-
- rlLog ">>>>>>>>> pid file"
- rlServiceStart $SERVICE
-
+ rlPhaseStartTest "$SERVICE - pid"
if [ $SERVICE == "avahi-daemon" ] ; then
PID_FILE="/var/run/avahi-daemon/pid"
- rlAssertExists "$PID_FILE" "$PID_FILE must exist"
- rlRun "killall $SERVICE" 0 "Kill $SERVICE"
- fi
- if [ $SERVICE == "avahi-dnsconfd" ] ; then
+ elif [ $SERVICE == "avahi-dnsconfd" ] ; then
PID_FILE="/var/run/avahi-dnsconfd.pid"
- rlAssertExists "$PID_FILE" "$PID_FILE must exist"
- rlRun "kill -9 `pidof $SERVICE`" 0 "Kill $SERVICE"
fi
-
+ rlRun "touch $PID_FILE"
rlRun "service $SERVICE status" 1 " Existing pid file, but service not started "
rlRun "rm -fv $PID_FILE" 0 "Remove .pid file"
-
- rlLog ">>>>>>>>> lock file"
- rlAssertExists "/var/lock/subsys/$SERVICE" "Lock file /var/lock/subsys/$SERVICE must exist"
+ rlPhaseEnd
+
+ rlPhaseStartTest "$SERVICE - lock"
+ LOCK_FILE="/var/lock/subsys/$SERVICE"
+ rlRun "touch $LOCK_FILE"
rlRun "service $SERVICE status" 2 " Existing lock file, but service not started "
- rlServiceStop $SERVICE
+ rlRun "rm -fv $LOCK_FILE" 0 "Remove lock file"
+ rlPhaseEnd
- rlLog ">>>>>>>>> insufficient rights"
+ rlPhaseStartTest "$SERVICE - insufficient rights"
rlRun "service $SERVICE start " 0 " Starting service for restarting under nonpriv user "
- rlRun "su testuserqa -c 'service $SERVICE restart'" 4 "Insufficient rights, restarting service under nonprivileged user must fail"
-
- rlLog ">>>>>>>>> operations"
+ rlRun "su testuserqa -c 'service $SERVICE restart'" 1,4 "Insufficient rights, restarting service under nonprivileged user must fail"
+ rlPhaseEnd
+
+ rlPhaseStartTest "$SERVICE - operations"
rlRun "service $SERVICE start" 0 " Service have to implement start function "
rlRun "service $SERVICE restart" 0 " Service have to implement restart function "
rlRun "service $SERVICE status" 0 " Service have to implement status function "
@@ -108,17 +107,17 @@ rlJournalStart
rlRun "service $SERVICE try-restart" 0 " Service have to implement try-restart function "
rlRun "service $SERVICE reload" 0 " Service have to implement reload function "
rlRun "service $SERVICE force-reload" 0 " Service have to implement force-reload function "
-
- rlLog ">>>>>>>>> nonexist operations"
+ rlPhaseEnd
+
+ rlPhaseStartTest "$SERVICE - invalid operation"
rlRun "service $SERVICE noexistop" 2 " Testing proper return code when nonexisting function"
+ rlPhaseEnd
- rlLog ">>>>>>>>> invalid arguments"
+ rlPhaseStartTest "$SERVICE - invalid argument"
rlRun "service $SERVICE" 2 " When no arguments added to service, it must fail with proper return code "
- rlPhaseEnd
-
rlPhaseEnd
- rlPhaseStartCleanup "Restore service"
+ rlPhaseStartCleanup "$SERVICE - Restore service"
rlServiceRestore $SERVICE
rlPhaseEnd
done
--
1.7.0.1