Signed-off-by: Alexey Kodanev <[email protected]>
---
testcases/network/stress/ssh/ssh-stress | 13 ++++++-------
testcases/network/stress/ssh/ssh-stress03-rmt | 8 ++++----
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/testcases/network/stress/ssh/ssh-stress
b/testcases/network/stress/ssh/ssh-stress
index 72bef25..d1e37bf 100644
--- a/testcases/network/stress/ssh/ssh-stress
+++ b/testcases/network/stress/ssh/ssh-stress
@@ -34,7 +34,7 @@ cleanup()
{
# Stop the ssh daemon
test -s sshd.pid && kill $(cat sshd.pid)
- test "$server_pid" && kill -9 $server_pid > /dev/null 2>&1
+ pkill 'tcp_fastopen$'
tst_rmdir
TMPDIR=
}
@@ -44,7 +44,7 @@ setup()
trap "tst_brkm TBROK 'test interrupted'" INT
tst_require_root
- tst_check_cmds sshd ssh od
+ tst_check_cmds pkill sshd ssh od
ipver=${TST_IPV6:-"4"}
@@ -125,16 +125,15 @@ test02()
test03()
{
- tst_resm TINFO "Forwarding TCP traffic in $NS_DURATION sec"
+ tst_resm TINFO "Forwarding TCP traffic with $NS_TIMES requests"
# Run a TCP traffic server
port=$(tst_get_unused_port ipv${ipver} stream)
- ns-tcpserver -b -f $ipver -p $port -o info_file || \
- tst_brkm TBROK "Failed to run a tcp traffic server"
- server_pid=$(grep 'PID:' info_file | cut -f 2 -d ' ')
+ tcp_fastopen -R 3 -g $port > tcp_server.log 2>&1 &
+
tst_rhost_run -s -c "ssh-stress03-rmt $ipver $(tst_ipaddr) \
- $rconfig $port $NS_DURATION"
+ $rconfig $port $NS_TIMES"
tst_resm TPASS "Test is finished successfully"
}
diff --git a/testcases/network/stress/ssh/ssh-stress03-rmt
b/testcases/network/stress/ssh/ssh-stress03-rmt
index 9dcebe7..a5b7af0 100644
--- a/testcases/network/stress/ssh/ssh-stress03-rmt
+++ b/testcases/network/stress/ssh/ssh-stress03-rmt
@@ -27,14 +27,14 @@ TST_TOTAL=1
# Check the arguments
if [ $# -ne 5 ]; then
- tst_brkm TBROK "Usage: $0 ipver rhost config port duration"
+ tst_brkm TBROK "Usage: $0 ipver rhost config port requests"
fi
ip_ver="$1"
server_ipaddr="$2"
ssh_config="$3"
rport="$4"
-duration="$5"
+requests="$5"
ssh -$ip_ver -F $ssh_config $server_ipaddr \
"true < /dev/null > /dev/null 2>&1" > /dev/null
@@ -56,8 +56,8 @@ case $ip_ver in
;;
esac
-# Start the TCP traffic client
-ns-tcpclient -S $localhost -p $lport -f $ip_ver -t $duration
+# Start the TCP traffic clients
+tcp_fastopen -r $requests -l -H $localhost -g $lport > /dev/null
ret=$?
# Stop the ssh port forwarding
--
1.7.1
------------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
