andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tests: Print the actual, expected values for EXPECT

Browse Source 
Change-Id: I394d23c0ea15bd340041550660cc5def017b5f15
BUG: 764966
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/4327
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
This commit is contained in:
Pranith Kumar K 2012-12-18 19:14:58 +05:30 committed by Anand Avati
parent 2dcde13e0d
commit 020fc23776
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
run-tests.sh
View File

@ -1,3 +1,3 @@
#!/bin/bash
prove -r --timer $(dirname $0)/tests;
prove -rf --timer $(dirname $0)/tests;

20
tests/include.rc
View File

@ -34,11 +34,12 @@ function test_header()
function test_footer()
{
RET=$?
local err=$1
if [ $RET -eq 0 ]; then
echo "ok $t";
else
echo "not ok $t";
echo "not ok $t $err";
if [ "$EXIT_EARLY" = "1" ]; then
exit $RET
fi
@ -49,19 +50,32 @@ function test_footer()
t=`expr $t + 1`;
}
function test_expect_footer()
{
local e=$1
local a=$2
local err=""
if [ "x${e}" != "x${a}" ]; then
err="Got \"$a\" instead of \"$e\""
fi
[[ "x${e}" == "x${a}" ]];
test_footer "$err";
}
function _EXPECT()
{
TESTLINE=$1;
shift;
local a=""
test_header "$@";
e="$1";
shift;
"$@" | tail -1 | egrep -q "^${e}\$"
a=$("$@" | tail -1)
test_footer;
test_expect_footer "$e" "$a";
}
function _EXPECT_KEYWORD()