test: minor, replace 'texec sh -c' -> 'run'

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2023-02-05 11:22:26 +01:00
1 parent 5a9cafc2fc
commit b6769356b2
21 files changed
+170 -165

No files matched your search

+15 -14
View File
@@ -12,45 +12,46 @@ test_teardown()
{
say "Test done $(date)"
texec rm -f "$FINIT_CONF"
say "Running test teardown."
run "rm -f $FINIT_CONF"
}
# shellcheck source=/dev/null
. "$TEST_DIR/tenv/lib.sh"
#texec sh -c "initctl debug"
#run "initctl debug"
say "Add custom envs to $FINIT_CONF ..."
texec sh -c "echo 'foo=bar' > $FINIT_CONF"
texec sh -c "echo 'baz=qux' >> $FINIT_CONF"
run "echo 'foo=bar' > $FINIT_CONF"
run "echo 'baz=qux' >> $FINIT_CONF"
say "Add service stanza to $FINIT_CONF ..."
texec sh -c "echo 'service serv -np -e foo:bar -- Verify foo=bar' >> $FINIT_CONF"
run "echo 'service serv -np -e foo:bar -- Verify foo=bar' >> $FINIT_CONF"
say 'Reload Finit'
texec sh -c "initctl reload"
run "initctl reload"
sleep 1
retry 'assert_num_children 1 serv'
say "Modify $FINIT_CONF slightly ..."
texec sh -c "sed -i 's/foo:bar/baz:qux/; s/foo=bar/baz=qux/' $FINIT_CONF"
run "sed -i 's/foo:bar/baz:qux/; s/foo=bar/baz=qux/' $FINIT_CONF"
say 'Reload Finit'
texec sh -c "initctl reload"
run "initctl reload"
sleep 1
retry 'assert_num_children 1 serv'
say "Swap envs completely in $FINIT_CONF ..."
texec sh -c "echo 'bar=foo' > $FINIT_CONF"
texec sh -c "echo 'qux=baz' >> $FINIT_CONF"
run "echo 'bar=foo' > $FINIT_CONF"
run "echo 'qux=baz' >> $FINIT_CONF"
say "Add swapped service stanza to $FINIT_CONF ..."
texec sh -c "echo 'service serv -np -e bar:foo -E baz -- Verify bar=foo and no baz' >> $FINIT_CONF"
run "echo 'service serv -np -e bar:foo -E baz -- Verify bar=foo and no baz' >> $FINIT_CONF"
say 'Reload Finit'
texec sh -c "initctl reload"
run "initctl reload"
sleep 1
retry 'assert_num_children 1 serv'
say "Done, drop service from $FINIT_CONF ..."
texec sh -c "rm $FINIT_CONF"
texec sh -c "initctl reload"
run "rm $FINIT_CONF"
run "initctl reload"