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

[pere at users.alioth.debian.org]

Author: pere
Date: Fri May  7 06:15:33 2010
New Revision: 1056

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=1056
Log:
Adjust the test_x_interactive behaviour to make sure it fails with a fatal error if X-Interactive: true do not work.

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=1056&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Fri May  7 06:15:33 2010
@@ -7,6 +7,8 @@
     bit, sequence number, runlevels and script name in the format:
     SK:NUM:RUNLEVELS:SCRIPT. (Closes: #573004)
   * Improve the output from make-testsuite. 
+  * Adjust the test_x_interactive behaviour to make sure it fails with
+    a fatal error if X-Interactive: true do not work.
 
  -- Kel Modderman <kel at otaku42.de>  Mon, 03 May 2010 19:12:23 +1000
 

Modified: trunk/src/insserv/debian/run-testsuite
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/run-testsuite?rev=1056&op=diff
==============================================================================
--- trunk/src/insserv/debian/run-testsuite (original)
+++ trunk/src/insserv/debian/run-testsuite Fri May  7 06:15:33 2010
@@ -1896,8 +1896,16 @@
 check_order 2 first after
 check_order 2 first alone1
 check_order 2 first alone2
-${severity}_order 2 alone1 after # This ordering is not guaranteed
-${severity}_order 2 alone2 after # This ordering is not guaranteed
+# This ordering is not guaranteed, but currently interactive scripts
+# are put after the others on the same level.
+check_order 2 alone1 after
+check_order 2 alone2 after
+if grep INTERACTIVE ${initddir}/.depend.start | grep -q alone1 &&
+    grep INTERACTIVE ${initddir}/.depend.start | grep -q alone1 ; then
+    counttest
+else
+    error "scripts alone1 and alone2 are not flagged as interactive" 
+fi
 }
 ##########################################################################