* [LTP] [PATCH 1/2 v3] xinetd/xinetd_tests.sh: cleanup tabs
@ 2013-07-10 11:03 Xie Lingyun
2013-07-10 11:03 ` [LTP] [PATCH 2/2 v3] xinetd/xinetd_tests.sh: add IPv6 test for xinetd Xie Lingyun
2013-07-10 17:28 ` [LTP] [PATCH 1/2 v3] xinetd/xinetd_tests.sh: cleanup tabs Caspar Zhang
0 siblings, 2 replies; 16+ messages in thread
From: Xie Lingyun @ 2013-07-10 11:03 UTC (permalink / raw)
To: liuhangbin; +Cc: ltp-list, Xie Lingyun
replace tabs with 4 spaces.
The echo <<-EOF lines become no indentation.
Signed-off-by: Xie Lingyun <lingyun.xie@bj.cs2c.com.cn>
---
testcases/network/xinetd/xinetd_tests.sh | 246 +++++++++++++++----------------
1 file changed, 123 insertions(+), 123 deletions(-)
diff --git a/testcases/network/xinetd/xinetd_tests.sh b/testcases/network/xinetd/xinetd_tests.sh
index 83eb8a7..ea89658 100755
--- a/testcases/network/xinetd/xinetd_tests.sh
+++ b/testcases/network/xinetd/xinetd_tests.sh
@@ -90,46 +90,46 @@ init()
chk_ifexists INIT diff || return $RC
chk_ifexists INIT telnet || return $RC
- # Create custom xinetd.conf file.
- # tst_xinetd.conf.1 config file has telnet service disabled.
- cat > $LTPTMP/tst_xinetd.conf.1 <<-EOF || RC=$?
- defaults
- {
- instances = 25
- log_type = FILE /var/log/servicelog
- log_on_success = HOST PID
- log_on_failure = HOST RECORD
- disabled = telnet
- }
- EOF
-
- # tst_xinetd.conf.2 config file has telnet enabled.
- cat > $LTPTMP/tst_xinetd.conf.2 <<-EOF || RC=$?
- defaults
- {
- instances = 25
- log_type = FILE /var/log/servicelog
- log_on_success = HOST PID
- log_on_failure = HOST
- # disabled = telnet
- }
-
- service telnet
- {
- socket_type = stream
- protocol = tcp
- wait = no
- user = root
- server = /usr/sbin/in.telnetd
- server_args = -n
- no_access =
- }
- EOF
+ # Create custom xinetd.conf file.
+ # tst_xinetd.conf.1 config file has telnet service disabled.
+ cat > $LTPTMP/tst_xinetd.conf.1 <<-EOF || RC=$?
+defaults
+{
+instances = 25
+log_type = FILE /var/log/servicelog
+log_on_success = HOST PID
+log_on_failure = HOST RECORD
+disabled = telnet
+}
+EOF
+
+ # tst_xinetd.conf.2 config file has telnet enabled.
+ cat > $LTPTMP/tst_xinetd.conf.2 <<-EOF || RC=$?
+defaults
+{
+instances = 25
+log_type = FILE /var/log/servicelog
+log_on_success = HOST PID
+log_on_failure = HOST
+# disabled = telnet
+}
+
+service telnet
+{
+socket_type = stream
+protocol = tcp
+wait = no
+user = root
+server = /usr/sbin/in.telnetd
+server_args = -n
+no_access =
+}
+EOF
# Create expected file with telnet disabled.
cat > $LTPTMP/tst_xinetd.exp.1 <<-EOF || RC=$?
- telnet: Unable to connect to remote host: Connection refused
- EOF
+telnet: Unable to connect to remote host: Connection refused
+EOF
if [ $RC -ne 0 ]
then
@@ -139,12 +139,12 @@ init()
fi
# Create expected file with telnet enabled.
- cat > $LTPTMP/tst_xinetd.exp.2 <<-EOF || RC=$?
- Trying 127.0.0.1...
- Connected to localhost (127.0.0.1).
- Escape character is '^]'.
- Connection closed by foreign host.
- EOF
+ cat > $LTPTMP/tst_xinetd.exp.2 <<-EOF || RC=$?
+Trying 127.0.0.1...
+Connected to localhost (127.0.0.1).
+Escape character is '^]'.
+Connection closed by foreign host.
+EOF
if [ $RC -ne 0 ]
then
@@ -165,28 +165,28 @@ init()
# - non-zero on failure.
cleanup()
{
- RC=0
- # restore the original xinetd.conf if a back up exits.
- if [ -f /etc/xinetd.conf.orig ]
- then
- mv /etc/xinetd.conf.orig /etc/xinetd.conf \
- > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
- if [ $RC -ne 0 ]
- then
- tst_res TINFO $LTPTMP/tst_xinetd.err \
- "CLEANUP: failed restoring original xinetd.conf RC=$RC. Details:"
- fi
-
- sleep 1s
-
- # restoring original services
- /etc/init.d/xinetd restart > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
- if [ $RC -ne 0 ]
- then
- tst_res TINFO $LTPTMP/tst_xinetd.err \
- "CLEANUP: failed restoring original services RC=$RC. Details:"
- fi
- fi
+ RC=0
+ # restore the original xinetd.conf if a back up exits.
+ if [ -f /etc/xinetd.conf.orig ]
+ then
+ mv /etc/xinetd.conf.orig /etc/xinetd.conf \
+ > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
+ if [ $RC -ne 0 ]
+ then
+ tst_res TINFO $LTPTMP/tst_xinetd.err \
+ "CLEANUP: failed restoring original xinetd.conf RC=$RC. Details:"
+ fi
+
+ sleep 1s
+
+ # restoring original services
+ /etc/init.d/xinetd restart > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
+ if [ $RC -ne 0 ]
+ then
+ tst_res TINFO $LTPTMP/tst_xinetd.err \
+ "CLEANUP: failed restoring original services RC=$RC. Details:"
+ fi
+ fi
# remove all the temporary files created by this test.
tst_resm TINFO "CLEAN: removing $LTPTMP"
@@ -214,9 +214,9 @@ test01()
tst_resm TINFO "Test #1: restart xinetd with telnet disabled."
- # create a backup of the original xinetd.conf file.
- mv /etc/xinetd.conf /etc/xinetd.conf.orig > $LTPTMP/tst_xinetd.err 2>&1 \
- || RC=$?
+ # create a backup of the original xinetd.conf file.
+ mv /etc/xinetd.conf /etc/xinetd.conf.orig > $LTPTMP/tst_xinetd.err 2>&1 \
+ || RC=$?
if [ $RC -ne 0 ]
then
tst_brk TBROK $LTPTMP/tst_xinetd.err NULL \
@@ -224,9 +224,9 @@ test01()
return $RC
fi
- # install the new config file with telnet disabled.
- mv $LTPTMP/tst_xinetd.conf.1 /etc/xinetd.conf > $LTPTMP/tst_xinetd.err 2>&1 \
- || RC=$?
+ # install the new config file with telnet disabled.
+ mv $LTPTMP/tst_xinetd.conf.1 /etc/xinetd.conf > $LTPTMP/tst_xinetd.err 2>&1 \
+ || RC=$?
if [ $RC -ne 0 ]
then
tst_brk TBROK $LTPTMP/tst_xinetd.err NULL \
@@ -236,36 +236,36 @@ test01()
tst_resm TINFO "Test #1: new xinetd.conf installed with telnet disabled."
- sleep 1s
+ sleep 1s
- # restart xinetd to re-start the services
+ # restart xinetd to re-start the services
/etc/init.d/xinetd restart > $LTPTMP/tst_xinetd.out 2>&1 || RC=$?
if [ $RC -ne 0 ]
then
tst_res TFAIL $LTPTMP/tst_xinetd.out \
"Test #1: unable to restart service with telnet disabled. Details:"
return $RC
- else
- # even if xinetd restart has zero exit value,
- # make certain there was no failure.
- grep -i "fail" $LTPTMP/tst_xinetd.out > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
- if [ $RC -eq 0 ]
- then
- tst_res TFAIL $LTPTMP/tst_xinetd.err \
- "Test #1: xinetd failed to restart. Details"
- return $RC
- else
- RC=0
- tst_resm TINFO \
- "Test #1: xinetd re-started successfully with telnet disabled."
- fi
- fi
-
- # Not checking for exit code from telnet command because telnet is
- # not terminated by the test gracefully.
- echo "\x04" | telnet localhost 2>$LTPTMP/tst_xinetd.out 1>/dev/null
- diff -iwB $LTPTMP/tst_xinetd.out $LTPTMP/tst_xinetd.exp.1 \
- > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
+ else
+ # even if xinetd restart has zero exit value,
+ # make certain there was no failure.
+ grep -i "fail" $LTPTMP/tst_xinetd.out > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
+ if [ $RC -eq 0 ]
+ then
+ tst_res TFAIL $LTPTMP/tst_xinetd.err \
+ "Test #1: xinetd failed to restart. Details"
+ return $RC
+ else
+ RC=0
+ tst_resm TINFO \
+ "Test #1: xinetd re-started successfully with telnet disabled."
+ fi
+ fi
+
+ # Not checking for exit code from telnet command because telnet is
+ # not terminated by the test gracefully.
+ echo "\x04" | telnet localhost 2>$LTPTMP/tst_xinetd.out 1>/dev/null
+ diff -iwB $LTPTMP/tst_xinetd.out $LTPTMP/tst_xinetd.exp.1 \
+ > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
if [ $RC -ne 0 ]
then
tst_res TFAIL $LTPTMP/tst_xinetd.err \
@@ -274,9 +274,9 @@ test01()
fi
tst_resm TINFO "Test #1: restart xinetd with telnet enabled."
- # install the xinetd config file with telnet enabled.
- mv $LTPTMP/tst_xinetd.conf.2 /etc/xinetd.conf > $LTPTMP/tst_xinetd.err 2>&1 \
- || RC=$?
+ # install the xinetd config file with telnet enabled.
+ mv $LTPTMP/tst_xinetd.conf.2 /etc/xinetd.conf > $LTPTMP/tst_xinetd.err 2>&1 \
+ || RC=$?
if [ $RC -ne 0 ]
then
tst_brk TBROK $LTPTMP/tst_xinetd.err NULL \
@@ -286,44 +286,44 @@ test01()
tst_resm TINFO "Test #1: new xinetd.conf installed with telnet enabled."
- sleep 1s
+ sleep 1s
- # restart services.
+ # restart services.
/etc/init.d/xinetd restart > $LTPTMP/tst_xinetd.out 2>&1 || RC=$?
if [ $RC -ne 0 ]
then
tst_res TFAIL $LTPTMP/tst_xinetd.out \
"Test #1: unable to restart services with telnet enabled. Details:"
return $RC
- else
- # even if restart has a zero exit value double check for failure.
- grep -i "fail" $LTPTMP/tst_xinetd.out > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
- if [ $RC -eq 0 ]
- then
- tst_res TFAIL $LTPTMP/tst_xinetd.err \
- "Test #1: xinetd failed to restart. Details"
- return $RC
- else
- RC=0
- tst_resm TINFO \
- "Test #1: xinetd re-started successfully with telnet enabled."
- fi
- fi
-
- # Not checking for exit code from telnet command because telnet is
- # not terminated by the test gracefully.
- echo "\x04" | telnet localhost > $LTPTMP/tst_xinetd.out 2>&1
-
- diff -iwB $LTPTMP/tst_xinetd.out $LTPTMP/tst_xinetd.exp.2 \
- > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
+ else
+ # even if restart has a zero exit value double check for failure.
+ grep -i "fail" $LTPTMP/tst_xinetd.out > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
+ if [ $RC -eq 0 ]
+ then
+ tst_res TFAIL $LTPTMP/tst_xinetd.err \
+ "Test #1: xinetd failed to restart. Details"
+ return $RC
+ else
+ RC=0
+ tst_resm TINFO \
+ "Test #1: xinetd re-started successfully with telnet enabled."
+ fi
+ fi
+
+ # Not checking for exit code from telnet command because telnet is
+ # not terminated by the test gracefully.
+ echo "\x04" | telnet localhost > $LTPTMP/tst_xinetd.out 2>&1
+
+ diff -iwB $LTPTMP/tst_xinetd.out $LTPTMP/tst_xinetd.exp.2 \
+ > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
if [ $RC -ne 0 ]
then
tst_res TFAIL $LTPTMP/tst_xinetd.err \
"Test #1: expected output differes from actual. Details:"
return $RC
- else
- tst_resm TPASS \
- "Test #1: xinetd reads the config file and starts or stops services."
+ else
+ tst_resm TPASS \
+ "Test #1: xinetd reads the config file and starts or stops services."
fi
return $RC
--
1.8.3.1
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply related [flat|nested] 16+ messages in thread* [LTP] [PATCH 2/2 v3] xinetd/xinetd_tests.sh: add IPv6 test for xinetd
2013-07-10 11:03 [LTP] [PATCH 1/2 v3] xinetd/xinetd_tests.sh: cleanup tabs Xie Lingyun
@ 2013-07-10 11:03 ` Xie Lingyun
2013-07-10 17:30 ` Caspar Zhang
2013-07-10 17:28 ` [LTP] [PATCH 1/2 v3] xinetd/xinetd_tests.sh: cleanup tabs Caspar Zhang
1 sibling, 1 reply; 16+ messages in thread
From: Xie Lingyun @ 2013-07-10 11:03 UTC (permalink / raw)
To: liuhangbin; +Cc: ltp-list, Xie Lingyun
If IPv6 is enabled, telnet ::1 will be tested. Otherwise, IPv4 only.
The IPv6 test will be executed first and give a separate result.
Signed-off-by: Xie Lingyun <lingyun.xie@bj.cs2c.com.cn>
---
testcases/network/xinetd/xinetd_tests.sh | 81 +++++++++++++++++++++++++++++---
1 file changed, 75 insertions(+), 6 deletions(-)
diff --git a/testcases/network/xinetd/xinetd_tests.sh b/testcases/network/xinetd/xinetd_tests.sh
index ea89658..143ea76 100755
--- a/testcases/network/xinetd/xinetd_tests.sh
+++ b/testcases/network/xinetd/xinetd_tests.sh
@@ -84,11 +84,22 @@ init()
return $RC
fi
+ # sometimes the default telnet may be /usr/kerberos/bin/telnet
+ TELNET_COMM='/usr/bin/telnet'
+
# check if commands tst_*, xinetd, awk exists.
chk_ifexists INIT tst_resm || return $RC
chk_ifexists INIT xinetd || return $RC
chk_ifexists INIT diff || return $RC
- chk_ifexists INIT telnet || return $RC
+ chk_ifexists INIT ip || return $RC
+ chk_ifexists INIT $TELNET_COMM || return $RC
+
+ IPV6_ENABLED=0
+ ip a | grep inet6 > /dev/null 2>&1
+ if [ $? -eq 0 ]
+ then
+ IPV6_ENABLED=1
+ fi
# Create custom xinetd.conf file.
# tst_xinetd.conf.1 config file has telnet service disabled.
@@ -128,7 +139,7 @@ EOF
# Create expected file with telnet disabled.
cat > $LTPTMP/tst_xinetd.exp.1 <<-EOF || RC=$?
-telnet: Unable to connect to remote host: Connection refused
+telnet: connect to address 127.0.0.1: Connection refused
EOF
if [ $RC -ne 0 ]
@@ -138,10 +149,23 @@ EOF
return $RC
fi
+ if [ $IPV6_ENABLED -eq 1 ]
+ then
+ cat > $LTPTMP/tst_xinetd.exp.1.ipv6 <<-EOF || RC=$?
+telnet: connect to address ::1: Connection refused
+EOF
+
+ if [ $RC -ne 0 ]
+ then
+ tst_brkm TBROK NULL \
+ "INIT: unable to create expected file $LTPTMP/tst_xinetd.exp.1"
+ fi
+ fi
+
# Create expected file with telnet enabled.
cat > $LTPTMP/tst_xinetd.exp.2 <<-EOF || RC=$?
Trying 127.0.0.1...
-Connected to localhost (127.0.0.1).
+Connected to 127.0.0.1.
Escape character is '^]'.
Connection closed by foreign host.
EOF
@@ -149,10 +173,26 @@ EOF
if [ $RC -ne 0 ]
then
tst_brkm TBROK NULL \
- "INIT: unable to create expected file $LTPTMP/tst_xinetd.exp.1"
+ "INIT: unable to create expected file $LTPTMP/tst_xinetd.exp.2"
return $RC
fi
+ if [ $IPV6_ENABLED -eq 1 ]
+ then
+ cat > $LTPTMP/tst_xinetd.exp.2.ipv6 <<-EOF || RC=$?
+Trying ::1...
+Connected to ::1.
+Escape character is '^]'.
+Connection closed by foreign host.
+EOF
+
+ if [ $RC -ne 0 ]
+ then
+ tst_brkm TBROK NULL \
+ "INIT: unable to create expected file $LTPTMP/tst_xinetd.exp.2.ipv6"
+ fi
+ fi
+
return $RC
}
@@ -263,7 +303,20 @@ test01()
# Not checking for exit code from telnet command because telnet is
# not terminated by the test gracefully.
- echo "\x04" | telnet localhost 2>$LTPTMP/tst_xinetd.out 1>/dev/null
+ if [ $IPV6_ENABLED -eq 1 ]
+ then
+ echo "\x04" | $TELNET_COMM ::1 2>$LTPTMP/tst_xinetd.out.ipv6 1>/dev/null
+ diff -iwB $LTPTMP/tst_xinetd.out.ipv6 $LTPTMP/tst_xinetd.exp.1.ipv6 \
+ > $LTPTMP/tst_xinetd.err.ipv6 2>&1 || RC=$?
+ if [ $RC -ne 0 ]
+ then
+ tst_res TFAIL $LTPTMP/tst_xinetd.err.ipv6 \
+ "Test #1: with telnet diabled expected out differs RC=$RC. Details:"
+ return $RC
+ fi
+ fi
+
+ echo "\x04" | $TELNET_COMM 127.0.0.1 2>$LTPTMP/tst_xinetd.out 1>/dev/null
diff -iwB $LTPTMP/tst_xinetd.out $LTPTMP/tst_xinetd.exp.1 \
> $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
if [ $RC -ne 0 ]
@@ -312,7 +365,23 @@ test01()
# Not checking for exit code from telnet command because telnet is
# not terminated by the test gracefully.
- echo "\x04" | telnet localhost > $LTPTMP/tst_xinetd.out 2>&1
+ if [ $IPV6_ENABLED -eq 1 ]
+ then
+ echo "\x04" | $TELNET_COMM ::1 >$LTPTMP/tst_xinetd.out.ipv6 2>&1
+ diff -iwB $LTPTMP/tst_xinetd.out.ipv6 $LTPTMP/tst_xinetd.exp.2.ipv6 \
+ > $LTPTMP/tst_xinetd.err.ipv6 2>&1 || RC=$?
+ if [ $RC -ne 0 ]
+ then
+ tst_res TFAIL $LTPTMP/tst_xinetd.err.ipv6 \
+ "Test #1: with telnet diabled expected out differs RC=$RC. Details:"
+ return $RC
+ else
+ tst_resm TPASS \
+ "Test #1: xinetd reads the config file and starts or stops IPv6 services."
+ fi
+ fi
+
+ echo "\x04" | $TELNET_COMM 127.0.0.1 > $LTPTMP/tst_xinetd.out 2>&1
diff -iwB $LTPTMP/tst_xinetd.out $LTPTMP/tst_xinetd.exp.2 \
> $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
--
1.8.3.1
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [LTP] [PATCH 2/2 v3] xinetd/xinetd_tests.sh: add IPv6 test for xinetd
2013-07-10 11:03 ` [LTP] [PATCH 2/2 v3] xinetd/xinetd_tests.sh: add IPv6 test for xinetd Xie Lingyun
@ 2013-07-10 17:30 ` Caspar Zhang
2013-07-11 7:43 ` Xie Lingyun
2013-07-11 7:55 ` Hangbin Liu
0 siblings, 2 replies; 16+ messages in thread
From: Caspar Zhang @ 2013-07-10 17:30 UTC (permalink / raw)
To: Xie Lingyun; +Cc: ltp-list
On 07/10/2013 07:03 PM, Xie Lingyun wrote:
> If IPv6 is enabled, telnet ::1 will be tested. Otherwise, IPv4 only.
> The IPv6 test will be executed first and give a separate result.
>
> Signed-off-by: Xie Lingyun <lingyun.xie@bj.cs2c.com.cn>
> ---
> testcases/network/xinetd/xinetd_tests.sh | 81 +++++++++++++++++++++++++++++---
> 1 file changed, 75 insertions(+), 6 deletions(-)
>
> diff --git a/testcases/network/xinetd/xinetd_tests.sh b/testcases/network/xinetd/xinetd_tests.sh
> index ea89658..143ea76 100755
> --- a/testcases/network/xinetd/xinetd_tests.sh
> +++ b/testcases/network/xinetd/xinetd_tests.sh
> @@ -84,11 +84,22 @@ init()
> return $RC
> fi
>
> + # sometimes the default telnet may be /usr/kerberos/bin/telnet
> + TELNET_COMM='/usr/bin/telnet'
> +
> # check if commands tst_*, xinetd, awk exists.
> chk_ifexists INIT tst_resm || return $RC
> chk_ifexists INIT xinetd || return $RC
> chk_ifexists INIT diff || return $RC
> - chk_ifexists INIT telnet || return $RC
> + chk_ifexists INIT ip || return $RC
> + chk_ifexists INIT $TELNET_COMM || return $RC
> +
> + IPV6_ENABLED=0
> + ip a | grep inet6 > /dev/null 2>&1
> + if [ $? -eq 0 ]
> + then
> + IPV6_ENABLED=1
> + fi
>
> # Create custom xinetd.conf file.
> # tst_xinetd.conf.1 config file has telnet service disabled.
> @@ -128,7 +139,7 @@ EOF
>
> # Create expected file with telnet disabled.
> cat > $LTPTMP/tst_xinetd.exp.1 <<-EOF || RC=$?
> -telnet: Unable to connect to remote host: Connection refused
> +telnet: connect to address 127.0.0.1: Connection refused
> EOF
>
> if [ $RC -ne 0 ]
> @@ -138,10 +149,23 @@ EOF
> return $RC
> fi
>
> + if [ $IPV6_ENABLED -eq 1 ]
> + then
> + cat > $LTPTMP/tst_xinetd.exp.1.ipv6 <<-EOF || RC=$?
> +telnet: connect to address ::1: Connection refused
> +EOF
> +
> + if [ $RC -ne 0 ]
> + then
> + tst_brkm TBROK NULL \
> + "INIT: unable to create expected file $LTPTMP/tst_xinetd.exp.1"
> + fi
> + fi
> +
> # Create expected file with telnet enabled.
> cat > $LTPTMP/tst_xinetd.exp.2 <<-EOF || RC=$?
> Trying 127.0.0.1...
> -Connected to localhost (127.0.0.1).
> +Connected to 127.0.0.1.
> Escape character is '^]'.
> Connection closed by foreign host.
> EOF
> @@ -149,10 +173,26 @@ EOF
> if [ $RC -ne 0 ]
> then
> tst_brkm TBROK NULL \
> - "INIT: unable to create expected file $LTPTMP/tst_xinetd.exp.1"
> + "INIT: unable to create expected file $LTPTMP/tst_xinetd.exp.2"
> return $RC
> fi
>
> + if [ $IPV6_ENABLED -eq 1 ]
> + then
> + cat > $LTPTMP/tst_xinetd.exp.2.ipv6 <<-EOF || RC=$?
> +Trying ::1...
> +Connected to ::1.
> +Escape character is '^]'.
> +Connection closed by foreign host.
> +EOF
> +
> + if [ $RC -ne 0 ]
> + then
> + tst_brkm TBROK NULL \
> + "INIT: unable to create expected file $LTPTMP/tst_xinetd.exp.2.ipv6"
> + fi
> + fi
> +
> return $RC
> }
>
> @@ -263,7 +303,20 @@ test01()
>
> # Not checking for exit code from telnet command because telnet is
> # not terminated by the test gracefully.
> - echo "\x04" | telnet localhost 2>$LTPTMP/tst_xinetd.out 1>/dev/null
> + if [ $IPV6_ENABLED -eq 1 ]
> + then
> + echo "\x04" | $TELNET_COMM ::1 2>$LTPTMP/tst_xinetd.out.ipv6 1>/dev/null
> + diff -iwB $LTPTMP/tst_xinetd.out.ipv6 $LTPTMP/tst_xinetd.exp.1.ipv6 \
> + > $LTPTMP/tst_xinetd.err.ipv6 2>&1 || RC=$?
> + if [ $RC -ne 0 ]
> + then
> + tst_res TFAIL $LTPTMP/tst_xinetd.err.ipv6 \
> + "Test #1: with telnet diabled expected out differs RC=$RC. Details:"
> + return $RC
> + fi
> + fi
> +
> + echo "\x04" | $TELNET_COMM 127.0.0.1 2>$LTPTMP/tst_xinetd.out 1>/dev/null
> diff -iwB $LTPTMP/tst_xinetd.out $LTPTMP/tst_xinetd.exp.1 \
> > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
> if [ $RC -ne 0 ]
> @@ -312,7 +365,23 @@ test01()
>
> # Not checking for exit code from telnet command because telnet is
> # not terminated by the test gracefully.
> - echo "\x04" | telnet localhost > $LTPTMP/tst_xinetd.out 2>&1
> + if [ $IPV6_ENABLED -eq 1 ]
> + then
> + echo "\x04" | $TELNET_COMM ::1 >$LTPTMP/tst_xinetd.out.ipv6 2>&1
> + diff -iwB $LTPTMP/tst_xinetd.out.ipv6 $LTPTMP/tst_xinetd.exp.2.ipv6 \
> + > $LTPTMP/tst_xinetd.err.ipv6 2>&1 || RC=$?
> + if [ $RC -ne 0 ]
> + then
> + tst_res TFAIL $LTPTMP/tst_xinetd.err.ipv6 \
> + "Test #1: with telnet diabled expected out differs RC=$RC. Details:"
> + return $RC
> + else
> + tst_resm TPASS \
> + "Test #1: xinetd reads the config file and starts or stops IPv6 services."
> + fi
> + fi
> +
> + echo "\x04" | $TELNET_COMM 127.0.0.1 > $LTPTMP/tst_xinetd.out 2>&1
>
> diff -iwB $LTPTMP/tst_xinetd.out $LTPTMP/tst_xinetd.exp.2 \
> > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
>
Patch looks good to me.
Could you also give a running result based on your patch? Thanks.
Leo, please help with review if you have some time :-)
Thanks,
Caspar
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [LTP] [PATCH 2/2 v3] xinetd/xinetd_tests.sh: add IPv6 test for xinetd
2013-07-10 17:30 ` Caspar Zhang
@ 2013-07-11 7:43 ` Xie Lingyun
2013-07-11 8:00 ` Xie Lingyun
2013-07-11 7:55 ` Hangbin Liu
1 sibling, 1 reply; 16+ messages in thread
From: Xie Lingyun @ 2013-07-11 7:43 UTC (permalink / raw)
To: Caspar Zhang; +Cc: LTP List
[-- Attachment #1.1: Type: text/plain, Size: 6456 bytes --]
The following is the result of the patch
<<<test_output>>>
incrementing stop
xinetd01 0 TINFO : Test #1: restart xinetd with telnet disabled.
xinetd01 0 TINFO : Test #1: new xinetd.conf installed with telnet
disabled.
xinetd01 0 TINFO : Test #1: xinetd re-started successfully with
telnet disabled.
xinetd01 0 TINFO : Test #1: restart xinetd with telnet enabled.
xinetd01 0 TINFO : Test #1: new xinetd.conf installed with telnet
enabled.
xinetd01 0 TINFO : Test #1: xinetd re-started successfully with
telnet enabled.
xinetd01 1 TPASS : Test #1: xinetd reads the config file and starts
or stops IPv6 services.
xinetd01 1 TPASS : Test #1: xinetd reads the config file and starts
or stops services.
xinetd01 0 TINFO : CLEAN: removing
/tmp/ltp-pMqQ0DlsKd/tst_xinetd.24156
Thanks,
Lingyun Xie
2013/7/11 Caspar Zhang <caspar@casparzhang.com>
> On 07/10/2013 07:03 PM, Xie Lingyun wrote:
>
>> If IPv6 is enabled, telnet ::1 will be tested. Otherwise, IPv4 only.
>> The IPv6 test will be executed first and give a separate result.
>>
>> Signed-off-by: Xie Lingyun <lingyun.xie@bj.cs2c.com.cn>
>> ---
>> testcases/network/xinetd/**xinetd_tests.sh | 81
>> +++++++++++++++++++++++++++++-**--
>> 1 file changed, 75 insertions(+), 6 deletions(-)
>>
>> diff --git a/testcases/network/xinetd/**xinetd_tests.sh
>> b/testcases/network/xinetd/**xinetd_tests.sh
>> index ea89658..143ea76 100755
>> --- a/testcases/network/xinetd/**xinetd_tests.sh
>> +++ b/testcases/network/xinetd/**xinetd_tests.sh
>> @@ -84,11 +84,22 @@ init()
>> return $RC
>> fi
>>
>> + # sometimes the default telnet may be /usr/kerberos/bin/telnet
>> + TELNET_COMM='/usr/bin/telnet'
>> +
>> # check if commands tst_*, xinetd, awk exists.
>> chk_ifexists INIT tst_resm || return $RC
>> chk_ifexists INIT xinetd || return $RC
>> chk_ifexists INIT diff || return $RC
>> - chk_ifexists INIT telnet || return $RC
>> + chk_ifexists INIT ip || return $RC
>> + chk_ifexists INIT $TELNET_COMM || return $RC
>> +
>> + IPV6_ENABLED=0
>> + ip a | grep inet6 > /dev/null 2>&1
>> + if [ $? -eq 0 ]
>> + then
>> + IPV6_ENABLED=1
>> + fi
>>
>> # Create custom xinetd.conf file.
>> # tst_xinetd.conf.1 config file has telnet service disabled.
>> @@ -128,7 +139,7 @@ EOF
>>
>> # Create expected file with telnet disabled.
>> cat > $LTPTMP/tst_xinetd.exp.1 <<-EOF || RC=$?
>> -telnet: Unable to connect to remote host: Connection refused
>> +telnet: connect to address 127.0.0.1: Connection refused
>> EOF
>>
>> if [ $RC -ne 0 ]
>> @@ -138,10 +149,23 @@ EOF
>> return $RC
>> fi
>>
>> + if [ $IPV6_ENABLED -eq 1 ]
>> + then
>> + cat > $LTPTMP/tst_xinetd.exp.1.ipv6 <<-EOF || RC=$?
>> +telnet: connect to address ::1: Connection refused
>> +EOF
>> +
>> + if [ $RC -ne 0 ]
>> + then
>> + tst_brkm TBROK NULL \
>> + "INIT: unable to create expected file
>> $LTPTMP/tst_xinetd.exp.1"
>> + fi
>> + fi
>> +
>> # Create expected file with telnet enabled.
>> cat > $LTPTMP/tst_xinetd.exp.2 <<-EOF || RC=$?
>> Trying 127.0.0.1...
>> -Connected to localhost (127.0.0.1).
>> +Connected to 127.0.0.1.
>> Escape character is '^]'.
>> Connection closed by foreign host.
>> EOF
>> @@ -149,10 +173,26 @@ EOF
>> if [ $RC -ne 0 ]
>> then
>> tst_brkm TBROK NULL \
>> - "INIT: unable to create expected file
>> $LTPTMP/tst_xinetd.exp.1"
>> + "INIT: unable to create expected file
>> $LTPTMP/tst_xinetd.exp.2"
>> return $RC
>> fi
>>
>> + if [ $IPV6_ENABLED -eq 1 ]
>> + then
>> + cat > $LTPTMP/tst_xinetd.exp.2.ipv6 <<-EOF || RC=$?
>> +Trying ::1...
>> +Connected to ::1.
>> +Escape character is '^]'.
>> +Connection closed by foreign host.
>> +EOF
>> +
>> + if [ $RC -ne 0 ]
>> + then
>> + tst_brkm TBROK NULL \
>> + "INIT: unable to create expected file
>> $LTPTMP/tst_xinetd.exp.2.ipv6"
>> + fi
>> + fi
>> +
>> return $RC
>> }
>>
>> @@ -263,7 +303,20 @@ test01()
>>
>> # Not checking for exit code from telnet command because telnet is
>> # not terminated by the test gracefully.
>> - echo " " | telnet localhost 2>$LTPTMP/tst_xinetd.out 1>/dev/null
>> + if [ $IPV6_ENABLED -eq 1 ]
>> + then
>> + echo " " | $TELNET_COMM ::1 2>$LTPTMP/tst_xinetd.out.ipv6
>> 1>/dev/null
>> + diff -iwB $LTPTMP/tst_xinetd.out.ipv6
>> $LTPTMP/tst_xinetd.exp.1.ipv6 \
>> + > $LTPTMP/tst_xinetd.err.ipv6 2>&1 || RC=$?
>> + if [ $RC -ne 0 ]
>> + then
>> + tst_res TFAIL $LTPTMP/tst_xinetd.err.ipv6 \
>> + "Test #1: with telnet diabled expected out differs
>> RC=$RC. Details:"
>> + return $RC
>> + fi
>> + fi
>> +
>> + echo " " | $TELNET_COMM 127.0.0.1 2>$LTPTMP/tst_xinetd.out
>> 1>/dev/null
>> diff -iwB $LTPTMP/tst_xinetd.out $LTPTMP/tst_xinetd.exp.1 \
>> > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
>> if [ $RC -ne 0 ]
>> @@ -312,7 +365,23 @@ test01()
>>
>> # Not checking for exit code from telnet command because telnet is
>> # not terminated by the test gracefully.
>> - echo " " | telnet localhost > $LTPTMP/tst_xinetd.out 2>&1
>> + if [ $IPV6_ENABLED -eq 1 ]
>> + then
>> + echo " " | $TELNET_COMM ::1 >$LTPTMP/tst_xinetd.out.ipv6 2>&1
>> + diff -iwB $LTPTMP/tst_xinetd.out.ipv6
>> $LTPTMP/tst_xinetd.exp.2.ipv6 \
>> + > $LTPTMP/tst_xinetd.err.ipv6 2>&1 || RC=$?
>> + if [ $RC -ne 0 ]
>> + then
>> + tst_res TFAIL $LTPTMP/tst_xinetd.err.ipv6 \
>> + "Test #1: with telnet diabled expected out differs
>> RC=$RC. Details:"
>> + return $RC
>> + else
>> + tst_resm TPASS \
>> + "Test #1: xinetd reads the config file and starts or stops
>> IPv6 services."
>> + fi
>> + fi
>> +
>> + echo " " | $TELNET_COMM 127.0.0.1 > $LTPTMP/tst_xinetd.out 2>&1
>>
>> diff -iwB $LTPTMP/tst_xinetd.out $LTPTMP/tst_xinetd.exp.2 \
>> > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
>>
>>
> Patch looks good to me.
>
> Could you also give a running result based on your patch? Thanks.
>
> Leo, please help with review if you have some time :-)
>
> Thanks,
> Caspar
>
>
>
[-- Attachment #1.2: Type: text/html, Size: 8995 bytes --]
[-- Attachment #2: Type: text/plain, Size: 394 bytes --]
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
[-- Attachment #3: Type: text/plain, Size: 155 bytes --]
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [LTP] [PATCH 2/2 v3] xinetd/xinetd_tests.sh: add IPv6 test for xinetd
2013-07-11 7:43 ` Xie Lingyun
@ 2013-07-11 8:00 ` Xie Lingyun
2013-07-11 8:03 ` Caspar Zhang
2013-07-12 0:45 ` Wanlong Gao
0 siblings, 2 replies; 16+ messages in thread
From: Xie Lingyun @ 2013-07-11 8:00 UTC (permalink / raw)
To: Caspar Zhang; +Cc: LTP List
[-- Attachment #1.1: Type: text/plain, Size: 6878 bytes --]
This patch follows the previous clean up patch. Only change some
indentations.
Without any other changes of version 3.
Thanks,
Lingyun Xie
2013/7/11 Xie Lingyun <lingyun.xie@bj.cs2c.com.cn>
> The following is the result of the patch
>
> <<<test_output>>>
> incrementing stop
> xinetd01 0 TINFO : Test #1: restart xinetd with telnet disabled.
> xinetd01 0 TINFO : Test #1: new xinetd.conf installed with telnet
> disabled.
> xinetd01 0 TINFO : Test #1: xinetd re-started successfully with
> telnet disabled.
> xinetd01 0 TINFO : Test #1: restart xinetd with telnet enabled.
> xinetd01 0 TINFO : Test #1: new xinetd.conf installed with telnet
> enabled.
> xinetd01 0 TINFO : Test #1: xinetd re-started successfully with
> telnet enabled.
> xinetd01 1 TPASS : Test #1: xinetd reads the config file and starts
> or stops IPv6 services.
> xinetd01 1 TPASS : Test #1: xinetd reads the config file and starts
> or stops services.
> xinetd01 0 TINFO : CLEAN: removing
> /tmp/ltp-pMqQ0DlsKd/tst_xinetd.24156
>
>
> Thanks,
> Lingyun Xie
>
>
> 2013/7/11 Caspar Zhang <caspar@casparzhang.com>
>
>> On 07/10/2013 07:03 PM, Xie Lingyun wrote:
>>
>>> If IPv6 is enabled, telnet ::1 will be tested. Otherwise, IPv4 only.
>>> The IPv6 test will be executed first and give a separate result.
>>>
>>> Signed-off-by: Xie Lingyun <lingyun.xie@bj.cs2c.com.cn>
>>> ---
>>> testcases/network/xinetd/**xinetd_tests.sh | 81
>>> +++++++++++++++++++++++++++++-**--
>>> 1 file changed, 75 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/testcases/network/xinetd/**xinetd_tests.sh
>>> b/testcases/network/xinetd/**xinetd_tests.sh
>>> index ea89658..143ea76 100755
>>> --- a/testcases/network/xinetd/**xinetd_tests.sh
>>> +++ b/testcases/network/xinetd/**xinetd_tests.sh
>>> @@ -84,11 +84,22 @@ init()
>>> return $RC
>>> fi
>>>
>>> + # sometimes the default telnet may be /usr/kerberos/bin/telnet
>>> + TELNET_COMM='/usr/bin/telnet'
>>> +
>>> # check if commands tst_*, xinetd, awk exists.
>>> chk_ifexists INIT tst_resm || return $RC
>>> chk_ifexists INIT xinetd || return $RC
>>> chk_ifexists INIT diff || return $RC
>>> - chk_ifexists INIT telnet || return $RC
>>> + chk_ifexists INIT ip || return $RC
>>> + chk_ifexists INIT $TELNET_COMM || return $RC
>>> +
>>> + IPV6_ENABLED=0
>>> + ip a | grep inet6 > /dev/null 2>&1
>>> + if [ $? -eq 0 ]
>>> + then
>>> + IPV6_ENABLED=1
>>> + fi
>>>
>>> # Create custom xinetd.conf file.
>>> # tst_xinetd.conf.1 config file has telnet service disabled.
>>> @@ -128,7 +139,7 @@ EOF
>>>
>>> # Create expected file with telnet disabled.
>>> cat > $LTPTMP/tst_xinetd.exp.1 <<-EOF || RC=$?
>>> -telnet: Unable to connect to remote host: Connection refused
>>> +telnet: connect to address 127.0.0.1: Connection refused
>>> EOF
>>>
>>> if [ $RC -ne 0 ]
>>> @@ -138,10 +149,23 @@ EOF
>>> return $RC
>>> fi
>>>
>>> + if [ $IPV6_ENABLED -eq 1 ]
>>> + then
>>> + cat > $LTPTMP/tst_xinetd.exp.1.ipv6 <<-EOF || RC=$?
>>> +telnet: connect to address ::1: Connection refused
>>> +EOF
>>> +
>>> + if [ $RC -ne 0 ]
>>> + then
>>> + tst_brkm TBROK NULL \
>>> + "INIT: unable to create expected file
>>> $LTPTMP/tst_xinetd.exp.1"
>>> + fi
>>> + fi
>>> +
>>> # Create expected file with telnet enabled.
>>> cat > $LTPTMP/tst_xinetd.exp.2 <<-EOF || RC=$?
>>> Trying 127.0.0.1...
>>> -Connected to localhost (127.0.0.1).
>>> +Connected to 127.0.0.1.
>>> Escape character is '^]'.
>>> Connection closed by foreign host.
>>> EOF
>>> @@ -149,10 +173,26 @@ EOF
>>> if [ $RC -ne 0 ]
>>> then
>>> tst_brkm TBROK NULL \
>>> - "INIT: unable to create expected file
>>> $LTPTMP/tst_xinetd.exp.1"
>>> + "INIT: unable to create expected file
>>> $LTPTMP/tst_xinetd.exp.2"
>>> return $RC
>>> fi
>>>
>>> + if [ $IPV6_ENABLED -eq 1 ]
>>> + then
>>> + cat > $LTPTMP/tst_xinetd.exp.2.ipv6 <<-EOF || RC=$?
>>> +Trying ::1...
>>> +Connected to ::1.
>>> +Escape character is '^]'.
>>> +Connection closed by foreign host.
>>> +EOF
>>> +
>>> + if [ $RC -ne 0 ]
>>> + then
>>> + tst_brkm TBROK NULL \
>>> + "INIT: unable to create expected file
>>> $LTPTMP/tst_xinetd.exp.2.ipv6"
>>> + fi
>>> + fi
>>> +
>>> return $RC
>>> }
>>>
>>> @@ -263,7 +303,20 @@ test01()
>>>
>>> # Not checking for exit code from telnet command because telnet is
>>> # not terminated by the test gracefully.
>>> - echo " " | telnet localhost 2>$LTPTMP/tst_xinetd.out 1>/dev/null
>>> + if [ $IPV6_ENABLED -eq 1 ]
>>> + then
>>> + echo " " | $TELNET_COMM ::1 2>$LTPTMP/tst_xinetd.out.ipv6
>>> 1>/dev/null
>>> + diff -iwB $LTPTMP/tst_xinetd.out.ipv6
>>> $LTPTMP/tst_xinetd.exp.1.ipv6 \
>>> + > $LTPTMP/tst_xinetd.err.ipv6 2>&1 || RC=$?
>>> + if [ $RC -ne 0 ]
>>> + then
>>> + tst_res TFAIL $LTPTMP/tst_xinetd.err.ipv6 \
>>> + "Test #1: with telnet diabled expected out differs
>>> RC=$RC. Details:"
>>> + return $RC
>>> + fi
>>> + fi
>>> +
>>> + echo " " | $TELNET_COMM 127.0.0.1 2>$LTPTMP/tst_xinetd.out
>>> 1>/dev/null
>>> diff -iwB $LTPTMP/tst_xinetd.out $LTPTMP/tst_xinetd.exp.1 \
>>> > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
>>> if [ $RC -ne 0 ]
>>> @@ -312,7 +365,23 @@ test01()
>>>
>>> # Not checking for exit code from telnet command because telnet is
>>> # not terminated by the test gracefully.
>>> - echo " " | telnet localhost > $LTPTMP/tst_xinetd.out 2>&1
>>> + if [ $IPV6_ENABLED -eq 1 ]
>>> + then
>>> + echo " " | $TELNET_COMM ::1 >$LTPTMP/tst_xinetd.out.ipv6 2>&1
>>> + diff -iwB $LTPTMP/tst_xinetd.out.ipv6
>>> $LTPTMP/tst_xinetd.exp.2.ipv6 \
>>> + > $LTPTMP/tst_xinetd.err.ipv6 2>&1 || RC=$?
>>> + if [ $RC -ne 0 ]
>>> + then
>>> + tst_res TFAIL $LTPTMP/tst_xinetd.err.ipv6 \
>>> + "Test #1: with telnet diabled expected out differs
>>> RC=$RC. Details:"
>>> + return $RC
>>> + else
>>> + tst_resm TPASS \
>>> + "Test #1: xinetd reads the config file and starts or stops
>>> IPv6 services."
>>> + fi
>>> + fi
>>> +
>>> + echo " " | $TELNET_COMM 127.0.0.1 > $LTPTMP/tst_xinetd.out 2>&1
>>>
>>> diff -iwB $LTPTMP/tst_xinetd.out $LTPTMP/tst_xinetd.exp.2 \
>>> > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
>>>
>>>
>> Patch looks good to me.
>>
>> Could you also give a running result based on your patch? Thanks.
>>
>> Leo, please help with review if you have some time :-)
>>
>> Thanks,
>> Caspar
>>
>>
>>
>
[-- Attachment #1.2: Type: text/html, Size: 9758 bytes --]
[-- Attachment #2: 0002-xinetd-xinetd_tests.sh-add-IPv6-test-for-xinetd.patch --]
[-- Type: application/octet-stream, Size: 5065 bytes --]
[-- Attachment #3: Type: text/plain, Size: 394 bytes --]
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
[-- Attachment #4: Type: text/plain, Size: 155 bytes --]
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [LTP] [PATCH 2/2 v3] xinetd/xinetd_tests.sh: add IPv6 test for xinetd
2013-07-11 8:00 ` Xie Lingyun
@ 2013-07-11 8:03 ` Caspar Zhang
2013-07-12 0:45 ` Wanlong Gao
1 sibling, 0 replies; 16+ messages in thread
From: Caspar Zhang @ 2013-07-11 8:03 UTC (permalink / raw)
To: Xie Lingyun; +Cc: LTP List
On 07/11/2013 04:00 PM, Xie Lingyun wrote:
>
> From b80c141e2dcc37e4470fccb04ca70e4782e98a6e Mon Sep 17 00:00:00 2001
> From: Xie Lingyun<lingyun.xie@bj.cs2c.com.cn>
> Date: Thu, 11 Jul 2013 15:14:18 +0800
> Subject: [PATCH 2/2 v4] xinetd/xinetd_tests.sh: add IPv6 test for xinetd
>
> If IPv6 is enabled, telnet ::1 will be tested. Otherwise, IPv4 only.
> The IPv6 test will be executed first and give a separate result.
>
> Signed-off-by: Xie Lingyun<lingyun.xie@bj.cs2c.com.cn>
> ---
> testcases/network/xinetd/xinetd_tests.sh | 81 +++++++++++++++++++++++++++++---
> 1 file changed, 75 insertions(+), 6 deletions(-)
>
> diff --git a/testcases/network/xinetd/xinetd_tests.sh b/testcases/network/xinetd/xinetd_tests.sh
> index d898af0..a607d32 100755
> --- a/testcases/network/xinetd/xinetd_tests.sh
> +++ b/testcases/network/xinetd/xinetd_tests.sh
> @@ -84,11 +84,22 @@ init()
> return $RC
> fi
>
> + # sometimes the default telnet may be /usr/kerberos/bin/telnet
> + TELNET_COMM='/usr/bin/telnet'
> +
> # check if commands tst_*, xinetd, awk exists.
> chk_ifexists INIT tst_resm || return $RC
> chk_ifexists INIT xinetd || return $RC
> chk_ifexists INIT diff || return $RC
> - chk_ifexists INIT telnet || return $RC
> + chk_ifexists INIT ip || return $RC
> + chk_ifexists INIT $TELNET_COMM || return $RC
> +
> + IPV6_ENABLED=0
> + ip a | grep inet6 > /dev/null 2>&1
> + if [ $? -eq 0 ]
> + then
> + IPV6_ENABLED=1
> + fi
>
> # Create custom xinetd.conf file.
> # tst_xinetd.conf.1 config file has telnet service disabled.
> @@ -128,7 +139,7 @@ EOF
>
> # Create expected file with telnet disabled.
> cat > $LTPTMP/tst_xinetd.exp.1 <<-EOF || RC=$?
> -telnet: Unable to connect to remote host: Connection refused
> +telnet: connect to address 127.0.0.1: Connection refused
> EOF
>
> if [ $RC -ne 0 ]
> @@ -138,10 +149,23 @@ EOF
> return $RC
> fi
>
> + if [ $IPV6_ENABLED -eq 1 ]
> + then
> + cat > $LTPTMP/tst_xinetd.exp.1.ipv6 <<-EOF || RC=$?
> +telnet: connect to address ::1: Connection refused
> +EOF
> +
> + if [ $RC -ne 0 ]
> + then
> + tst_brkm TBROK NULL \
> + "INIT: unable to create expected file $LTPTMP/tst_xinetd.exp.1"
> + fi
> + fi
> +
> # Create expected file with telnet enabled.
> cat > $LTPTMP/tst_xinetd.exp.2 <<-EOF || RC=$?
> Trying 127.0.0.1...
> -Connected to localhost (127.0.0.1).
> +Connected to 127.0.0.1.
> Escape character is '^]'.
> Connection closed by foreign host.
> EOF
> @@ -149,10 +173,26 @@ EOF
> if [ $RC -ne 0 ]
> then
> tst_brkm TBROK NULL \
> - "INIT: unable to create expected file $LTPTMP/tst_xinetd.exp.1"
> + "INIT: unable to create expected file $LTPTMP/tst_xinetd.exp.2"
> return $RC
> fi
>
> + if [ $IPV6_ENABLED -eq 1 ]
> + then
> + cat > $LTPTMP/tst_xinetd.exp.2.ipv6 <<-EOF || RC=$?
> +Trying ::1...
> +Connected to ::1.
> +Escape character is '^]'.
> +Connection closed by foreign host.
> +EOF
> +
> + if [ $RC -ne 0 ]
> + then
> + tst_brkm TBROK NULL \
> + "INIT: unable to create expected file $LTPTMP/tst_xinetd.exp.2.ipv6"
> + fi
> + fi
> +
> return $RC
> }
>
> @@ -263,7 +303,20 @@ test01()
>
> # Not checking for exit code from telnet command because telnet is
> # not terminated by the test gracefully.
> - echo "\x04" | telnet localhost 2>$LTPTMP/tst_xinetd.out 1>/dev/null
> + if [ $IPV6_ENABLED -eq 1 ]
> + then
> + echo "\x04" | $TELNET_COMM ::1 2>$LTPTMP/tst_xinetd.out.ipv6 1>/dev/null
> + diff -iwB $LTPTMP/tst_xinetd.out.ipv6 $LTPTMP/tst_xinetd.exp.1.ipv6 \
> + > $LTPTMP/tst_xinetd.err.ipv6 2>&1 || RC=$?
> + if [ $RC -ne 0 ]
> + then
> + tst_res TFAIL $LTPTMP/tst_xinetd.err.ipv6 \
> + "Test #1: with telnet diabled expected out differs RC=$RC. Details:"
> + return $RC
> + fi
> + fi
> +
> + echo "\x04" | $TELNET_COMM 127.0.0.1 2>$LTPTMP/tst_xinetd.out 1>/dev/null
> diff -iwB $LTPTMP/tst_xinetd.out $LTPTMP/tst_xinetd.exp.1 \
> > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
> if [ $RC -ne 0 ]
> @@ -312,7 +365,23 @@ test01()
>
> # Not checking for exit code from telnet command because telnet is
> # not terminated by the test gracefully.
> - echo "\x04" | telnet localhost > $LTPTMP/tst_xinetd.out 2>&1
> + if [ $IPV6_ENABLED -eq 1 ]
> + then
> + echo "\x04" | $TELNET_COMM ::1 >$LTPTMP/tst_xinetd.out.ipv6 2>&1
> + diff -iwB $LTPTMP/tst_xinetd.out.ipv6 $LTPTMP/tst_xinetd.exp.2.ipv6 \
> + > $LTPTMP/tst_xinetd.err.ipv6 2>&1 || RC=$?
> + if [ $RC -ne 0 ]
> + then
> + tst_res TFAIL $LTPTMP/tst_xinetd.err.ipv6 \
> + "Test #1: with telnet diabled expected out differs RC=$RC. Details:"
> + return $RC
> + else
> + tst_resm TPASS \
> + "Test #1: xinetd reads the config file and starts or stops IPv6 services."
> + fi
> + fi
> +
> + echo "\x04" | $TELNET_COMM 127.0.0.1 > $LTPTMP/tst_xinetd.out 2>&1
>
> diff -iwB $LTPTMP/tst_xinetd.out $LTPTMP/tst_xinetd.exp.2 \
> > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
> -- 1.8.3.1
Reviewed-by: Caspar Zhang <caspar@casparzhang.com>
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [LTP] [PATCH 2/2 v3] xinetd/xinetd_tests.sh: add IPv6 test for xinetd
2013-07-11 8:00 ` Xie Lingyun
2013-07-11 8:03 ` Caspar Zhang
@ 2013-07-12 0:45 ` Wanlong Gao
1 sibling, 0 replies; 16+ messages in thread
From: Wanlong Gao @ 2013-07-12 0:45 UTC (permalink / raw)
To: Xie Lingyun; +Cc: LTP List
On 07/11/2013 04:00 PM, Xie Lingyun wrote:
> This patch follows the previous clean up patch. Only change some indentations.
>
> Without any other changes of version 3.
>
Applied, thank you.
Wanlong Gao
>
>
> Thanks,
> Lingyun Xie
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [LTP] [PATCH 2/2 v3] xinetd/xinetd_tests.sh: add IPv6 test for xinetd
2013-07-10 17:30 ` Caspar Zhang
2013-07-11 7:43 ` Xie Lingyun
@ 2013-07-11 7:55 ` Hangbin Liu
1 sibling, 0 replies; 16+ messages in thread
From: Hangbin Liu @ 2013-07-11 7:55 UTC (permalink / raw)
To: Caspar Zhang; +Cc: ltp-list, Xie Lingyun
On Thu, Jul 11, 2013 at 01:30:44AM +0800, Caspar Zhang wrote:
> On 07/10/2013 07:03 PM, Xie Lingyun wrote:
> >If IPv6 is enabled, telnet ::1 will be tested. Otherwise, IPv4 only.
> >The IPv6 test will be executed first and give a separate result.
> >
> >Signed-off-by: Xie Lingyun <lingyun.xie@bj.cs2c.com.cn>
> >---
> > testcases/network/xinetd/xinetd_tests.sh | 81 +++++++++++++++++++++++++++++---
> > 1 file changed, 75 insertions(+), 6 deletions(-)
> >
> >diff --git a/testcases/network/xinetd/xinetd_tests.sh b/testcases/network/xinetd/xinetd_tests.sh
> >index ea89658..143ea76 100755
> >--- a/testcases/network/xinetd/xinetd_tests.sh
> >+++ b/testcases/network/xinetd/xinetd_tests.sh
> >@@ -84,11 +84,22 @@ init()
> > return $RC
> > fi
> >
> >+ # sometimes the default telnet may be /usr/kerberos/bin/telnet
> >+ TELNET_COMM='/usr/bin/telnet'
> >+
> > # check if commands tst_*, xinetd, awk exists.
> > chk_ifexists INIT tst_resm || return $RC
> > chk_ifexists INIT xinetd || return $RC
> > chk_ifexists INIT diff || return $RC
> >- chk_ifexists INIT telnet || return $RC
> >+ chk_ifexists INIT ip || return $RC
> >+ chk_ifexists INIT $TELNET_COMM || return $RC
> >+
> >+ IPV6_ENABLED=0
> >+ ip a | grep inet6 > /dev/null 2>&1
> >+ if [ $? -eq 0 ]
> >+ then
> >+ IPV6_ENABLED=1
> >+ fi
> >
> > # Create custom xinetd.conf file.
> > # tst_xinetd.conf.1 config file has telnet service disabled.
> >@@ -128,7 +139,7 @@ EOF
> >
> > # Create expected file with telnet disabled.
> > cat > $LTPTMP/tst_xinetd.exp.1 <<-EOF || RC=$?
> >-telnet: Unable to connect to remote host: Connection refused
> >+telnet: connect to address 127.0.0.1: Connection refused
> > EOF
> >
> > if [ $RC -ne 0 ]
> >@@ -138,10 +149,23 @@ EOF
> > return $RC
> > fi
> >
> >+ if [ $IPV6_ENABLED -eq 1 ]
> >+ then
> >+ cat > $LTPTMP/tst_xinetd.exp.1.ipv6 <<-EOF || RC=$?
> >+telnet: connect to address ::1: Connection refused
> >+EOF
> >+
> >+ if [ $RC -ne 0 ]
> >+ then
> >+ tst_brkm TBROK NULL \
> >+ "INIT: unable to create expected file $LTPTMP/tst_xinetd.exp.1"
> >+ fi
> >+ fi
> >+
> > # Create expected file with telnet enabled.
> > cat > $LTPTMP/tst_xinetd.exp.2 <<-EOF || RC=$?
> > Trying 127.0.0.1...
> >-Connected to localhost (127.0.0.1).
> >+Connected to 127.0.0.1.
> > Escape character is '^]'.
> > Connection closed by foreign host.
> > EOF
> >@@ -149,10 +173,26 @@ EOF
> > if [ $RC -ne 0 ]
> > then
> > tst_brkm TBROK NULL \
> >- "INIT: unable to create expected file $LTPTMP/tst_xinetd.exp.1"
> >+ "INIT: unable to create expected file $LTPTMP/tst_xinetd.exp.2"
> > return $RC
> > fi
> >
> >+ if [ $IPV6_ENABLED -eq 1 ]
> >+ then
> >+ cat > $LTPTMP/tst_xinetd.exp.2.ipv6 <<-EOF || RC=$?
> >+Trying ::1...
> >+Connected to ::1.
> >+Escape character is '^]'.
> >+Connection closed by foreign host.
> >+EOF
> >+
> >+ if [ $RC -ne 0 ]
> >+ then
> >+ tst_brkm TBROK NULL \
> >+ "INIT: unable to create expected file $LTPTMP/tst_xinetd.exp.2.ipv6"
> >+ fi
> >+ fi
> >+
> > return $RC
> > }
> >
> >@@ -263,7 +303,20 @@ test01()
> >
> > # Not checking for exit code from telnet command because telnet is
> > # not terminated by the test gracefully.
> >- echo "\x04" | telnet localhost 2>$LTPTMP/tst_xinetd.out 1>/dev/null
> >+ if [ $IPV6_ENABLED -eq 1 ]
> >+ then
> >+ echo "\x04" | $TELNET_COMM ::1 2>$LTPTMP/tst_xinetd.out.ipv6 1>/dev/null
> >+ diff -iwB $LTPTMP/tst_xinetd.out.ipv6 $LTPTMP/tst_xinetd.exp.1.ipv6 \
> >+ > $LTPTMP/tst_xinetd.err.ipv6 2>&1 || RC=$?
> >+ if [ $RC -ne 0 ]
> >+ then
> >+ tst_res TFAIL $LTPTMP/tst_xinetd.err.ipv6 \
> >+ "Test #1: with telnet diabled expected out differs RC=$RC. Details:"
> >+ return $RC
> >+ fi
> >+ fi
> >+
> >+ echo "\x04" | $TELNET_COMM 127.0.0.1 2>$LTPTMP/tst_xinetd.out 1>/dev/null
> > diff -iwB $LTPTMP/tst_xinetd.out $LTPTMP/tst_xinetd.exp.1 \
> > > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
> > if [ $RC -ne 0 ]
> >@@ -312,7 +365,23 @@ test01()
> >
> > # Not checking for exit code from telnet command because telnet is
> > # not terminated by the test gracefully.
> >- echo "\x04" | telnet localhost > $LTPTMP/tst_xinetd.out 2>&1
> >+ if [ $IPV6_ENABLED -eq 1 ]
> >+ then
> >+ echo "\x04" | $TELNET_COMM ::1 >$LTPTMP/tst_xinetd.out.ipv6 2>&1
> >+ diff -iwB $LTPTMP/tst_xinetd.out.ipv6 $LTPTMP/tst_xinetd.exp.2.ipv6 \
> >+ > $LTPTMP/tst_xinetd.err.ipv6 2>&1 || RC=$?
> >+ if [ $RC -ne 0 ]
> >+ then
> >+ tst_res TFAIL $LTPTMP/tst_xinetd.err.ipv6 \
> >+ "Test #1: with telnet diabled expected out differs RC=$RC. Details:"
> >+ return $RC
> >+ else
> >+ tst_resm TPASS \
> >+ "Test #1: xinetd reads the config file and starts or stops IPv6 services."
> >+ fi
> >+ fi
> >+
> >+ echo "\x04" | $TELNET_COMM 127.0.0.1 > $LTPTMP/tst_xinetd.out 2>&1
> >
> > diff -iwB $LTPTMP/tst_xinetd.out $LTPTMP/tst_xinetd.exp.2 \
> > > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
> >
>
> Patch looks good to me.
>
> Could you also give a running result based on your patch? Thanks.
>
> Leo, please help with review if you have some time :-)
Besides the coding style, this patch is good to me.
>
> Thanks,
> Caspar
--
Thanks & Best Regards
Hangbin Liu <liuhangbin@gmail.com>
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [LTP] [PATCH 1/2 v3] xinetd/xinetd_tests.sh: cleanup tabs
2013-07-10 11:03 [LTP] [PATCH 1/2 v3] xinetd/xinetd_tests.sh: cleanup tabs Xie Lingyun
2013-07-10 11:03 ` [LTP] [PATCH 2/2 v3] xinetd/xinetd_tests.sh: add IPv6 test for xinetd Xie Lingyun
@ 2013-07-10 17:28 ` Caspar Zhang
2013-07-11 3:35 ` Hangbin Liu
2013-07-11 7:57 ` Xie Lingyun
1 sibling, 2 replies; 16+ messages in thread
From: Caspar Zhang @ 2013-07-10 17:28 UTC (permalink / raw)
To: Xie Lingyun; +Cc: ltp-list
On 07/10/2013 07:03 PM, Xie Lingyun wrote:
> +defaults
> +{
> +instances = 25
> +log_type = FILE /var/log/servicelog
> +log_on_success = HOST PID
> +log_on_failure = HOST RECORD
> +disabled = telnet
> +}
Generally looks good except here.
better give a 4-space indentation inside the braces.
Caspar
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [LTP] [PATCH 1/2 v3] xinetd/xinetd_tests.sh: cleanup tabs
2013-07-10 17:28 ` [LTP] [PATCH 1/2 v3] xinetd/xinetd_tests.sh: cleanup tabs Caspar Zhang
@ 2013-07-11 3:35 ` Hangbin Liu
2013-07-11 3:52 ` Wanlong Gao
2013-07-11 7:57 ` Xie Lingyun
1 sibling, 1 reply; 16+ messages in thread
From: Hangbin Liu @ 2013-07-11 3:35 UTC (permalink / raw)
To: Caspar Zhang; +Cc: ltp-list, Xie Lingyun
On Thu, Jul 11, 2013 at 01:28:34AM +0800, Caspar Zhang wrote:
> On 07/10/2013 07:03 PM, Xie Lingyun wrote:
> >+defaults
> >+{
> >+instances = 25
> >+log_type = FILE /var/log/servicelog
> >+log_on_success = HOST PID
> >+log_on_failure = HOST RECORD
> >+disabled = telnet
> >+}
>
> Generally looks good except here.
>
> better give a 4-space indentation inside the braces.
>
1-tab or 4-space, I always be confuse which should we use. Even a tab should
be 4 characters or 8 characters also have dispute. But the kernel coding style
said Tabs are 8 characters, and thus indentations are also 8 characters.
So, should we also use this style in shell scripts? Because I'm tired
changing my vim config for each project.
--
Thanks & Best Regards
Hangbin Liu <liuhangbin@gmail.com>
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [LTP] [PATCH 1/2 v3] xinetd/xinetd_tests.sh: cleanup tabs
2013-07-11 3:35 ` Hangbin Liu
@ 2013-07-11 3:52 ` Wanlong Gao
2013-07-11 3:55 ` Caspar Zhang
0 siblings, 1 reply; 16+ messages in thread
From: Wanlong Gao @ 2013-07-11 3:52 UTC (permalink / raw)
To: Hangbin Liu; +Cc: Xie Lingyun, ltp-list
On 07/11/2013 11:35 AM, Hangbin Liu wrote:
> On Thu, Jul 11, 2013 at 01:28:34AM +0800, Caspar Zhang wrote:
>> On 07/10/2013 07:03 PM, Xie Lingyun wrote:
>>> +defaults
>>> +{
>>> +instances = 25
>>> +log_type = FILE /var/log/servicelog
>>> +log_on_success = HOST PID
>>> +log_on_failure = HOST RECORD
>>> +disabled = telnet
>>> +}
>>
>> Generally looks good except here.
>>
>> better give a 4-space indentation inside the braces.
>>
>
> 1-tab or 4-space, I always be confuse which should we use. Even a tab should
> be 4 characters or 8 characters also have dispute. But the kernel coding style
> said Tabs are 8 characters, and thus indentations are also 8 characters.
>
> So, should we also use this style in shell scripts? Because I'm tired
> changing my vim config for each project.
We are just following kernel coding style in LTP.
Thanks,
Wanlong Gao
>
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [LTP] [PATCH 1/2 v3] xinetd/xinetd_tests.sh: cleanup tabs
2013-07-11 3:52 ` Wanlong Gao
@ 2013-07-11 3:55 ` Caspar Zhang
2013-07-11 4:55 ` Hangbin Liu
0 siblings, 1 reply; 16+ messages in thread
From: Caspar Zhang @ 2013-07-11 3:55 UTC (permalink / raw)
To: gaowanlong; +Cc: ltp-list, Xie Lingyun
On 07/11/2013 11:52 AM, Wanlong Gao wrote:
> On 07/11/2013 11:35 AM, Hangbin Liu wrote:
>> On Thu, Jul 11, 2013 at 01:28:34AM +0800, Caspar Zhang wrote:
>>> On 07/10/2013 07:03 PM, Xie Lingyun wrote:
>>>> +defaults
>>>> +{
>>>> +instances = 25
>>>> +log_type = FILE /var/log/servicelog
>>>> +log_on_success = HOST PID
>>>> +log_on_failure = HOST RECORD
>>>> +disabled = telnet
>>>> +}
>>>
>>> Generally looks good except here.
>>>
>>> better give a 4-space indentation inside the braces.
>>>
>>
>> 1-tab or 4-space, I always be confuse which should we use. Even a tab should
>> be 4 characters or 8 characters also have dispute. But the kernel coding style
>> said Tabs are 8 characters, and thus indentations are also 8 characters.
>>
>> So, should we also use this style in shell scripts? Because I'm tired
>> changing my vim config for each project.
>
> We are just following kernel coding style in LTP.
We are talking about shell coding style right? IIRC kernel coding style
is just for C.
Caspar
>
> Thanks,
> Wanlong Gao
>
>>
>
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [LTP] [PATCH 1/2 v3] xinetd/xinetd_tests.sh: cleanup tabs
2013-07-11 3:55 ` Caspar Zhang
@ 2013-07-11 4:55 ` Hangbin Liu
0 siblings, 0 replies; 16+ messages in thread
From: Hangbin Liu @ 2013-07-11 4:55 UTC (permalink / raw)
To: Caspar Zhang; +Cc: ltp-list, Xie Lingyun
On Thu, Jul 11, 2013 at 11:55:21AM +0800, Caspar Zhang wrote:
> On 07/11/2013 11:52 AM, Wanlong Gao wrote:
> >On 07/11/2013 11:35 AM, Hangbin Liu wrote:
> >>On Thu, Jul 11, 2013 at 01:28:34AM +0800, Caspar Zhang wrote:
> >>>On 07/10/2013 07:03 PM, Xie Lingyun wrote:
> >>>>+defaults
> >>>>+{
> >>>>+instances = 25
> >>>>+log_type = FILE /var/log/servicelog
> >>>>+log_on_success = HOST PID
> >>>>+log_on_failure = HOST RECORD
> >>>>+disabled = telnet
> >>>>+}
> >>>
> >>>Generally looks good except here.
> >>>
> >>>better give a 4-space indentation inside the braces.
> >>>
> >>
> >>1-tab or 4-space, I always be confuse which should we use. Even a tab should
> >>be 4 characters or 8 characters also have dispute. But the kernel coding style
> >>said Tabs are 8 characters, and thus indentations are also 8 characters.
> >>
> >>So, should we also use this style in shell scripts? Because I'm tired
> >>changing my vim config for each project.
> >
> >We are just following kernel coding style in LTP.
>
> We are talking about shell coding style right? IIRC kernel coding
> style is just for C.
That's what I'm confused about, what coding style should we use for shell?
Following the kernel C style or find another one?
--
Thanks & Best Regards
Hangbin Liu <liuhangbin@gmail.com>
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [LTP] [PATCH 1/2 v3] xinetd/xinetd_tests.sh: cleanup tabs
2013-07-10 17:28 ` [LTP] [PATCH 1/2 v3] xinetd/xinetd_tests.sh: cleanup tabs Caspar Zhang
2013-07-11 3:35 ` Hangbin Liu
@ 2013-07-11 7:57 ` Xie Lingyun
2013-07-11 8:00 ` Caspar Zhang
2013-07-12 0:46 ` Wanlong Gao
1 sibling, 2 replies; 16+ messages in thread
From: Xie Lingyun @ 2013-07-11 7:57 UTC (permalink / raw)
To: Caspar Zhang; +Cc: LTP List
[-- Attachment #1.1: Type: text/plain, Size: 546 bytes --]
The attachment patch is the modified version of the indentation inside the
braces.
Without any other changes of version 3.
Thanks,
Lingyun Xie
2013/7/11 Caspar Zhang <caspar@casparzhang.com>
> On 07/10/2013 07:03 PM, Xie Lingyun wrote:
>
>> +defaults
>> +{
>> +instances = 25
>> +log_type = FILE /var/log/servicelog
>> +log_on_success = HOST PID
>> +log_on_failure = HOST RECORD
>> +disabled = telnet
>> +}
>>
>
> Generally looks good except here.
>
> better give a 4-space indentation inside the braces.
>
> Caspar
>
>
>
[-- Attachment #1.2: Type: text/html, Size: 1427 bytes --]
[-- Attachment #2: 0001-xinetd-xinetd_tests.sh-clean-up-tabs.patch --]
[-- Type: application/octet-stream, Size: 10770 bytes --]
[-- Attachment #3: Type: text/plain, Size: 394 bytes --]
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
[-- Attachment #4: Type: text/plain, Size: 155 bytes --]
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [LTP] [PATCH 1/2 v3] xinetd/xinetd_tests.sh: cleanup tabs
2013-07-11 7:57 ` Xie Lingyun
@ 2013-07-11 8:00 ` Caspar Zhang
2013-07-12 0:46 ` Wanlong Gao
1 sibling, 0 replies; 16+ messages in thread
From: Caspar Zhang @ 2013-07-11 8:00 UTC (permalink / raw)
To: Xie Lingyun; +Cc: LTP List
On 07/11/2013 03:57 PM, Xie Lingyun wrote:
>
> From 67abb4c3a814f54312c518ae04769979c6543591 Mon Sep 17 00:00:00 2001
> From: Xie Lingyun<lingyun.xie@bj.cs2c.com.cn>
> Date: Thu, 11 Jul 2013 15:11:58 +0800
> Subject: [PATCH 1/2 v4] xinetd/xinetd_tests.sh: clean up tabs
>
> replace tabs with 4 spaces.
> The echo <<-EOF lines become no indentation.
>
> Signed-off-by: Xie Lingyun<lingyun.xie@bj.cs2c.com.cn>
> ---
> testcases/network/xinetd/xinetd_tests.sh | 246 +++++++++++++++----------------
> 1 file changed, 123 insertions(+), 123 deletions(-)
>
> diff --git a/testcases/network/xinetd/xinetd_tests.sh b/testcases/network/xinetd/xinetd_tests.sh
> index 83eb8a7..d898af0 100755
> --- a/testcases/network/xinetd/xinetd_tests.sh
> +++ b/testcases/network/xinetd/xinetd_tests.sh
> @@ -90,46 +90,46 @@ init()
> chk_ifexists INIT diff || return $RC
> chk_ifexists INIT telnet || return $RC
>
> - # Create custom xinetd.conf file.
> - # tst_xinetd.conf.1 config file has telnet service disabled.
> - cat > $LTPTMP/tst_xinetd.conf.1 <<-EOF || RC=$?
> - defaults
> - {
> - instances = 25
> - log_type = FILE /var/log/servicelog
> - log_on_success = HOST PID
> - log_on_failure = HOST RECORD
> - disabled = telnet
> - }
> - EOF
> -
> - # tst_xinetd.conf.2 config file has telnet enabled.
> - cat > $LTPTMP/tst_xinetd.conf.2 <<-EOF || RC=$?
> - defaults
> - {
> - instances = 25
> - log_type = FILE /var/log/servicelog
> - log_on_success = HOST PID
> - log_on_failure = HOST
> - # disabled = telnet
> - }
> -
> - service telnet
> - {
> - socket_type = stream
> - protocol = tcp
> - wait = no
> - user = root
> - server = /usr/sbin/in.telnetd
> - server_args = -n
> - no_access =
> - }
> - EOF
> + # Create custom xinetd.conf file.
> + # tst_xinetd.conf.1 config file has telnet service disabled.
> + cat > $LTPTMP/tst_xinetd.conf.1 <<-EOF || RC=$?
> +defaults
> +{
> + instances = 25
> + log_type = FILE /var/log/servicelog
> + log_on_success = HOST PID
> + log_on_failure = HOST RECORD
> + disabled = telnet
> +}
> +EOF
> +
> + # tst_xinetd.conf.2 config file has telnet enabled.
> + cat > $LTPTMP/tst_xinetd.conf.2 <<-EOF || RC=$?
> +defaults
> +{
> + instances = 25
> + log_type = FILE /var/log/servicelog
> + log_on_success = HOST PID
> + log_on_failure = HOST
> + # disabled = telnet
> +}
> +
> +service telnet
> +{
> + socket_type = stream
> + protocol = tcp
> + wait = no
> + user = root
> + server = /usr/sbin/in.telnetd
> + server_args = -n
> + no_access =
> +}
> +EOF
>
> # Create expected file with telnet disabled.
> cat > $LTPTMP/tst_xinetd.exp.1 <<-EOF || RC=$?
> - telnet: Unable to connect to remote host: Connection refused
> - EOF
> +telnet: Unable to connect to remote host: Connection refused
> +EOF
>
> if [ $RC -ne 0 ]
> then
> @@ -139,12 +139,12 @@ init()
> fi
>
> # Create expected file with telnet enabled.
> - cat > $LTPTMP/tst_xinetd.exp.2 <<-EOF || RC=$?
> - Trying 127.0.0.1...
> - Connected to localhost (127.0.0.1).
> - Escape character is '^]'.
> - Connection closed by foreign host.
> - EOF
> + cat > $LTPTMP/tst_xinetd.exp.2 <<-EOF || RC=$?
> +Trying 127.0.0.1...
> +Connected to localhost (127.0.0.1).
> +Escape character is '^]'.
> +Connection closed by foreign host.
> +EOF
>
> if [ $RC -ne 0 ]
> then
> @@ -165,28 +165,28 @@ init()
> # - non-zero on failure.
> cleanup()
> {
> - RC=0
> - # restore the original xinetd.conf if a back up exits.
> - if [ -f /etc/xinetd.conf.orig ]
> - then
> - mv /etc/xinetd.conf.orig /etc/xinetd.conf \
> - > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
> - if [ $RC -ne 0 ]
> - then
> - tst_res TINFO $LTPTMP/tst_xinetd.err \
> - "CLEANUP: failed restoring original xinetd.conf RC=$RC. Details:"
> - fi
> -
> - sleep 1s
> -
> - # restoring original services
> - /etc/init.d/xinetd restart > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
> - if [ $RC -ne 0 ]
> - then
> - tst_res TINFO $LTPTMP/tst_xinetd.err \
> - "CLEANUP: failed restoring original services RC=$RC. Details:"
> - fi
> - fi
> + RC=0
> + # restore the original xinetd.conf if a back up exits.
> + if [ -f /etc/xinetd.conf.orig ]
> + then
> + mv /etc/xinetd.conf.orig /etc/xinetd.conf \
> + > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
> + if [ $RC -ne 0 ]
> + then
> + tst_res TINFO $LTPTMP/tst_xinetd.err \
> + "CLEANUP: failed restoring original xinetd.conf RC=$RC. Details:"
> + fi
> +
> + sleep 1s
> +
> + # restoring original services
> + /etc/init.d/xinetd restart > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
> + if [ $RC -ne 0 ]
> + then
> + tst_res TINFO $LTPTMP/tst_xinetd.err \
> + "CLEANUP: failed restoring original services RC=$RC. Details:"
> + fi
> + fi
>
> # remove all the temporary files created by this test.
> tst_resm TINFO "CLEAN: removing $LTPTMP"
> @@ -214,9 +214,9 @@ test01()
>
> tst_resm TINFO "Test #1: restart xinetd with telnet disabled."
>
> - # create a backup of the original xinetd.conf file.
> - mv /etc/xinetd.conf /etc/xinetd.conf.orig > $LTPTMP/tst_xinetd.err 2>&1 \
> - || RC=$?
> + # create a backup of the original xinetd.conf file.
> + mv /etc/xinetd.conf /etc/xinetd.conf.orig > $LTPTMP/tst_xinetd.err 2>&1 \
> + || RC=$?
> if [ $RC -ne 0 ]
> then
> tst_brk TBROK $LTPTMP/tst_xinetd.err NULL \
> @@ -224,9 +224,9 @@ test01()
> return $RC
> fi
>
> - # install the new config file with telnet disabled.
> - mv $LTPTMP/tst_xinetd.conf.1 /etc/xinetd.conf > $LTPTMP/tst_xinetd.err 2>&1 \
> - || RC=$?
> + # install the new config file with telnet disabled.
> + mv $LTPTMP/tst_xinetd.conf.1 /etc/xinetd.conf > $LTPTMP/tst_xinetd.err 2>&1 \
> + || RC=$?
> if [ $RC -ne 0 ]
> then
> tst_brk TBROK $LTPTMP/tst_xinetd.err NULL \
> @@ -236,36 +236,36 @@ test01()
>
> tst_resm TINFO "Test #1: new xinetd.conf installed with telnet disabled."
>
> - sleep 1s
> + sleep 1s
>
> - # restart xinetd to re-start the services
> + # restart xinetd to re-start the services
> /etc/init.d/xinetd restart > $LTPTMP/tst_xinetd.out 2>&1 || RC=$?
> if [ $RC -ne 0 ]
> then
> tst_res TFAIL $LTPTMP/tst_xinetd.out \
> "Test #1: unable to restart service with telnet disabled. Details:"
> return $RC
> - else
> - # even if xinetd restart has zero exit value,
> - # make certain there was no failure.
> - grep -i "fail" $LTPTMP/tst_xinetd.out > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
> - if [ $RC -eq 0 ]
> - then
> - tst_res TFAIL $LTPTMP/tst_xinetd.err \
> - "Test #1: xinetd failed to restart. Details"
> - return $RC
> - else
> - RC=0
> - tst_resm TINFO \
> - "Test #1: xinetd re-started successfully with telnet disabled."
> - fi
> - fi
> -
> - # Not checking for exit code from telnet command because telnet is
> - # not terminated by the test gracefully.
> - echo "\x04" | telnet localhost 2>$LTPTMP/tst_xinetd.out 1>/dev/null
> - diff -iwB $LTPTMP/tst_xinetd.out $LTPTMP/tst_xinetd.exp.1 \
> - > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
> + else
> + # even if xinetd restart has zero exit value,
> + # make certain there was no failure.
> + grep -i "fail" $LTPTMP/tst_xinetd.out > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
> + if [ $RC -eq 0 ]
> + then
> + tst_res TFAIL $LTPTMP/tst_xinetd.err \
> + "Test #1: xinetd failed to restart. Details"
> + return $RC
> + else
> + RC=0
> + tst_resm TINFO \
> + "Test #1: xinetd re-started successfully with telnet disabled."
> + fi
> + fi
> +
> + # Not checking for exit code from telnet command because telnet is
> + # not terminated by the test gracefully.
> + echo "\x04" | telnet localhost 2>$LTPTMP/tst_xinetd.out 1>/dev/null
> + diff -iwB $LTPTMP/tst_xinetd.out $LTPTMP/tst_xinetd.exp.1 \
> + > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
> if [ $RC -ne 0 ]
> then
> tst_res TFAIL $LTPTMP/tst_xinetd.err \
> @@ -274,9 +274,9 @@ test01()
> fi
>
> tst_resm TINFO "Test #1: restart xinetd with telnet enabled."
> - # install the xinetd config file with telnet enabled.
> - mv $LTPTMP/tst_xinetd.conf.2 /etc/xinetd.conf > $LTPTMP/tst_xinetd.err 2>&1 \
> - || RC=$?
> + # install the xinetd config file with telnet enabled.
> + mv $LTPTMP/tst_xinetd.conf.2 /etc/xinetd.conf > $LTPTMP/tst_xinetd.err 2>&1 \
> + || RC=$?
> if [ $RC -ne 0 ]
> then
> tst_brk TBROK $LTPTMP/tst_xinetd.err NULL \
> @@ -286,44 +286,44 @@ test01()
>
> tst_resm TINFO "Test #1: new xinetd.conf installed with telnet enabled."
>
> - sleep 1s
> + sleep 1s
>
> - # restart services.
> + # restart services.
> /etc/init.d/xinetd restart > $LTPTMP/tst_xinetd.out 2>&1 || RC=$?
> if [ $RC -ne 0 ]
> then
> tst_res TFAIL $LTPTMP/tst_xinetd.out \
> "Test #1: unable to restart services with telnet enabled. Details:"
> return $RC
> - else
> - # even if restart has a zero exit value double check for failure.
> - grep -i "fail" $LTPTMP/tst_xinetd.out > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
> - if [ $RC -eq 0 ]
> - then
> - tst_res TFAIL $LTPTMP/tst_xinetd.err \
> - "Test #1: xinetd failed to restart. Details"
> - return $RC
> - else
> - RC=0
> - tst_resm TINFO \
> - "Test #1: xinetd re-started successfully with telnet enabled."
> - fi
> - fi
> -
> - # Not checking for exit code from telnet command because telnet is
> - # not terminated by the test gracefully.
> - echo "\x04" | telnet localhost > $LTPTMP/tst_xinetd.out 2>&1
> -
> - diff -iwB $LTPTMP/tst_xinetd.out $LTPTMP/tst_xinetd.exp.2 \
> - > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
> + else
> + # even if restart has a zero exit value double check for failure.
> + grep -i "fail" $LTPTMP/tst_xinetd.out > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
> + if [ $RC -eq 0 ]
> + then
> + tst_res TFAIL $LTPTMP/tst_xinetd.err \
> + "Test #1: xinetd failed to restart. Details"
> + return $RC
> + else
> + RC=0
> + tst_resm TINFO \
> + "Test #1: xinetd re-started successfully with telnet enabled."
> + fi
> + fi
> +
> + # Not checking for exit code from telnet command because telnet is
> + # not terminated by the test gracefully.
> + echo "\x04" | telnet localhost > $LTPTMP/tst_xinetd.out 2>&1
> +
> + diff -iwB $LTPTMP/tst_xinetd.out $LTPTMP/tst_xinetd.exp.2 \
> + > $LTPTMP/tst_xinetd.err 2>&1 || RC=$?
> if [ $RC -ne 0 ]
> then
> tst_res TFAIL $LTPTMP/tst_xinetd.err \
> "Test #1: expected output differes from actual. Details:"
> return $RC
> - else
> - tst_resm TPASS \
> - "Test #1: xinetd reads the config file and starts or stops services."
> + else
> + tst_resm TPASS \
> + "Test #1: xinetd reads the config file and starts or stops services."
> fi
>
> return $RC
> -- 1.8.3.1
Reviewed-by: Caspar Zhang <caspar@casparzhang.com>
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [LTP] [PATCH 1/2 v3] xinetd/xinetd_tests.sh: cleanup tabs
2013-07-11 7:57 ` Xie Lingyun
2013-07-11 8:00 ` Caspar Zhang
@ 2013-07-12 0:46 ` Wanlong Gao
1 sibling, 0 replies; 16+ messages in thread
From: Wanlong Gao @ 2013-07-12 0:46 UTC (permalink / raw)
To: Xie Lingyun; +Cc: LTP List
On 07/11/2013 03:57 PM, Xie Lingyun wrote:
> The attachment patch is the modified version of the indentation inside the braces.
>
> Without any other changes of version 3.
>
>
Applied, thank you.
Wanlong Gao
>
> Thanks,
> Lingyun Xie
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2013-07-12 0:46 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-10 11:03 [LTP] [PATCH 1/2 v3] xinetd/xinetd_tests.sh: cleanup tabs Xie Lingyun
2013-07-10 11:03 ` [LTP] [PATCH 2/2 v3] xinetd/xinetd_tests.sh: add IPv6 test for xinetd Xie Lingyun
2013-07-10 17:30 ` Caspar Zhang
2013-07-11 7:43 ` Xie Lingyun
2013-07-11 8:00 ` Xie Lingyun
2013-07-11 8:03 ` Caspar Zhang
2013-07-12 0:45 ` Wanlong Gao
2013-07-11 7:55 ` Hangbin Liu
2013-07-10 17:28 ` [LTP] [PATCH 1/2 v3] xinetd/xinetd_tests.sh: cleanup tabs Caspar Zhang
2013-07-11 3:35 ` Hangbin Liu
2013-07-11 3:52 ` Wanlong Gao
2013-07-11 3:55 ` Caspar Zhang
2013-07-11 4:55 ` Hangbin Liu
2013-07-11 7:57 ` Xie Lingyun
2013-07-11 8:00 ` Caspar Zhang
2013-07-12 0:46 ` Wanlong Gao
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.