Hi! On 01/13/2015 01:24 PM, Cyril Hrubis wrote: > Hi! >> Finger always return 0 with bad user and host test. And it also return >> different error message on different distros. So let's only check stderr >> message and decide whether the test pass or fail. > Okay, so the test passes if anything was written into stderr. Sounds > good to me. > >> Signed-off-by: Hangbin Liu <liuhang...@gmail.com> >> --- >> testcases/network/tcp_cmds/finger/finger01 | 11 +++++------ >> 1 file changed, 5 insertions(+), 6 deletions(-) >> >> diff --git a/testcases/network/tcp_cmds/finger/finger01 >> b/testcases/network/tcp_cmds/finger/finger01 >> index 203d746..e01c1ad 100755 >> --- a/testcases/network/tcp_cmds/finger/finger01 >> +++ b/testcases/network/tcp_cmds/finger/finger01 >> @@ -112,14 +112,13 @@ do_test2() >> BADHOST="xxxx" >> >> tst_resm TINFO "finger -badflag default " >> - finger -x 2>&1 1>/dev/null && end_testcase "finger -x should fail" >> + finger -x &>/dev/null && end_testcase "finger -x should fail" >> >> tst_resm TINFO "finger -bad user " >> - finger $BADUSER 2>&1 1>/dev/null || end_testcase "finger $BADUSER" >> - finger @$BADHOST 2>&1 1>/dev/null | grep "finger: unknown host" \ >> - || end_testcase "finger @$BADHOST" >> - if ! finger $BADUSER@$BADHOST 2>&1 1>/dev/null \ >> - | grep "finger: unknown host"; then >> + [ "$(finger $BADUSER 2>&1 1>/dev/null)" ] || end_testcase "finger >> $BADUSER" >> + [ "$(finger @$BADHOST 2>&1 1>/dev/null)" ] || \ >> + end_testcase "finger @$BADHOST" >> + [ "finger $BADUSER@$BADHOST 2>&1 1>/dev/null" ] || \ > Missing $(), otherwise this will be always true because we just pass a > string to the []. > >> end_testcase "finger $BADUSER@$BADHOST" >> fi > And this fi does belong to the deleted if. > > Alexey can you please fix the minor issues and push the patch?
OK, I'll do it. Thanks, Alexey ------------------------------------------------------------------------------ New Year. New Location. New Benefits. New Data Center in Ashburn, VA. GigeNET is offering a free month of service with a new server in Ashburn. Choose from 2 high performing configs, both with 100TB of bandwidth. Higher redundancy.Lower latency.Increased capacity.Completely compliant. http://p.sf.net/sfu/gigenet _______________________________________________ Ltp-list mailing list Ltp-list@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ltp-list
