[LTP] [RFC PATCH] commands/du: Added new testcase to test du(1) command.

[LTP] [RFC PATCH] commands/du: Added new testcase to test du(1) command.

[Zeng Linggang]

Test du(1) command with some basic options.

Signed-off-by: Zeng Linggang <zenglg.jy@cn.fujitsu.com>
---
 runtest/commands               |   1 +
 testcases/commands/du/Makefile |  21 +++++++++
 testcases/commands/du/du01.sh  | 104 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 126 insertions(+)
 create mode 100644 testcases/commands/du/Makefile
 create mode 100755 testcases/commands/du/du01.sh

diff --git a/runtest/commands b/runtest/commands
index b711294..06291f0 100644
--- a/runtest/commands
+++ b/runtest/commands
@@ -20,3 +20,4 @@ size01 size01
 sssd01 sssd01
 sssd02 sssd02
 sssd03 sssd03
+du01 du01.sh
diff --git a/testcases/commands/du/Makefile b/testcases/commands/du/Makefile
new file mode 100644
index 0000000..af3b703From 35878f9f8a97d35571ec2937bfb5fce9df4c4820 Mon Sep 17 00:00:00 2001
From: Zeng Linggang <zenglg.jy@cn.fujitsu.com>
Date: Thu, 2 Apr 2015 18:24:40 +0800
Subject: [PATCH] commands/du: Added new testcase to test du(1) command.

--- /dev/null
+++ b/testcases/commands/du/Makefile
@@ -0,0 +1,21 @@
+#
+#  Copyright (c) 2015 Fujitsu Ltd.
+#
+#  This program is free software;  you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY;  without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+#  the GNU General Public License for more details.
+#
+
+top_srcdir		?= ../../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+INSTALL_TARGETS		:= du01.sh
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/commands/du/du01.sh b/testcases/commands/du/du01.sh
new file mode 100755
index 0000000..4bd7c9c
--- /dev/null
+++ b/testcases/commands/du/du01.sh
@@ -0,0 +1,104 @@
+#!/bin/sh
+#
+# Copyright (c) 2015 Fujitsu Ltd.
+# Author: Zeng Linggang <zenglg.jy@cn.fujitsu.com>
+#
+# This program is free software;  you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY;  without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+# the GNU General Public License for more details.
+#
+# Test du command with some basic options.
+#
+
+TCID=du01
+
+TEST_FILE="du_test.file"
+test_cases=(
+	[1]=""
+	[2]="$TEST_FILE"
+	[3]="-0"
+	[4]="--null"
+	[5]="-a"
+	[6]="--all"
+	[7]="-B 20"
+	[8]="--block-size=20"
+	[9]="-b"
+	[10]="--bytes"
+	[11]="-c"
+	[12]="--total"
+	[13]="-D dir1/${TEST_FILE}"
+	[14]="--dereference-args dir1/${TEST_FILE}"
+	[15]="--max-depth=1"
+	[16]="-H dir1/${TEST_FILE}"
+	[17]="-h"
+	[18]="--human-readable"
+	[19]="-k"
+	[20]="-L dir1/"
+	[21]="--dereference dir1/"
+	[22]="-m"
+	[23]="-P"
+	[24]="--no-dereference"
+	[25]="--si"
+	[26]="-s"
+	[27]="--summarize"
+	[28]="--exclude=${TEST_FILE}"
+)
+
+TST_TOTAL=${#test_cases[@]}
+
+. test.sh
+
+export TEST_RETURN
+TEST()
+{
+	$@ >${TCID}.temp 2>&1
+	TEST_RETURN=$?
+}
+
+setup()
+{
+	tst_check_cmds du
+
+	tst_tmpdir
+
+	echo "test for du" > du_test.file
+	if [ $? -ne 0 ]; then
+		tst_brkm TBROK "create du_test.file failed."
+	fi
+
+	mkdir -p dir1
+	if [ $? -ne 0 ]; then
+		tst_brkm TBROK "mkdir dir1 failed."
+	fi
+
+	ln -s $(pwd)/du_test.file dir1/du_test.file
+	if [ $? -ne 0 ]; then
+		tst_brkm TBROK "ln -s $(pwd)/du_test.file dir1/du_test.file"
+	fi
+}
+
+cleanup()
+{
+	tst_rmdir
+}
+
+setup
+TST_CLEANUP=cleanup
+
+for i in $(seq 1 ${#test_cases[@]})
+do
+	TEST du ${test_cases[$i]}
+	if [ ${TEST_RETURN} -eq 0 ]; then
+		tst_resm TPASS "du(option: ${test_cases[$i]}) succeeded."
+	else
+		tst_resm TFAIL "du(option: ${test_cases[$i]}) failed."
+	fi
+done
+
+tst_exit
-- 
1.9.3




------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the 
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [RFC PATCH] commands/du: Added new testcase to test du(1) command.

[Cyril Hrubis]

Hi!
> +#!/bin/sh
> +#
> +# Copyright (c) 2015 Fujitsu Ltd.
> +# Author: Zeng Linggang <zenglg.jy@cn.fujitsu.com>
> +#
> +# This program is free software;  you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; either version 2 of the License, or
> +# (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY;  without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
> +# the GNU General Public License for more details.
> +#
> +# Test du command with some basic options.
> +#
> +
> +TCID=du01
> +
> +TEST_FILE="du_test.file"
> +test_cases=(
> +	[1]=""
> +	[2]="$TEST_FILE"
> +	[3]="-0"
> +	[4]="--null"
> +	[5]="-a"
> +	[6]="--all"
> +	[7]="-B 20"
> +	[8]="--block-size=20"
> +	[9]="-b"
> +	[10]="--bytes"
> +	[11]="-c"
> +	[12]="--total"
> +	[13]="-D dir1/${TEST_FILE}"
> +	[14]="--dereference-args dir1/${TEST_FILE}"
> +	[15]="--max-depth=1"
> +	[16]="-H dir1/${TEST_FILE}"
> +	[17]="-h"
> +	[18]="--human-readable"
> +	[19]="-k"
> +	[20]="-L dir1/"
> +	[21]="--dereference dir1/"
> +	[22]="-m"
> +	[23]="-P"
> +	[24]="--no-dereference"
> +	[25]="--si"
> +	[26]="-s"
> +	[27]="--summarize"
> +	[28]="--exclude=${TEST_FILE}"
> +)

Have you tried with real sh (from bussybox) or dash? I doubt that this
array syntax works there.

> +TST_TOTAL=${#test_cases[@]}

This as well.

> +. test.sh
> +
> +export TEST_RETURN
> +TEST()
> +{
> +	$@ >${TCID}.temp 2>&1
> +	TEST_RETURN=$?
> +}

Hmm, why to save the output to a file if it's not used at all?

> +setup()
> +{
> +	tst_check_cmds du
> +
> +	tst_tmpdir
> +
> +	echo "test for du" > du_test.file
> +	if [ $? -ne 0 ]; then
> +		tst_brkm TBROK "create du_test.file failed."
> +	fi
> +
> +	mkdir -p dir1
> +	if [ $? -ne 0 ]; then
> +		tst_brkm TBROK "mkdir dir1 failed."
> +	fi

Hmm, maybe we should introduce safe_mkdir etc, similarily to the safe
macros we have for C.

> +	ln -s $(pwd)/du_test.file dir1/du_test.file

ln -s ./du_test.file dir1/du_test.file ?

> +	if [ $? -ne 0 ]; then
> +		tst_brkm TBROK "ln -s $(pwd)/du_test.file dir1/du_test.file"
> +	fi
> +}
> +
> +cleanup()
> +{
> +	tst_rmdir
> +}
> +
> +setup
> +TST_CLEANUP=cleanup
> +
> +for i in $(seq 1 ${#test_cases[@]})
> +do
> +	TEST du ${test_cases[$i]}
> +	if [ ${TEST_RETURN} -eq 0 ]; then
> +		tst_resm TPASS "du(option: ${test_cases[$i]}) succeeded."

Better test would also parse the test output and check if it's sane, but
for basic test this is okay.

> +	else
> +		tst_resm TFAIL "du(option: ${test_cases[$i]}) failed."
> +	fi
> +done
> +
> +tst_exit
> -- 
> 1.9.3
> 
> 
> 
> 
> ------------------------------------------------------------------------------
> Dive into the World of Parallel Programming The Go Parallel Website, sponsored
> by Intel and developed in partnership with Slashdot Media, is your hub for all
> things parallel software development, from weekly thought leadership blogs to
> news, videos, case studies, tutorials and more. Take a look and join the 
> conversation now. http://goparallel.sourceforge.net/
> _______________________________________________
> Ltp-list mailing list
> Ltp-list@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/ltp-list

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the 
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [RFC PATCH v2 1/2] testcases/lib/test.sh: added SAFE_CALL*()

[Cyril Hrubis]

Hi!
> +SAFE_CALL()
> +{
> +	$@ > /dev/null 2>&1
> +	if [ $? -ne 0 ]; then
> +		tst_brkm TBROK "$@ failed"
> +	fi
> +}
> +
> +SAFE_CALL_REDIRECT()
> +{
> +	$@
> +	if [ $? -ne 0 ]; then
> +		tst_brkm TBROK "$@ failed"
> +	fi
> +}

Looks good but the names are a bit confusing. The SAFE_CALL does
redirect the output while SAFWE_CALL_REDIRECT does not.

Maybe naming the first SAFE_SILENT() and the second just SAFE() would be
better. And because this is not too much similar to the C interface we
can name it even more differently. Shorthand for "run or die" would be
ROD_SILENT and ROD.

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
BPM Camp - Free Virtual Workshop May 6th at 10am PDT/1PM EDT
Develop your own process in accordance with the BPMN 2 standard
Learn Process modeling best practices with Bonita BPM through live exercises
http://www.bonitasoft.com/be-part-of-it/events/bpm-camp-virtual- event?utm_
source=Sourceforge_BPM_Camp_5_6_15&utm_medium=email&utm_campaign=VA_SF
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [RFC PATCH v2 2/2] commands/du: Added new testcase to test du(1) command.

[Cyril Hrubis]

Hi!
> +setup()
> +{
> +	tst_require_root
> +
> +	tst_check_cmds dd du stat
> +
> +	tst_tmpdir
> +
> +	testfile=testfile
> +	SAFE_CALL dd if=/dev/zero of=${testfile} bs=1M count=10
> +
> +	testdir=testdir
> +	SAFE_CALL mkdir -p ${testdir}
> +
> +	SAFE_CALL ln -s ../${testfile} ${testdir}/${testfile}

Passing the testdir and testfile as variables looks like unnecessary
indirection to me.

> +	export DU_BLOCK_SIZE=1024

Maybe it deserves comment here, because at first glance this variable
looks unused, but it's in fact used by the du itself.

> +}
> +
> +cleanup()
> +{
> +	tst_rmdir
> +}
> +
> +export test_return
> +du_test()
> +{
> +	$@ > ${TCID}.temp 2>&1
> +	test_return=$?
> +}
> +
> +du_check()
> +{
> +	if [ ${test_return} -ne 0 ]; then
> +		grep -q -E "unrecognized option|invalid option" ${TCID}.temp
> +		if [ $? -eq 0 ]; then
> +			tst_resm TCONF $2 "not supported."
> +			return
> +		else
> +			tst_resm TFAIL $2 "failed."
> +			return
> +		fi
> +	fi
> +
> +	grep -q $1 ${TCID}.temp
> +	if [ $? -eq 0 ]; then
> +		tst_resm TPASS $2 "passed."
> +	else
> +		tst_resm TFAIL $2 "failed."
> +	fi
> +}

Why is the du_test() and do_check() done as two functions?

In the test below they are always called together, wouldn't it be easier
if this was just one function?

> +test1()
> +{
> +	du_test du
> +	du_check ${check1} "du(option: none)"
> +}
> +
> +test2()
> +{
> +	du_test du ${testfile}
> +	du_check ${check2} "du(option: <FILE>)"
> +}
> +
> +test3()
> +{
> +	du_test du -a
> +	du_check ${check3} "du(option: -a)"
> +}
> +
> +test4()
> +{
> +	du_test du --all
> +	du_check ${check3} "du(option: --all)"
> +}
> +
> +test5()
> +{
> +	du_test du -B ${block_size}
> +	du_check ${check5} "du(option: -B ${block_size})"
> +}
> +
> +test6()
> +{
> +	du_test du --block-size=${block_size}
> +	du_check ${check5} "du(option: --block-size=${block_size})"
> +}
> +
> +test7()
> +{
> +	du_test du -b
> +	du_check ${check7} "du(option: -b)"
> +}
> +
> +test8()
> +{
> +	du_test du --bytes
> +	du_check ${check7} "du(option: --bytes)"
> +}
> +
> +test9()
> +{
> +	du_test du -c
> +	du_check ${check9} "du(option: -c)"
> +}
> +
> +test10()
> +{
> +	du_test du --total
> +	du_check ${check9} "du(option: --total)"
> +}
> +
> +test11()
> +{
> +	du_test du -D ${testdir}/${testfile}
> +	du_check ${check11} "du(option: -D)"
> +}
> +
> +test12()
> +{
> +	du_test du --dereference-args ${testdir}/${testfile}
> +	du_check ${check11} "du(option: --dereference-args)"
> +}
> +
> +test13()
> +{
> +	du_test du --max-depth=1
> +	du_check ${check1} "du(option: --max-depth=N)"
> +}
> +
> +test14()
> +{
> +	du_test du --human-readable
> +	du_check ${check14} "du(option: --human-readable)"
> +}
> +
> +test15()
> +{
> +	du_test du -k
> +	du_check ${check1} "du(option: -k)"
> +}
> +
> +test16()
> +{
> +	du_test du -L ${testdir}/
> +	du_check ${check16} "du(option: -L)"
> +}
> +
> +test17()
> +{
> +	du_test du --dereference ${testdir}/
> +	du_check ${check16} "du(option: --dereference)"
> +}
> +
> +test18()
> +{
> +	du_test du -P
> +	du_check ${check1} "du(option: -P)"
> +}
> +
> +test19()
> +{
> +	du_test du --no-dereference
> +	du_check ${check1} "du(option: --no-dereference)"
> +}
> +
> +test20()
> +{
> +	du_test du --si
> +	du_check ${check20} "du(option: --si)"
> +}
> +
> +test21()
> +{
> +	du_test du -s
> +	du_check ${check1} "du(option: -s)"
> +}
> +
> +test22()
> +{
> +	du_test du --summarize
> +	du_check ${check1} "du(option: --summarize)"
> +}
> +
> +test23()
> +{
> +	du_test du --exclude=${testfile}
> +	du_check ${check23} "du(option: --exclude=PATTERN)"
> +}
> +
> +setup
> +TST_CLEANUP=cleanup
> +
> +block_size=512
> +
> +# The output could be different in some systems, if we use du to
> +# estimate file space usage with the same filesystem and the same size.
> +# So we use the approximate value to check.
> +check1="10[2-3][0-9][0-9][[:space:]]\."
> +check2="10[2-3][0-9][0-9][[:space:]]${testfile}"
> +check3="0[[:space:]]\.\/${testdir}\/${testfile}"
> +check5="20[4-5][0-9][0-9][[:space:]]\."
> +check7="10[4-5][0-9][0-9]\{4\}[[:space:]]\."
> +check9="10[2-3][0-9][0-9][[:space:]]total"
> +check11="10[2-3][0-9][0-9][[:space:]]${testdir}\/${testfile}"
> +check14="1[0,1]M[[:space:]]\."
> +check16="10[2-3][0-9][0-9][[:space:]]${testdir}\/"
> +check20="11M[[:space:]]\."
> +check23="[0-9]\{1,2\}[[:space:]]\."

The rest looks good to me.

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
BPM Camp - Free Virtual Workshop May 6th at 10am PDT/1PM EDT
Develop your own process in accordance with the BPMN 2 standard
Learn Process modeling best practices with Bonita BPM through live exercises
http://www.bonitasoft.com/be-part-of-it/events/bpm-camp-virtual- event?utm_
source=Sourceforge_BPM_Camp_5_6_15&utm_medium=email&utm_campaign=VA_SF
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [RFC PATCH v2 1/2] testcases/lib/test.sh: added SAFE_CALL*()

[Cyril Hrubis]

Hi!
> > Looks good but the names are a bit confusing. The SAFE_CALL does
> > redirect the output while SAFWE_CALL_REDIRECT does not.
> > 
> 
> If *users* want to redirect the output they need use SAFE_REDIRECT. :-/

I know how the name was choosen, but that does not change the fact that
it was unintuitive :).

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
BPM Camp - Free Virtual Workshop May 6th at 10am PDT/1PM EDT
Develop your own process in accordance with the BPMN 2 standard
Learn Process modeling best practices with Bonita BPM through live exercises
http://www.bonitasoft.com/be-part-of-it/events/bpm-camp-virtual- event?utm_
source=Sourceforge_BPM_Camp_5_6_15&utm_medium=email&utm_campaign=VA_SF
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH v3 1/2] testcases/lib/test.sh: Added ROD_SILENT() and ROD()

[Cyril Hrubis]

Hi!
Pushed, along with patch that adds ROD and ROD_SILENT documentation into
test-writing-guidelines, thanks.

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud 
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH v3 1/2] testcases/lib/test.sh: Added ROD_SILENT() and ROD()

[Cyril Hrubis]

Hi!
> > I update the repository and got the documentation. It looks good, and
> > thank you very much.
> > 
> Maybe you can write the descriptive file such as tar/00_Descriptions.txt,
> but I don't know if it's necessary.

My opinion is that the less documentation is needed the better. Which
means that one should write clean code and if possible avoid cryptic
constructs and comment only parts that needs to be.

In LTP we usually add a short description of the testcase in a comment
at the start of the test source. Looking at the tar testcase, I would be
better to move the description to the comment at the start of the
tar_tests.sh. Having it in separate file is not good idea.

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud 
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH v3 1/2] testcases/lib/test.sh: Added ROD_SILENT() and ROD()

[Cyril Hrubis]

Hi!
> >> Pushed, along with patch that adds ROD and ROD_SILENT documentation into
> >> test-writing-guidelines, thanks.
> >>
> > 
> > I update the repository and got the documentation. It looks good, and
> > thank you very much.
> > 
> Maybe you can write the descriptive file such as tar/00_Descriptions.txt,
> but I don't know if it's necessary.

The test library API is described in the doc/test-writing-guidelines.txt
document, creating documentation for test writers anywhere else is not
good idea.

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud 
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list