[Initscripts-ng-commits] r802 - in /trunk/src/insserv/debian: changelog run-testsuite testsuite-common
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Sun Jul 27 00:22:32 UTC 2008
Author: kelmo-guest
Date: Sun Jul 27 00:22:31 2008
New Revision: 802
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=802
Log:
Preserve the empty runlevl configuration. (Closes: #477415, #492526)
* Add common test suite function for purging init directory, runlevel links
and dependency makefiles.
* Add test_incorrect_startscripts() to replicate bug report described in
#492526, and make sure insserv do not regress in this behaviour.
Modified:
trunk/src/insserv/debian/changelog
trunk/src/insserv/debian/run-testsuite
trunk/src/insserv/debian/testsuite-common
Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=802&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Sun Jul 27 00:22:31 2008
@@ -26,7 +26,7 @@
- 31_debian_conf.dpatch
* Add 81_debian_default_start_stop_warnings.dpatch to generate warnings when
empty start|stop runlevel configuration is attempted to be changed.
- Preserve the empty runlevl configuration. (Closes: #477415)
+ Preserve the empty runlevl configuration. (Closes: #477415, #492526)
* Add an extra call to list_rclinks() in test_newbug_keepoldorder()
function of run-testsuite, after introducing the bug.
* Make test_adding_start() and test_adding_stop() run-testsuite
@@ -48,8 +48,12 @@
with the variable.
* Remove a bunch of overrides for scripts now with valid LSB information in
testing distribution today, or have been removed from archive.
-
- -- Kel Modderman <kel at otaku42.de> Wed, 23 Jul 2008 23:29:38 +1000
+ * Add common test suite function for purging init directory, runlevel links
+ and dependency makefiles.
+ * Add test_incorrect_startscripts() to replicate bug report described in
+ #492526, and make sure insserv do not regress in this behaviour.
+
+ -- Kel Modderman <kel at otaku42.de> Sun, 27 Jul 2008 10:18:21 +1000
insserv (1.11.0-9) unstable; urgency=low
Modified: trunk/src/insserv/debian/run-testsuite
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/run-testsuite?rev=802&op=diff
==============================================================================
--- trunk/src/insserv/debian/run-testsuite (original)
+++ trunk/src/insserv/debian/run-testsuite Sun Jul 27 00:22:31 2008
@@ -310,8 +310,8 @@
echo
echo "info: test if override files replace headers in the file"
echo
-rm -rf $initddir
-mkdir -p $initddir
+
+initdir_purge
# Two scripts with a loop between them
insertscript base <<'EOF' || true
@@ -360,8 +360,8 @@
echo
echo "info: testing to insert scripts with a loop, and the effect of an override file"
echo
-rm -rf $initddir
-mkdir -p $initddir
+
+initdir_purge
# Two scripts with a loop between them
if insertscript loop1 <<'EOF' ; then
@@ -412,8 +412,8 @@
echo
echo "info: testing to insert scripts with a longer loop, making sure it fail"
echo
-rm -rf $initddir
-mkdir -p $initddir
+
+initdir_purge
# Three scripts with a loop between them, make sure introducing the
# loop fail, as it will make insserv generate a unstable and broken
@@ -463,8 +463,7 @@
echo "info: test handling of loops in the combination of start and stop sequences"
echo
-rm -rf $initddir
-mkdir -p $initddir
+initdir_purge
insertscript startfirst <<'EOF' || true
### BEGIN INIT INFO
@@ -500,8 +499,7 @@
echo "info: test handling of 'fake' loops in the combination of start and stop sequences"
echo
-rm -rf $initddir
-mkdir -p $initddir
+initdir_purge
insertscript startfirst_stopfirst <<'EOF' || true
### BEGIN INIT INFO
@@ -540,8 +538,7 @@
echo "warning: This test should be fatal, but is non-fatal until a fix is found."
echo
-rm -rf $initddir
-mkdir -p $initddir
+initdir_purge
insertscript startfirst_stopfirst <<'EOF' || true
### BEGIN INIT INFO
@@ -577,8 +574,7 @@
echo "info: test if bad script in init.d/ with no symlinks in rc*.d/ make problems"
echo
-rm -rf $initddir
-mkdir -p $initddir
+initdir_purge
addscript sitelocal <<'EOF' || true
### BEGIN INIT INFO
@@ -610,8 +606,7 @@
echo "info: check that it work to insert scripts with only start runlevels"
echo
-rm -rf $initddir
-mkdir -p $initddir
+initdir_purge
insertscript onlystart <<'EOF' || true
### BEGIN INIT INFO
@@ -645,8 +640,7 @@
# update-rc.d -f oldscript remove
# update-rc.d oldscript start 20 2 3 4 5 . stop 20 1 .
-rm -rf $initddir
-mkdir -p $initddir
+initdir_purge
insertscript onlystop <<'EOF' || true
### BEGIN INIT INFO
@@ -681,8 +675,7 @@
# update-rc.d -f oldscript remove
# update-rc.d oldscript start 20 2 3 4 5 . stop 20 1 .
-rm -rf $initddir
-mkdir -p $initddir
+initdir_purge
insertscript oldscript <<'EOF' || true
### BEGIN INIT INFO
@@ -733,8 +726,7 @@
echo "info: detect segfault caused by script providing virtual facility."
echo
-rm -rf $initddir
-mkdir -p $initddir
+initdir_purge
insertscript badheaderscript <<'EOF' || true
### BEGIN INIT INFO
@@ -766,7 +758,46 @@
check_script_present 2 okscript
}
-
+##########################################################################
+test_incorrect_startscripts() {
+echo
+echo "info: Check if insserv add start symlinks for scripts that"
+echo "info: currently do not have them. #492526"
+echo
+
+initdir_purge
+
+insertscript disablestartscript <<'EOF' || true
+### BEGIN INIT INFO
+# Provides: disablestartscript
+# Required-Start:
+# Required-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+### END INIT INFO
+EOF
+list_rclinks
+
+check_script_present 2 disablestartscript
+check_script_present 5 disablestartscript
+check_script_not_present S disablestartscript
+check_script_present 1 disablestartscript
+
+rm $initddir/../rc{2,3,4,5}.d/S??disablestartscript
+
+# Update symlinks, see if it add start symlinks
+insserv_reg .
+
+list_rclinks
+
+check_script_not_present 2 disablestartscript
+check_script_not_present 3 disablestartscript
+check_script_not_present 4 disablestartscript
+check_script_not_present 5 disablestartscript
+check_script_not_present S disablestartscript
+check_script_present 0 disablestartscript
+check_script_present 1 disablestartscript
+}
##########################################################################
test_incorrect_stopscripts() {
echo
@@ -774,14 +805,11 @@
echo "info: currently do not have them."
echo
-rm -rf $initddir/../rc*.d/*
-rm -rf $initddir/*
-mkdir -p $initddir
-
-list_rclinks
-insertscript script <<'EOF' || true
-### BEGIN INIT INFO
-# Provides: script
+initdir_purge
+
+insertscript disablestopscript <<'EOF' || true
+### BEGIN INIT INFO
+# Provides: disablestopscript
# Required-Start:
# Required-Stop:
# Default-Start: 2 3 4 5
@@ -790,25 +818,23 @@
EOF
list_rclinks
-check_script_present 2 script
-check_script_present 5 script
-check_script_not_present S script
-check_script_present 1 script
-
-rm $initddir/../rc0.d/K??script
-rm $initddir/../rc1.d/K??script
+check_script_present 2 disablestopscript
+check_script_present 5 disablestopscript
+check_script_not_present S disablestopscript
+check_script_present 1 disablestopscript
+
+rm $initddir/../rc{0,1}.d/K??disablestopscript
# Update symlinks, see if it add stop symlinks
insserv_reg .
list_rclinks
-check_script_present 2 script
-check_script_present 5 script
-check_script_not_present S script
-check_script_not_present 0 script
-check_script_not_present 1 script
-check_script_not_present 1 nostopscript
+check_script_present 2 disablestopscript
+check_script_present 5 disablestopscript
+check_script_not_present S disablestopscript
+check_script_not_present 0 disablestopscript
+check_script_not_present 1 disablestopscript
}
##########################################################################
test_newbug_keepoldorder() {
@@ -817,8 +843,7 @@
echo "info: not change the order of the scripts currently on disk."
echo
-rm -rf $initddir
-mkdir -p $initddir
+initdir_purge
insertscript mountall <<'EOF' || true
### BEGIN INIT INFO
@@ -920,8 +945,7 @@
echo "info: Verify that X-start-before work as it should."
echo
-rm -rf $initddir
-mkdir -p $initddir
+initdir_purge
insertscript startlast <<'EOF' || true
### BEGIN INIT INFO
@@ -954,8 +978,7 @@
echo "info: Verify that X-stop-after work as it should."
echo
-rm -rf $initddir
-mkdir -p $initddir
+initdir_purge
insertscript stopfirst <<'EOF' || true
### BEGIN INIT INFO
@@ -988,8 +1011,7 @@
echo "info: Make sure that adding start levels do not change an existing installation."
echo
-rm -rf $initddir
-mkdir -p $initddir
+initdir_purge
insertscript addstartscript <<'EOF' || true
### BEGIN INIT INFO
@@ -1045,8 +1067,7 @@
echo "info: Make sure that removing start levels do not change an existing installation."
echo
-rm -rf $initddir
-mkdir -p $initddir
+initdir_purge
insertscript remstartscript <<'EOF' || true
### BEGIN INIT INFO
@@ -1095,8 +1116,7 @@
echo "info: Make sure that adding stop levels do not change an existing installation."
echo
-rm -rf $initddir
-mkdir -p $initddir
+initdir_purge
insertscript addstopscript <<'EOF' || true
### BEGIN INIT INFO
@@ -1150,8 +1170,7 @@
echo "info: Make sure that removing stop levels do not change an existing installation."
echo
-rm -rf $initddir
-mkdir -p $initddir
+initdir_purge
insertscript remstopscript <<'EOF' || true
### BEGIN INIT INFO
@@ -1200,8 +1219,8 @@
echo "info: test two initscripts providing same facility."
echo "info: Not sure if this should fail or not."
echo
-rm -rf $initddir
-mkdir -p $initddir
+
+initdir_purge
insertscript one <<'EOF' || true
### BEGIN INIT INFO
@@ -1234,8 +1253,8 @@
echo
echo "info: test insertion of script requiring a virtual facility that doesn't exist"
echo
-rm -rf $initddir
-mkdir -p $initddir
+
+initdir_purge
addscript needbogusvirtual <<'EOF'
### BEGIN INIT INFO
@@ -1258,8 +1277,10 @@
echo
echo "info: test that /etc/insserv.conf.d/ is used"
echo
-rm -rf $initddir ${insconf}.d
-mkdir -p $initddir ${insconf}.d
+
+initdir_purge
+rm -rf ${insconf}.d
+mkdir -p ${insconf}.d
# add a base service, to ensure check_order() is accurate
insertscript dummy <<'EOF'
@@ -1325,8 +1346,8 @@
echo
echo "info: test insertion of script missing Required-{Start,Stop} fields"
echo
-rm -rf $initddir
-mkdir -p $initddir
+
+initdir_purge
addscript badheader <<'EOF'
### BEGIN INIT INFO
@@ -1353,8 +1374,8 @@
echo
echo "info: test insertion of script missing Provides fields"
echo
-rm -rf $initddir
-mkdir -p $initddir
+
+initdir_purge
addscript badheader <<'EOF'
### BEGIN INIT INFO
@@ -1382,8 +1403,8 @@
echo
echo "info: test insertion of script missing Default-Start field"
echo
-rm -rf $initddir
-mkdir -p $initddir
+
+initdir_purge
addscript nodefstart <<'EOF'
### BEGIN INIT INFO
@@ -1411,8 +1432,8 @@
echo
echo "info: test insertion of script missing Default-Stop field"
echo
-rm -rf $initddir
-mkdir -p $initddir
+
+initdir_purge
addscript nodefstop <<'EOF'
### BEGIN INIT INFO
@@ -1451,6 +1472,7 @@
test_onlystop
test_removal
test_segfault_virtfac
+test_incorrect_startscripts
test_incorrect_stopscripts
test_newbug_keepoldorder # 3 non-fatal tests failing
test_start_before
Modified: trunk/src/insserv/debian/testsuite-common
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/testsuite-common?rev=802&op=diff
==============================================================================
--- trunk/src/insserv/debian/testsuite-common (original)
+++ trunk/src/insserv/debian/testsuite-common Sun Jul 27 00:22:31 2008
@@ -94,6 +94,13 @@
$insserv $debug -c $insconf -p $initddir -o $overridedir -r $script
}
+initdir_purge ()
+{
+ rm -f ${initddir}/.depend.*
+ rm -rf ${initddir}
+ mkdir -p ${initddir}
+}
+
relpath ()
{
local OLDIFS IFS
More information about the Initscripts-ng-commits
mailing list