[Initng-svn] r3185 - initng/trunk/devtool/makomk-test

[svn at initng.thinktux.net]

Author: makomk
Date: Fri Mar  3 17:27:24 2006
New Revision: 3185

Modified:
   initng/trunk/devtool/makomk-test/test_suite.py
   initng/trunk/devtool/makomk-test/upd-initng
Log:
tests: work around shutdown problem and test restarting services


Modified: initng/trunk/devtool/makomk-test/test_suite.py
==============================================================================
--- initng/trunk/devtool/makomk-test/test_suite.py	(original)
+++ initng/trunk/devtool/makomk-test/test_suite.py	Fri Mar  3 17:27:24 2006
@@ -322,6 +322,33 @@
     if state != None and state != 'STOPPED':
         ngc('-z','tests/service1')
 
+def chk_ngc_service_restart():
+    pid = ngc_async("-u","tests/service1"); quitted = False
+    slave = test_slave.accept()
+    if slave == None:
+        do_skip("Check ngc -r stops service")
+        do_skip("Check ngc -r restarts service")
+        os.waitpid(pid,0);
+        return
+    slave.quit(0)
+    os.waitpid(pid,0);
+    if get_svc_state('tests/service1')!='SERVICE_DONE':
+        do_skip("Check ngc -r stops service")
+        do_skip("Check ngc -r restarts service")
+        return
+    pid = ngc_async("-r", "tests/service1")
+    slave = test_slave.accept()
+    do_test("Check ngc -r stops service", slave != None)
+    if slave == None:
+        do_skip("Check ngc -r restarts service")
+        os.waitpid(pid,0);
+        return
+    slave.quit(0)
+    slave = test_slave.accept()
+    do_test("Check ngc -r restarts service", slave != None)
+    if slave != None: slave.quit(0)
+    os.waitpid(pid,0);        
+
 def chk_daemon_pidfile_nofork():
     global working
     do_log("testing a deamon with a pidfile which doesn't fork")
@@ -580,6 +607,7 @@
     chk_really_runs()
     chk_ngc_updown()
     chk_service_updown()
+    chk_ngc_service_restart()
     chk_daemon_pidfile_nofork()
     chk_daemon_pidfile_fork()
     chk_all_types("generic",lambda(x):True)

Modified: initng/trunk/devtool/makomk-test/upd-initng
==============================================================================
--- initng/trunk/devtool/makomk-test/upd-initng	(original)
+++ initng/trunk/devtool/makomk-test/upd-initng	Fri Mar  3 17:27:24 2006
@@ -6,7 +6,7 @@
 if which rsync &>/dev/null && [ -x `which rsync` ]; then
 	echo 'Using rsync'
 	mkdir -p /tmp/initng
-	rsync -rlptvL --delete --delete-after /tmp/initng-mount/ /tmp/initng
+	rsync -rlptvL --delete --delete-after --exclude=doxygen /tmp/initng-mount/ /tmp/initng
 else
 	echo 'rsync not found - using brute-force copy'
 	echo 'This is slower and produces larger COW files.'
@@ -24,4 +24,7 @@
 make
 echo "initng-builder: installing"
 make install
+# need to run "ngc -c" or shutdown fails (!)
+echo "initng-builder: running 'ngc -c'"
+ngc -c
 echo "initng-builder: done!"