[src/trunk]: src/tests Add some basic tests for rc.d scripts to validate the ...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/tests Add some basic tests for rc.d scripts to validate the ...
From: jmmv <jmmv%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 18:45:14 +0000
details:   https://anonhg.NetBSD.org/src/rev/ecb7a9e24aa2
branches:  trunk
changeset: 753102:ecb7a9e24aa2
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Mon Mar 15 19:03:08 2010 +0000

description:
Add some basic tests for rc.d scripts to validate the execution of
subcommands and the optional argument passing to them from the command
line.

Triggered by the modification of the run_rc_command function in rc.subr
to allow passing in extra parameters to the commands defined in rc.d
scripts.

diffstat:

 tests/Makefile             |    4 +-
 tests/sys/Atffile          |    6 +
 tests/sys/Makefile         |   10 +
 tests/sys/rc/Atffile       |    6 +
 tests/sys/rc/Makefile      |   14 ++
 tests/sys/rc/h_args.sh     |   64 +++++++++++
 tests/sys/rc/h_simple.sh   |   45 ++++++++
 tests/sys/rc/t_rc_d_cli.sh |  250 +++++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 397 insertions(+), 2 deletions(-)

diffs (truncated from 440 to 300 lines):

diff -r c14c2ed54048 -r ecb7a9e24aa2 tests/Makefile
--- a/tests/Makefile    Mon Mar 15 19:00:53 2010 +0000
+++ b/tests/Makefile    Mon Mar 15 19:03:08 2010 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2009/12/15 03:01:48 mrg Exp $
+# $NetBSD: Makefile,v 1.20 2010/03/15 19:03:08 jmmv Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR=        crypto games ipf util
   
 .if ${MKATF} != "no"
-SUBDIR+= fs net kernel lib libexec rump syscall 
+SUBDIR+= fs net kernel lib libexec rump sys syscall
 
 . if ${MACHINE} != "evbppc" && ${MKKMOD} != "no"
 SUBDIR+= modules
diff -r c14c2ed54048 -r ecb7a9e24aa2 tests/sys/Atffile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/sys/Atffile Mon Mar 15 19:03:08 2010 +0000
@@ -0,0 +1,6 @@
+Content-Type: application/X-atf-atffile; version="1"
+X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2010/03/15 19:03:08 jmmv Exp $"
+
+prop: test-suite = "NetBSD"
+
+tp-glob: *
diff -r c14c2ed54048 -r ecb7a9e24aa2 tests/sys/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/sys/Makefile        Mon Mar 15 19:03:08 2010 +0000
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2010/03/15 19:03:08 jmmv Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR=      ${TESTSBASE}/sys
+
+SUBDIR+=       rc
+
+.include <bsd.test.mk>
+.include <bsd.subdir.mk>
diff -r c14c2ed54048 -r ecb7a9e24aa2 tests/sys/rc/Atffile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/sys/rc/Atffile      Mon Mar 15 19:03:08 2010 +0000
@@ -0,0 +1,6 @@
+Content-Type: application/X-atf-atffile; version="1"
+X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2010/03/15 19:03:08 jmmv Exp $"
+
+prop: test-suite = "NetBSD"
+
+tp-glob: t_*
diff -r c14c2ed54048 -r ecb7a9e24aa2 tests/sys/rc/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/sys/rc/Makefile     Mon Mar 15 19:03:08 2010 +0000
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2010/03/15 19:03:08 jmmv Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR=      ${TESTSBASE}/sys/rc
+
+TESTS_SH=      t_rc_d_cli
+
+SCRIPTSDIR=    ${TESTSDIR}
+SCRIPTS=       h_args.sh \
+               h_simple.sh
+
+.include <bsd.subdir.mk>
+.include <bsd.test.mk>
diff -r c14c2ed54048 -r ecb7a9e24aa2 tests/sys/rc/h_args.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/sys/rc/h_args.sh    Mon Mar 15 19:03:08 2010 +0000
@@ -0,0 +1,64 @@
+#! /bin/sh
+#
+# $NetBSD: h_args.sh,v 1.1 2010/03/15 19:03:08 jmmv Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Julio Merino.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# An rc.d script that overrides all standard comands and adds a non-standard
+# command.  All of them print the set of arguments passed to them and take no
+# further action.
+#
+
+${_rc_subr_loaded} . /etc/rc.subr
+
+name="h_args"
+rcvar="${name}"
+command="/usr/bin/true"
+extra_commands="custom"
+
+for command in start stop restart custom; do
+       eval ${command}_precmd=\'print_args pre${command}\'
+       eval ${command}_cmd=\'print_args ${command}\'
+       eval ${command}_postcmd=\'print_args post${command}\'
+done
+
+print_args() {
+       local command="${1}"; shift
+
+       printf "${command}:"
+       while [ ${#} -gt 0 ]; do
+               printf " >%s<" "${1}"
+               shift
+       done
+       printf ".\n"
+}
+
+load_rc_config "${name}"
+run_rc_command "${@}"
diff -r c14c2ed54048 -r ecb7a9e24aa2 tests/sys/rc/h_simple.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/sys/rc/h_simple.sh  Mon Mar 15 19:03:08 2010 +0000
@@ -0,0 +1,45 @@
+#! /bin/sh
+#
+# $NetBSD: h_simple.sh,v 1.1 2010/03/15 19:03:08 jmmv Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Julio Merino.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# A very simple rc.d script that defines the minimum variables to be functional.
+#
+
+${_rc_subr_loaded} . /etc/rc.subr
+
+name="h_simple"
+rcvar="${name}"
+command="/bin/sleep"
+command_args="300 &"
+
+load_rc_config "${name}"
+run_rc_command "${@}"
diff -r c14c2ed54048 -r ecb7a9e24aa2 tests/sys/rc/t_rc_d_cli.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/sys/rc/t_rc_d_cli.sh        Mon Mar 15 19:03:08 2010 +0000
@@ -0,0 +1,250 @@
+# $NetBSD: t_rc_d_cli.sh,v 1.1 2010/03/15 19:03:08 jmmv Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Julio Merino.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+atf_test_case no_command
+no_command_head() {
+       atf_set "descr" "Tests that the lack of a command errors out"
+}
+no_command_body() {
+       export h_simple=YES
+       rc_helper=$(atf_get_srcdir)/h_simple.sh
+
+       atf_check -s eq:1 -o empty -e ignore ${rc_helper}
+}
+
+atf_test_case default_start_no_args
+default_start_no_args_head() {
+       atf_set "descr" "Tests that running the default 'start' without" \
+           "arguments does not error out"
+}
+default_start_no_args_body() {
+       export h_simple=YES
+       rc_helper=$(atf_get_srcdir)/h_simple.sh
+
+       atf_check -s eq:0 -o ignore -e empty ${rc_helper} start
+       ${rc_helper} forcestop
+}
+
+atf_test_case default_start_with_args
+default_start_with_args_head() {
+       atf_set "descr" "Tests that running the default 'start' with" \
+           "arguments errors out"
+}
+default_start_with_args_body() {
+       export h_simple=YES
+       rc_helper=$(atf_get_srcdir)/h_simple.sh
+
+       atf_check -s eq:1 -o ignore -e ignore ${rc_helper} start foo
+       if ${rc_helper} status >/dev/null; then
+               ${rc_helper} forcestop
+               atf_fail 'extra argument to start did not error out'
+       fi
+}
+
+atf_test_case default_stop_no_args
+default_stop_no_args_head() {
+       atf_set "descr" "Tests that running the default 'stop' without" \
+           "arguments does not error out"
+}
+default_stop_no_args_body() {
+       export h_simple=YES
+       rc_helper=$(atf_get_srcdir)/h_simple.sh
+
+       ${rc_helper} start
+       atf_check -s eq:0 -o ignore -e empty ${rc_helper} stop
+}
+
+atf_test_case default_stop_with_args
+default_stop_with_args_head() {
+       atf_set "descr" "Tests that running the default 'stop' with" \
+           "arguments errors out"
+}
+default_stop_with_args_body() {
+       export h_simple=YES
+       rc_helper=$(atf_get_srcdir)/h_simple.sh
+
+       ${rc_helper} start
+       atf_check -s eq:1 -o ignore -e ignore ${rc_helper} stop foo
+       if ${rc_helper} status >/dev/null; then
+               ${rc_helper} forcestop
+       else
+               atf_fail 'extra argument to stop did not error out'
+       fi
+}
+
+atf_test_case default_restart_no_args
+default_restart_no_args_head() {
+       atf_set "descr" "Tests that running the default 'restart' without" \
+           "arguments does not error out"
+}
+default_restart_no_args_body() {
+       export h_simple=YES
+       rc_helper=$(atf_get_srcdir)/h_simple.sh
+
Prev by Date: [src/trunk]: src/distrib/sets/lists/tests Register the new tests in sys/rc fo...
Next by Date: [src/trunk]: src/sys/dev/cardbus Delete unused member ct_bar[] from struct ca...
Previous by Thread: [src/trunk]: src/distrib/sets/lists/tests Register the new tests in sys/rc fo...
Next by Thread: [src/trunk]: src/sys/dev/cardbus Delete unused member ct_bar[] from struct ca...
Indexes:
Home | Main Index | Thread Index | Old Index