Module Name: src
Committed By: jmmv
Date: Mon Mar 15 19:03:08 UTC 2010
Modified Files:
src/tests: Makefile
Added Files:
src/tests/sys: Atffile Makefile
src/tests/sys/rc: Atffile Makefile h_args.sh h_simple.sh t_rc_d_cli.sh
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/tests/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/sys/Atffile src/tests/sys/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/sys/rc/Atffile src/tests/sys/rc/Makefile \
src/tests/sys/rc/h_args.sh src/tests/sys/rc/h_simple.sh \
src/tests/sys/rc/t_rc_d_cli.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/Makefile
diff -u src/tests/Makefile:1.19 src/tests/Makefile:1.20
--- src/tests/Makefile:1.19 Tue Dec 15 03:01:48 2009
+++ src/tests/Makefile Mon Mar 15 19:03:08 2010
@@ -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
Added files:
Index: src/tests/sys/Atffile
diff -u /dev/null src/tests/sys/Atffile:1.1
--- /dev/null Mon Mar 15 19:03:08 2010
+++ src/tests/sys/Atffile Mon Mar 15 19:03:08 2010
@@ -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: *
Index: src/tests/sys/Makefile
diff -u /dev/null src/tests/sys/Makefile:1.1
--- /dev/null Mon Mar 15 19:03:08 2010
+++ src/tests/sys/Makefile Mon Mar 15 19:03:08 2010
@@ -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>
Index: src/tests/sys/rc/Atffile
diff -u /dev/null src/tests/sys/rc/Atffile:1.1
--- /dev/null Mon Mar 15 19:03:08 2010
+++ src/tests/sys/rc/Atffile Mon Mar 15 19:03:08 2010
@@ -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_*
Index: src/tests/sys/rc/Makefile
diff -u /dev/null src/tests/sys/rc/Makefile:1.1
--- /dev/null Mon Mar 15 19:03:08 2010
+++ src/tests/sys/rc/Makefile Mon Mar 15 19:03:08 2010
@@ -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>
Index: src/tests/sys/rc/h_args.sh
diff -u /dev/null src/tests/sys/rc/h_args.sh:1.1
--- /dev/null Mon Mar 15 19:03:08 2010
+++ src/tests/sys/rc/h_args.sh Mon Mar 15 19:03:08 2010
@@ -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 "$...@}"
Index: src/tests/sys/rc/h_simple.sh
diff -u /dev/null src/tests/sys/rc/h_simple.sh:1.1
--- /dev/null Mon Mar 15 19:03:08 2010
+++ src/tests/sys/rc/h_simple.sh Mon Mar 15 19:03:08 2010
@@ -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 "$...@}"
Index: src/tests/sys/rc/t_rc_d_cli.sh
diff -u /dev/null src/tests/sys/rc/t_rc_d_cli.sh:1.1
--- /dev/null Mon Mar 15 19:03:08 2010
+++ src/tests/sys/rc/t_rc_d_cli.sh Mon Mar 15 19:03:08 2010
@@ -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
+
+ ${rc_helper} start
+ atf_check -s eq:0 -o ignore -e empty ${rc_helper} restart
+ ${rc_helper} forcestop
+}
+
+atf_test_case default_restart_with_args
+default_restart_with_args_head() {
+ atf_set "descr" "Tests that running the default 'restart' with" \
+ "arguments errors out"
+}
+default_restart_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} restart foo
+ ${rc_helper} forcestop
+}
+
+do_overriden_no_args() {
+ local command="${1}"; shift
+
+ export h_args=YES
+ rc_helper=$(atf_get_srcdir)/h_args.sh
+
+ cat >expout <<EOF
+pre${command}:.
+${command}:.
+post${command}:.
+EOF
+ atf_check -s eq:0 -o file:expout -e empty ${rc_helper} ${command}
+}
+
+do_overriden_with_args() {
+ local command="${1}"; shift
+
+ export h_args=YES
+ rc_helper=$(atf_get_srcdir)/h_args.sh
+
+ cat >expout <<EOF
+pre${command}:.
+${command}: >arg1< > arg 2 < >arg3< >*<.
+post${command}:.
+EOF
+ atf_check -s eq:0 -o file:expout -e empty ${rc_helper} ${command} \
+ 'arg1' ' arg 2 ' 'arg3' '*'
+}
+
+atf_test_case overriden_start_no_args
+overriden_start_no_args_head() {
+ atf_set "descr" "Tests that running a custom 'start' without" \
+ "arguments does not pass any parameters to the command"
+}
+overriden_start_no_args_body() {
+ do_overriden_no_args start
+}
+
+atf_test_case overriden_start_with_args
+overriden_start_with_args_head() {
+ atf_set "descr" "Tests that running a custom 'start' with" \
+ "arguments passes those arguments as parameters to the command"
+}
+overriden_start_with_args_body() {
+ do_overriden_with_args start
+}
+
+atf_test_case overriden_stop_no_args
+overriden_stop_no_args_head() {
+ atf_set "descr" "Tests that running a custom 'stop' without" \
+ "arguments does not pass any parameters to the command"
+}
+overriden_stop_no_args_body() {
+ do_overriden_no_args stop
+}
+
+atf_test_case overriden_stop_with_args
+overriden_stop_with_args_head() {
+ atf_set "descr" "Tests that running a custom 'stop' with" \
+ "arguments passes those arguments as parameters to the command"
+}
+overriden_stop_with_args_body() {
+ do_overriden_with_args stop
+}
+
+atf_test_case overriden_restart_no_args
+overriden_restart_no_args_head() {
+ atf_set "descr" "Tests that running a custom 'restart' without" \
+ "arguments does not pass any parameters to the command"
+}
+overriden_restart_no_args_body() {
+ do_overriden_no_args restart
+}
+
+atf_test_case overriden_restart_with_args
+overriden_restart_with_args_head() {
+ atf_set "descr" "Tests that running a custom 'restart' with" \
+ "arguments passes those arguments as parameters to the command"
+}
+overriden_restart_with_args_body() {
+ do_overriden_with_args restart
+}
+
+atf_test_case overriden_custom_no_args
+overriden_custom_no_args_head() {
+ atf_set "descr" "Tests that running a custom command without" \
+ "arguments does not pass any parameters to the command"
+}
+overriden_custom_no_args_body() {
+ do_overriden_no_args custom
+}
+
+atf_test_case overriden_custom_with_args
+overriden_custom_with_args_head() {
+ atf_set "descr" "Tests that running a custom command with" \
+ "arguments passes those arguments as parameters to the command"
+}
+overriden_custom_with_args_body() {
+ do_overriden_with_args custom
+}
+
+atf_init_test_cases()
+{
+ atf_add_test_case no_command
+
+ atf_add_test_case default_start_no_args
+ atf_add_test_case default_start_with_args
+ atf_add_test_case default_stop_no_args
+ atf_add_test_case default_stop_with_args
+ atf_add_test_case default_restart_no_args
+ atf_add_test_case default_restart_with_args
+
+ atf_add_test_case overriden_start_no_args
+ atf_add_test_case overriden_start_with_args
+ atf_add_test_case overriden_stop_no_args
+ atf_add_test_case overriden_stop_with_args
+ atf_add_test_case overriden_restart_no_args
+ atf_add_test_case overriden_restart_with_args
+ atf_add_test_case overriden_custom_no_args
+ atf_add_test_case overriden_custom_with_args
+}
