[Initng-svn] r3012 - initng/devtool/makomk-test
svn at initng.thinktux.net
svn at initng.thinktux.net
Fri Feb 17 02:20:00 CET 2006
Author: makomk
Date: Fri Feb 17 02:19:59 2006
New Revision: 3012
Modified:
initng/devtool/makomk-test/env_file
initng/devtool/makomk-test/inst-initng-test
initng/devtool/makomk-test/test_suite.py
Log:
Fix up test suite for recent changes
Modified: initng/devtool/makomk-test/env_file
==============================================================================
--- initng/devtool/makomk-test/env_file (original)
+++ initng/devtool/makomk-test/env_file Fri Feb 17 02:19:59 2006
@@ -1,6 +1,7 @@
# This is a comment
FOO=123
+FOO=${FOO}456
# Try making comments often
BAR=baz
Modified: initng/devtool/makomk-test/inst-initng-test
==============================================================================
--- initng/devtool/makomk-test/inst-initng-test (original)
+++ initng/devtool/makomk-test/inst-initng-test Fri Feb 17 02:19:59 2006
@@ -4,3 +4,4 @@
cp -rf /usr/lib/initng-test/ifiles/* /etc/initng
cp /usr/lib/initng-test/initng-valgrind /sbin/initng-valgrind
chmod 755 /sbin/initng-valgrind
+chmod 755 /usr/lib/initng-test/test_slave.py
Modified: initng/devtool/makomk-test/test_suite.py
==============================================================================
--- initng/devtool/makomk-test/test_suite.py (original)
+++ initng/devtool/makomk-test/test_suite.py Fri Feb 17 02:19:59 2006
@@ -1,24 +1,24 @@
#!/usr/bin/python
EXPECT_STATUS = {'system/urandom': 'SERVICE_DONE',
- 'system/udev/udevd': 'RUNNING',
- 'system/udev': 'DONE',
+ 'system/udev/udevd': 'DAEMON_RUNNING',
+ 'system/udev': 'RUNLEVEL_UP',
'system/udev/filldev': 'SERVICE_DONE',
'system/udev/set_hotplug': 'SERVICE_DONE',
'system/udev/mountdev': 'SERVICE_DONE',
'system/usb': 'SERVICE_DONE',
'system/swap': 'SERVICE_DONE',
'system/bootmisc': 'SERVICE_DONE',
- 'daemon/agetty/2': 'RUNNING',
- 'runtests': 'DONE',
+ 'daemon/agetty/2': 'DAEMON_RUNNING',
+ 'runtests': 'RUNLEVEL_UP',
'net/lo': 'SERVICE_DONE',
'system/mountfs': 'SERVICE_DONE',
- 'system/initial': 'DONE',
- 'system': 'DONE',
+ 'system/initial': 'RUNLEVEL_UP',
+ 'system': 'RUNLEVEL_UP',
'system/initial/filldev': 'SERVICE_DONE',
'system/hdparm': 'SERVICE_DONE',
- 'daemon/agetty': 'DONE',
- 'daemon/agetty/3': 'RUNNING',
+ 'daemon/agetty': 'RUNLEVEL_UP',
+ 'daemon/agetty/3': 'DAEMON_RUNNING',
'system/hostname': 'SERVICE_DONE',
'system/modules': 'SERVICE_DONE',
'system/mountroot': 'SERVICE_DONE',
@@ -29,7 +29,9 @@
'system/checkfs': 'SERVICE_DONE',
'system/modules/usbcore': 'SERVICE_DONE',
'system/modules/nvram': 'SERVICE_DONE',
- 'system/initial/loglevel': 'SERVICE_DONE' }
+ 'system/initial/loglevel': 'SERVICE_DONE',
+ 'daemon/syslog-ng': 'DAEMON_RUNNING',
+ 'default': 'RUNLEVEL_UP'}
DAEMON_NAMES = { 'system/initial/udev': 'udevd',
'system/initial/udevd': 'udevd',
@@ -211,7 +213,7 @@
working['ngc -u'] = (s == 0 and slave != None)
if slave == None:
do_skip("check ngc -d waits for service to stop")
- do_skip("check ngc -s shows DAEMON_STOPPING")
+ do_skip("check ngc -s shows DAEMON_TERM")
do_skip("check ngc -d stops daemon")
do_skip("check ngc -d succeeds")
return
@@ -221,8 +223,8 @@
quitted = os.waitpid(pid,os.WNOHANG)[0] != 0
do_test("check ngc -d waits for daemon to stop",
not quitted)
- do_test("check ngc -s shows DAEMON_STOPPING",
- get_svc_state('tests/daemon1')=='DAEMON_STOPPING')
+ do_test("check ngc -s shows DAEMON_TERM",
+ get_svc_state('tests/daemon1')=='DAEMON_TERM')
success = False
while True:
try:
@@ -258,18 +260,16 @@
not quitted)
else:
do_skip("check ngc -u waits for service to start")
- do_skip("check ngc -s shows SERVICE_STARTING")
+ do_skip("check ngc -s shows SERVICE_START_RUN")
do_skip("check ngc -u succeeds")
do_skip("check ngc -s shows SERVICE_DONE")
do_skip("check ngc -d stops service")
do_skip("check ngc -d waits for service to stop")
- do_skip("check ngc -s shows SERVICE_STOPPING")
+ do_skip("check ngc -s shows SERVICE_STOP_RUN")
do_skip("check ngc -d succeeds")
- # do_skip("check ngc -z succeeds")
- # do_skip("check ngc -z works")
return
- do_test("check ngc -s shows SERVICE_STARTING",
- get_svc_state('tests/service1')=='SERVICE_STARTING')
+ do_test("check ngc -s shows SERVICE_START_RUN",
+ get_svc_state('tests/service1')=='SERVICE_START_RUN')
slave.quit(0)
if quitted:
do_skip("check ngc -u succeeds")
@@ -289,8 +289,8 @@
else:
do_skip("check ngc -d waits for service to stop")
return
- do_test("check ngc -s shows SERVICE_STOPPING",
- get_svc_state('tests/service1')=='SERVICE_STOPPING')
+ do_test("check ngc -s shows SERVICE_STOP_RUN",
+ get_svc_state('tests/service1')=='SERVICE_STOP_RUN')
slave.quit(1)
if quitted or chk_worked('ngc -d status') == False:
if not quitted:
@@ -317,16 +317,14 @@
not quitted)
else:
do_skip("check ngc -u waits for daemon to start")
- do_skip("check ngc -s shows WAIT_FOR_PID_FILE")
+ do_skip("check ngc -s shows DAEMON_WAIT_FOR_PID_FILE")
do_skip("check ngc -u succeeds")
do_skip("check ngc -s shows DAEMON_RUNNING")
do_skip("check ngc -d stops daemon")
do_skip("check ngc -d succeeds")
- # do_skip("check ngc -z succeeds")
- # do_skip("check ngc -z works")
return
- do_test("check ngc -s shows WAIT_FOR_PID_FILE",
- get_svc_state('tests/daemon-nofork')=='WAIT_FOR_PID_FILE')
+ do_test("check ngc -s shows DAEMON_WAIT_FOR_PID_FILE",
+ get_svc_state('tests/daemon-nofork')=='DAEMON_WAIT_FOR_PID_FILE')
f = open("/var/run/test-daemon-nofork.pid","w")
f.write(str(slave.get_pinfo()[0])); f.close()
if quitted:
@@ -370,20 +368,18 @@
not quitted)
else:
do_skip("check ngc -u waits for daemon to start")
- do_skip("check ngc -s shows STARTING")
- do_skip("check ngc -s shows WAIT_FOR_PID_FILE")
+ do_skip("check ngc -s shows DAEMON_LAUNCH")
+ do_skip("check ngc -s shows DAEMON_WAIT_FOR_PID_FILE")
do_skip("check ngc -u succeeds")
- do_skip("check ngc -s shows RUNNING")
+ do_skip("check ngc -s shows DAEMON_RUNNING")
do_skip("check ngc -d stops daemon")
do_skip("check ngc -d succeeds")
- # do_skip("check ngc -z succeeds")
- # do_skip("check ngc -z works")
return
- do_test("check ngc -s shows STARTING",
- get_svc_state('tests/daemon-fork')=='STARTING')
+ do_test("check ngc -s shows DAEMON_LAUNCH",
+ get_svc_state('tests/daemon-fork')=='DAEMON_LAUNCH')
slave.fork_and_ret(); do_sleep(2)
- do_test("check ngc -s shows WAIT_FOR_PID_FILE",
- get_svc_state('tests/daemon-fork')=='WAIT_FOR_PID_FILE')
+ do_test("check ngc -s shows DAEMON_WAIT_FOR_PID_FILE",
+ get_svc_state('tests/daemon-fork')=='DAEMON_WAIT_FOR_PID_FILE')
f = open("/var/run/test-daemon-nofork.pid","w")
f.write(str(slave.get_pinfo()[0])); f.close()
if quitted:
@@ -391,8 +387,8 @@
else:
do_test("check ngc -u succeeds",
os.waitpid(pid,0)[1] == 0)
- do_test("check ngc -s shows RUNNING",
- get_svc_state('tests/daemon-fork')=='RUNNING')
+ do_test("check ngc -s shows DAEMON_RUNNING",
+ get_svc_state('tests/daemon-fork')=='DAEMON_RUNNING')
pid = ngc_async("-d","tests/daemon-fork") # doesn't return until later
slave.settimeout(20.0) # seconds
success = False
@@ -476,7 +472,7 @@
if t != "fed":
do_log("Got WOMBAT=" + t); works = False
t = slave.get_env("FOO")
- if t != "123":
+ if t != "123456":
do_log("Got FOO=" + t); works = False
t = slave.get_env("BAR")
if t != "baz":
@@ -487,9 +483,9 @@
t = slave.get_env("MODULES")
if t != "battery ac processor button fan thermal":
do_log("Got MODULES=" + t); works = False
- t = slave.get_env("PATH")
- if t == None or t.find("/root/of/all/evil") < 0:
- do_log("Got PATH=" + t); works = False
+# t = slave.get_env("PATH")
+# if t == None or t.find("/root/of/all/evil") < 0:
+# do_log("Got PATH=" + t); works = False
return works
def _chk_suid_cb(uid,slave):
@@ -533,7 +529,7 @@
exe_name = DAEMON_NAMES[svc]
else:
exe_name = None
- if svcs[svc] == 'RUNNING':
+ if svcs[svc] == 'DAEMON_RUNNING':
pid = ngc_g(svc)
if pid == None:
print "'ngc -g " + svc + "' failed!"
More information about the Initng-svn
mailing list