[Initscripts-ng-commits] r523 - in /trunk/src/insserv/debian: changelog run-testsuite

[pere at users.alioth.debian.org]

Author: pere
Date: Sun Jan 13 22:12:38 2008
New Revision: 523

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=523
Log:
  * Make problematic test cases be fatal in testing and non-fatal when
    uploading.

Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/run-testsuite

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=523&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Sun Jan 13 22:12:38 2008
@@ -1,3 +1,10 @@
+insserv (1.10.0-4) UNRELEASED; urgency=low
+
+  * Make problematic test cases be fatal in testing and non-fatal when
+    uploading.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Sun, 13 Jan 2008 19:32:34 +0100
+
 insserv (1.10.0-3) unstable; urgency=low
 
   * Added test case for problem with symlink removal, bug #460034.

Modified: trunk/src/insserv/debian/run-testsuite
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/run-testsuite?rev=523&op=diff
==============================================================================
--- trunk/src/insserv/debian/run-testsuite (original)
+++ trunk/src/insserv/debian/run-testsuite Sun Jan 13 22:12:38 2008
@@ -2,6 +2,12 @@
 
 basedir=$(dirname $0)
 . $basedir/testsuite-common
+
+if head -1 debian/changelog | grep UNRELEASED ; then
+    severity=check
+else
+    severity=test
+fi
 
 runlevel_path() {
     runlevel=$1
@@ -568,8 +574,8 @@
 
 # These are checking real bugs, but until bug #458582 is fixed, they
 # will fail.  Making the tests non-fatal because of this.
-test_order S startfirst_stopfirst startsecond_stoplast
-test_order 6 startfirst_stopfirst startsecond_stoplast 
+${severity}_order S startfirst_stopfirst startsecond_stoplast
+${severity}_order 6 startfirst_stopfirst startsecond_stoplast 
 
 echo
 echo "info: test if bad script in init.d/ with no symlinks in rc*.d/ make problems"
@@ -685,10 +691,10 @@
 
 list_rclinks
 
-test_script_not_present 0 oldscript
-test_script_present 1 oldscript
-test_script_present 2 oldscript
-test_script_not_present 3 oldscript
-test_script_not_present 6 oldscript
+${severity}_script_not_present 0 oldscript
+${severity}_script_present 1 oldscript
+${severity}_script_present 2 oldscript
+${severity}_script_not_present 3 oldscript
+${severity}_script_not_present 6 oldscript
 
 finish_test