freebsd-dev/contrib/atf/atf-sh/misc_helpers.sh
Enji Cooper da3067c138 Import proposed fix from upstream for
atf-sh/atf_check_test:flush_stdout_on_timeout

Many thanks for jmmv for the fix!

MFC after: 1 week
PR: 197060

Original commit message:

From 0e546407567ea858e261e72f75c5ed61e07d0ddf Mon Sep 17 00:00:00 2001
From: Julio Merino <jmmv@google.com>
Date: Tue, 17 Feb 2015 18:10:11 -0500
Subject: [PATCH] Fix atf-sh/atf_check_test:flush_stdout_on_death

The test atf-sh/atf_check_test:flush_stdout_on_timeout was flaky as it
was playing solely with time.  Fix this by making the test more robust
and rename it while we are at it: there is nothing left about "timeouts"
in this test, considering that ATF itself does not enforce deadlines
any longer.

Fixes FreeBSD PR 197060.
2015-05-21 05:06:08 +00:00

310 lines
8.0 KiB
Bash

# Copyright (c) 2007 The NetBSD Foundation, Inc.
# All rights reserved.
#
# 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.
# -------------------------------------------------------------------------
# Helper tests for "t_atf_check".
# -------------------------------------------------------------------------
atf_test_case atf_check_info_ok
atf_check_info_ok_head()
{
atf_set "descr" "Helper test case for the t_atf_check test program"
}
atf_check_info_ok_body()
{
atf_check -s eq:0 -o empty -e empty true
}
atf_test_case atf_check_info_fail
atf_check_info_fail_head()
{
atf_set "descr" "Helper test case for the t_atf_check test program"
}
atf_check_info_fail_body()
{
# In Solaris, /usr/bin/false returns 255 rather than 1. Use the
# built-in version for the check.
atf_check -s eq:1 -o empty -e empty sh -c "false"
}
atf_test_case atf_check_expout_mismatch
atf_check_expout_mismatch_head()
{
atf_set "descr" "Helper test case for the t_atf_check test program"
}
atf_check_expout_mismatch_body()
{
cat >expout <<SECONDEOF
foo
SECONDEOF
atf_check -s eq:0 -o file:expout -e empty echo bar
}
atf_test_case atf_check_experr_mismatch
atf_check_experr_mismatch_head()
{
atf_set "descr" "Helper test case for the t_atf_check test program"
}
atf_check_experr_mismatch_body()
{
cat >experr <<SECONDEOF
foo
SECONDEOF
atf_check -s eq:0 -o empty -e file:experr -x 'echo bar 1>&2'
}
atf_test_case atf_check_null_stdout
atf_check_null_stdout_head()
{
atf_set "descr" "Helper test case for the t_atf_check test program"
}
atf_check_null_stdout_body()
{
atf_check -s eq:0 -o empty -e empty echo "These are the contents"
}
atf_test_case atf_check_null_stderr
atf_check_null_stderr_head()
{
atf_set "descr" "Helper test case for the t_atf_check test program"
}
atf_check_null_stderr_body()
{
atf_check -s eq:0 -o empty -e empty -x 'echo "These are the contents" 1>&2'
}
atf_test_case atf_check_equal_ok
atf_check_equal_ok_head()
{
atf_set "descr" "Helper test case for the t_atf_check test program"
}
atf_check_equal_ok_body()
{
atf_check_equal a a
}
atf_test_case atf_check_equal_fail
atf_check_equal_fail_head()
{
atf_set "descr" "Helper test case for the t_atf_check test program"
}
atf_check_equal_fail_body()
{
atf_check_equal a b
}
atf_test_case atf_check_equal_eval_ok
atf_check_equal_eval_ok_head()
{
atf_set "descr" "Helper test case for the t_atf_check test program"
}
atf_check_equal_eval_ok_body()
{
x=a
y=a
atf_check_equal '${x}' '${y}'
}
atf_test_case atf_check_equal_eval_fail
atf_check_equal_eval_fail_head()
{
atf_set "descr" "Helper test case for the t_atf_check test program"
}
atf_check_equal_eval_fail_body()
{
x=a
y=b
atf_check_equal '${x}' '${y}'
}
atf_test_case atf_check_flush_stdout
atf_check_flush_stdout_head()
{
atf_set "descr" "Helper test case for the t_atf_check test program"
atf_set "timeout" "30"
}
atf_check_flush_stdout_body()
{
atf_check true
atf_check -s exit:1 false
touch "${CONTROL_FILE:-done}"
while :; do
sleep 1
done
}
# -------------------------------------------------------------------------
# Helper tests for "t_config".
# -------------------------------------------------------------------------
atf_test_case config_get
config_get_head()
{
atf_set "descr" "Helper test case for the t_config test program"
}
config_get_body()
{
if atf_config_has ${TEST_VARIABLE}; then
echo "${TEST_VARIABLE} = $(atf_config_get ${TEST_VARIABLE})"
fi
}
atf_test_case config_has
config_has_head()
{
atf_set "descr" "Helper test case for the t_config test program"
}
config_has_body()
{
if atf_config_has ${TEST_VARIABLE}; then
echo "${TEST_VARIABLE} found"
else
echo "${TEST_VARIABLE} not found"
fi
}
# -------------------------------------------------------------------------
# Helper tests for "t_normalize".
# -------------------------------------------------------------------------
atf_test_case normalize
normalize_head()
{
atf_set "descr" "Helper test case for the t_normalize test program"
atf_set "a.b" "test value 1"
atf_set "c-d" "test value 2"
}
normalize_body()
{
echo "a.b: $(atf_get a.b)"
echo "c-d: $(atf_get c-d)"
}
# -------------------------------------------------------------------------
# Helper tests for "t_tc".
# -------------------------------------------------------------------------
atf_test_case tc_pass_true
tc_pass_true_head()
{
atf_set "descr" "Helper test case for the t_tc test program"
}
tc_pass_true_body()
{
true
}
atf_test_case tc_pass_false
tc_pass_false_head()
{
atf_set "descr" "Helper test case for the t_tc test program"
}
tc_pass_false_body()
{
false
}
atf_test_case tc_pass_return_error
tc_pass_return_error_head()
{
atf_set "descr" "Helper test case for the t_tc test program"
}
tc_pass_return_error_body()
{
return 1
}
atf_test_case tc_fail
tc_fail_head()
{
atf_set "descr" "Helper test case for the t_tc test program"
}
tc_fail_body()
{
echo "An error" 1>&2
exit 1
}
atf_test_case tc_missing_body
tc_missing_body_head()
{
atf_set "descr" "Helper test case for the t_tc test program"
}
# -------------------------------------------------------------------------
# Helper tests for "t_tp".
# -------------------------------------------------------------------------
atf_test_case tp_srcdir
tp_srcdir_head()
{
atf_set "descr" "Helper test case for the t_tp test program"
}
tp_srcdir_body()
{
echo "Calling helper"
helper_subr || atf_fail "Could not call helper subroutine"
}
# -------------------------------------------------------------------------
# Main.
# -------------------------------------------------------------------------
atf_init_test_cases()
{
# Add helper tests for t_atf_check.
atf_add_test_case atf_check_info_ok
atf_add_test_case atf_check_info_fail
atf_add_test_case atf_check_expout_mismatch
atf_add_test_case atf_check_experr_mismatch
atf_add_test_case atf_check_null_stdout
atf_add_test_case atf_check_null_stderr
atf_add_test_case atf_check_equal_ok
atf_add_test_case atf_check_equal_fail
atf_add_test_case atf_check_equal_eval_ok
atf_add_test_case atf_check_equal_eval_fail
atf_add_test_case atf_check_flush_stdout
# Add helper tests for t_config.
atf_add_test_case config_get
atf_add_test_case config_has
# Add helper tests for t_normalize.
atf_add_test_case normalize
# Add helper tests for t_tc.
atf_add_test_case tc_pass_true
atf_add_test_case tc_pass_false
atf_add_test_case tc_pass_return_error
atf_add_test_case tc_fail
atf_add_test_case tc_missing_body
# Add helper tests for t_tp.
[ -f $(atf_get_srcdir)/subrs ] && . $(atf_get_srcdir)/subrs
atf_add_test_case tp_srcdir
}
# vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4