wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-11-08 16:11:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: Minor adjustments to improve consistency between test code structure

Browse Source 
Signed-off-by: Magnus Malm <magnusmalm@gmail.com>
This commit is contained in:
Magnus Malm committed 2021-02-24 13:20:13 +01:00
1 parent f214098560
commit 2c055cb954
5 files changed
+39 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/lib.sh
+6
View File
@@ -4,6 +4,12 @@ assert_num_children() {
assert "$1 services are running" "$(texec pgrep -P 1 "$2" | wc -l)" -eq "$1" assert "$1 services are running" "$(texec pgrep -P 1 "$2" | wc -l)" -eq "$1"
} }
remove_thing() {
THING="$(realpath "$1")"
say "Remove ${THING#*/test/*}"
rm -f "$THING"
}
texec() { texec() {
# shellcheck disable=SC2154 # shellcheck disable=SC2154
"$TEST_DIR/testenv_exec.sh" "$finit_pid" "$@" "$TEST_DIR/testenv_exec.sh" "$finit_pid" "$@"
test/test_add_remove_dynamic_service/test.sh
+8 -5
View File
@@ -3,21 +3,24 @@
set -eu set -eu
TEST_DIR=$(dirname "$0")/.. TEST_DIR=$(dirname "$0")/..
TESTENV_ROOT="$TEST_DIR"/test_root
# shellcheck source=/dev/null # shellcheck source=/dev/null
. "$TEST_DIR/lib.sh" . "$TEST_DIR/lib.sh"
test_teardown() { test_teardown() {
say "Test done $(date)" say "Test done $(date)"
say "Running test teardown..." say "Running test teardown."
# Teardown remove_thing "$TESTENV_ROOT/$FINIT_CONF"
rm -f test_root/bin/service.sh remove_thing "$TESTENV_ROOT"/test_assets/service.sh
} }
# Test
say "Test start $(date)" say "Test start $(date)"
say 'Add a dynamic service in /etc/finit.conf'
cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test_root/test_assets/ cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test_root/test_assets/
say "Add a dynamic service in $FINIT_CONF"
texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh' > $FINIT_CONF" texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh' > $FINIT_CONF"
say 'Reload Finit' say 'Reload Finit'
test/test_add_remove_dynamic_service_sub_config/test.sh
+9 -7
View File
@@ -3,28 +3,30 @@
set -eu set -eu
TEST_DIR=$(dirname "$0")/.. TEST_DIR=$(dirname "$0")/..
TESTENV_ROOT="$TEST_DIR"/test_root
# shellcheck source=/dev/null # shellcheck source=/dev/null
. "$TEST_DIR/lib.sh" . "$TEST_DIR/lib.sh"
test_teardown() { test_teardown() {
say "Test done $(date)" say "Test done $(date)"
say "Running test teardown..." say "Running test teardown."
# Teardown remove_thing "$TESTENV_ROOT/$FINIT_CONF_DIR/service.conf"
rm -f test_root/bin/service.sh remove_thing "$TESTENV_ROOT"/test_assets/service.sh
} }
# Test
say "Test start $(date)" say "Test start $(date)"
say "Add a dynamic service in $FINIT_CONF_DIR/service.conf"
cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test_root/test_assets/ cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test_root/test_assets/
say "Add a dynamic service in $FINIT_CONF_DIR/service.conf"
texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh' > $FINIT_CONF_DIR/service.conf" texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh' > $FINIT_CONF_DIR/service.conf"
say 'Reload Finit' say 'Reload Finit'
texec kill -SIGHUP 1 texec kill -SIGHUP 1
retry 'assert_num_children 1 service.sh' 5 retry 'assert_num_children 1 service.sh'
say 'Remove the dynamic service from /etc/finit.d/service.conf' say 'Remove the dynamic service from /etc/finit.d/service.conf'
texec sh -c "echo > $FINIT_CONF_DIR/service.conf" texec sh -c "echo > $FINIT_CONF_DIR/service.conf"
@@ -32,4 +34,4 @@ texec sh -c "echo > $FINIT_CONF_DIR/service.conf"
say 'Reload Finit' say 'Reload Finit'
texec kill -SIGHUP 1 texec kill -SIGHUP 1
retry 'assert_num_children 0 service.sh' 5 retry 'assert_num_children 0 service.sh'
test/test_start_stop_service/test.sh
+8 -5
View File
@@ -3,21 +3,24 @@
set -eu set -eu
TEST_DIR=$(dirname "$0")/.. TEST_DIR=$(dirname "$0")/..
TESTENV_ROOT="$TEST_DIR"/test_root
# shellcheck source=/dev/null # shellcheck source=/dev/null
. "$TEST_DIR/lib.sh" . "$TEST_DIR/lib.sh"
test_teardown() { test_teardown() {
say "Test done $(date)" say "Test done $(date)"
say "Running test teardown..." say "Running test teardown."
# Teardown remove_thing "$TESTENV_ROOT/$FINIT_CONF"
rm -f test_root/bin/service.sh remove_thing "$TESTENV_ROOT"/test_assets/service.sh
} }
# Test
say "Test start $(date)" say "Test start $(date)"
say 'Add service stanza in /etc/finit.conf'
cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test_root/test_assets/ cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test_root/test_assets/
say "Add service stanza in $FINIT_CONF"
texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh' > $FINIT_CONF" texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh' > $FINIT_CONF"
say 'Reload Finit' say 'Reload Finit'
test/test_start_stop_service_sub_config/test.sh
+8 -6
View File
@@ -3,22 +3,24 @@
set -eu set -eu
TEST_DIR=$(dirname "$0")/.. TEST_DIR=$(dirname "$0")/..
TESTENV_ROOT="$TEST_DIR"/test_root
# shellcheck source=/dev/null # shellcheck source=/dev/null
. "$TEST_DIR/lib.sh" . "$TEST_DIR/lib.sh"
test_teardown() { test_teardown() {
say "Test done $(date)" say "Test done $(date)"
say "Running test teardown..." say "Running test teardown."
# Teardown remove_thing "$TESTENV_ROOT/$FINIT_CONF_DIR/service.conf"
rm -f test_root/bin/service.sh remove_thing "$TESTENV_ROOT"/test_assets/service.sh
} }
# Test
say "Test start $(date)" say "Test start $(date)"
say 'Add service stanza in /etc/finit.d/service.conf'
cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test_root/test_assets/ cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test_root/test_assets/
# texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh' > $FINIT_CONF"
say "Add service stanza in $FINIT_CONF_DIR/service.conf"
texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh' > $FINIT_CONF_DIR/service.conf" texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh' > $FINIT_CONF_DIR/service.conf"
say 'Reload Finit' say 'Reload Finit'