mirror of
https://github.com/troglobit/finit.git
synced 2026-10-01 05:22:48 +07:00
test: rename fserv -> serv, more features to be added
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
+2
-2
@@ -7,7 +7,7 @@ EXTRA_DIST += start-stop-service.sh
|
||||
EXTRA_DIST += start-stop-service-sub-config.sh
|
||||
EXTRA_DIST += start-kill-service.sh
|
||||
EXTRA_DIST += start-stop-sysv.sh
|
||||
EXTRA_DIST += start-stop-fserv.sh
|
||||
EXTRA_DIST += start-stop-serv.sh
|
||||
EXTRA_DIST += signal-service.sh
|
||||
|
||||
AM_TESTS_ENVIRONMENT = TENV_ROOT='$(abs_builddir)/tenv-root/';
|
||||
@@ -30,7 +30,7 @@ TESTS += start-stop-service.sh
|
||||
TESTS += start-stop-service-sub-config.sh
|
||||
TESTS += start-kill-service.sh
|
||||
TESTS += start-stop-sysv.sh
|
||||
TESTS += start-stop-fserv.sh
|
||||
TESTS += start-stop-serv.sh
|
||||
TESTS += signal-service.sh
|
||||
|
||||
clean-local:
|
||||
|
||||
@@ -2,4 +2,4 @@
|
||||
/Makefile.in
|
||||
|
||||
/.deps/
|
||||
/fserv
|
||||
/serv
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
EXTRA_DIST = service.conf service.sh S01-service.sh slay.sh
|
||||
|
||||
noinst_PROGRAMS = fserv
|
||||
fserv_SOURCES = fserv.c
|
||||
noinst_PROGRAMS = serv
|
||||
serv_SOURCES = serv.c
|
||||
|
||||
@@ -21,7 +21,7 @@ static void pidfile(char *nm)
|
||||
FILE *fp;
|
||||
|
||||
if (!nm)
|
||||
nm = "fserv";
|
||||
nm = "serv";
|
||||
|
||||
snprintf(fn, sizeof(fn), "%s%s.pid", _PATH_VARRUN, nm);
|
||||
pid = getpid();
|
||||
@@ -13,15 +13,15 @@ test_teardown()
|
||||
say "Running test teardown."
|
||||
|
||||
texec rm -f "$FINIT_CONF"
|
||||
texec rm -f /test_assets/fserv
|
||||
texec rm -f /test_assets/serv
|
||||
}
|
||||
|
||||
say "Test start $(date)"
|
||||
|
||||
cp "$TENV_ROOT"/../common/fserv "$TENV_ROOT"/test_assets/
|
||||
cp "$TENV_ROOT"/../common/serv "$TENV_ROOT"/test_assets/
|
||||
|
||||
say "Add service stanza in $FINIT_CONF"
|
||||
texec sh -c "echo 'service [2345] pid:!/run/fserv.pid /test_assets/fserv -- Forking service' > $FINIT_CONF"
|
||||
texec sh -c "echo 'service [2345] pid:!/run/serv.pid /test_assets/serv -- Forking service' > $FINIT_CONF"
|
||||
|
||||
say 'Reload Finit'
|
||||
#texec sh -c "initctl debug"
|
||||
@@ -35,16 +35,16 @@ sleep 2
|
||||
|
||||
#texec sh -c "initctl status"
|
||||
#texec sh -c "ps"
|
||||
#texec sh -c "initctl status fserv"
|
||||
#texec sh -c "initctl status serv"
|
||||
|
||||
retry 'assert_num_children 1 fserv'
|
||||
retry 'assert_num_children 1 serv'
|
||||
|
||||
say 'Stop the service'
|
||||
texec sh -c "initctl stop fserv"
|
||||
texec sh -c "initctl stop serv"
|
||||
|
||||
retry 'assert_num_children 0 fserv'
|
||||
retry 'assert_num_children 0 serv'
|
||||
|
||||
say 'Start the service again'
|
||||
texec sh -c "initctl start fserv"
|
||||
texec sh -c "initctl start serv"
|
||||
|
||||
retry 'assert_num_children 1 fserv'
|
||||
retry 'assert_num_children 1 serv'
|
||||
Reference in New Issue
Block a user