ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: use smaller timeouts for vcl/ldp tests

Browse Source 
Change-Id: Idebd110cbf5f0ddc5d9da5a1975b5d278825d131
Signed-off-by: Florin Coras <fcoras@cisco.com>
This commit is contained in:
Florin Coras
2018-11-29 00:39:53 -08:00
committed by Damjan Marion
parent 47c40e2d94
commit 2eb42e7061
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
test/test_vcl.py
View File

@ -224,12 +224,12 @@ class VCLCutThruTestCase(VCLTestCase):
self.client_iperf3_timeout = 20 self.client_iperf3_timeout = 20
self.client_iperf3_args = ["-V4d", "-t 5", "-c", self.server_addr] self.client_iperf3_args = ["-V4d", "-t 5", "-c", self.server_addr]
self.server_iperf3_args = ["-V4d", "-s"] self.server_iperf3_args = ["-V4d", "-s"]
self.client_uni_dir_nsock_timeout = 60 self.client_uni_dir_nsock_timeout = 20
self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X",
"-I", "2", "-I", "2",
self.server_addr, self.server_addr,
self.server_port] self.server_port]
self.client_bi_dir_nsock_timeout = 120 self.client_bi_dir_nsock_timeout = 20
self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X",
"-I", "2", "-I", "2",
self.server_addr, self.server_addr,
@ -381,14 +381,14 @@ class VCLThruHostStackGroupBTestCase(VCLTestCase):
self.thru_host_stack_setup() self.thru_host_stack_setup()
if self.vppDebug: if self.vppDebug:
self.client_bi_dir_nsock_timeout = 120 self.client_bi_dir_nsock_timeout = 20
self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X",
# OUCH! Host Stack Bug? # OUCH! Host Stack Bug?
# "-I", "2", # "-I", "2",
self.loop0.local_ip4, self.loop0.local_ip4,
self.server_port] self.server_port]
else: else:
self.client_bi_dir_nsock_timeout = 60 self.client_bi_dir_nsock_timeout = 20
self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X",
# OUCH! Host Stack Bug? # OUCH! Host Stack Bug?
# "-I", "2", # "-I", "2",
@ -417,10 +417,10 @@ class VCLThruHostStackGroupCTestCase(VCLTestCase):
self.thru_host_stack_setup() self.thru_host_stack_setup()
if self.vppDebug: if self.vppDebug:
self.client_uni_dir_nsock_timeout = 120 self.client_uni_dir_nsock_timeout = 20
self.numSockets = "2" self.numSockets = "2"
else: else:
self.client_uni_dir_nsock_timeout = 120 self.client_uni_dir_nsock_timeout = 20
self.numSockets = "5" self.numSockets = "5"
self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X",
@ -450,10 +450,10 @@ class VCLThruHostStackGroupDTestCase(VCLTestCase):
self.thru_host_stack_setup() self.thru_host_stack_setup()
if self.vppDebug: if self.vppDebug:
self.client_uni_dir_nsock_timeout = 120 self.client_uni_dir_nsock_timeout = 20
self.numSockets = "2" self.numSockets = "2"
else: else:
self.client_uni_dir_nsock_timeout = 120 self.client_uni_dir_nsock_timeout = 20
self.numSockets = "5" self.numSockets = "5"
self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X",
@ -515,8 +515,8 @@ class VCLIpv6CutThruTestCase(VCLTestCase):
self.cut_thru_setup() self.cut_thru_setup()
self.client_iperf3_timeout = 20 self.client_iperf3_timeout = 20
self.client_uni_dir_nsock_timeout = 60 self.client_uni_dir_nsock_timeout = 20
self.client_bi_dir_nsock_timeout = 120 self.client_bi_dir_nsock_timeout = 20
self.client_ipv6_echo_test_args = ["-6", "-E", self.echo_phrase, "-X", self.client_ipv6_echo_test_args = ["-6", "-E", self.echo_phrase, "-X",
self.server_ipv6_addr, self.server_ipv6_addr,
self.server_port] self.server_port]
@ -653,14 +653,14 @@ class VCLIpv6ThruHostStackGroupATestCase(VCLTestCase):
self.thru_host_stack_ipv6_setup() self.thru_host_stack_ipv6_setup()
if self.vppDebug: if self.vppDebug:
self.client_bi_dir_nsock_timeout = 120 self.client_bi_dir_nsock_timeout = 20
self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000", self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000",
"-B", "-X", "-6", "-B", "-X", "-6",
"-I", "2", "-I", "2",
self.loop0.local_ip6, self.loop0.local_ip6,
self.server_port] self.server_port]
else: else:
self.client_bi_dir_nsock_timeout = 90 self.client_bi_dir_nsock_timeout = 20
self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000", self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000",
"-B", "-X", "-6", "-B", "-X", "-6",
"-I", "2", "-I", "2",
@ -689,7 +689,7 @@ class VCLIpv6ThruHostStackGroupBTestCase(VCLTestCase):
self.thru_host_stack_ipv6_setup() self.thru_host_stack_ipv6_setup()
if self.vppDebug: if self.vppDebug:
self.client_bi_dir_nsock_timeout = 120 self.client_bi_dir_nsock_timeout = 20
self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000", self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000",
"-B", "-X", "-6", "-B", "-X", "-6",
# OUCH! Host Stack Bug? # OUCH! Host Stack Bug?
@ -697,7 +697,7 @@ class VCLIpv6ThruHostStackGroupBTestCase(VCLTestCase):
self.loop0.local_ip6, self.loop0.local_ip6,
self.server_port] self.server_port]
else: else:
self.client_bi_dir_nsock_timeout = 60 self.client_bi_dir_nsock_timeout = 20
self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000", self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000",
"-B", "-X", "-6", "-B", "-X", "-6",
# OUCH! Host Stack Bug? # OUCH! Host Stack Bug?
@ -728,10 +728,10 @@ class VCLIpv6ThruHostStackGroupCTestCase(VCLTestCase):
self.thru_host_stack_ipv6_setup() self.thru_host_stack_ipv6_setup()
if self.vppDebug: if self.vppDebug:
self.client_uni_dir_nsock_timeout = 120 self.client_uni_dir_nsock_timeout = 20
self.numSockets = "2" self.numSockets = "2"
else: else:
self.client_uni_dir_nsock_timeout = 120 self.client_uni_dir_nsock_timeout = 20
self.numSockets = "5" self.numSockets = "5"
self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X",
@ -763,10 +763,10 @@ class VCLIpv6ThruHostStackGroupDTestCase(VCLTestCase):
self.thru_host_stack_ipv6_setup() self.thru_host_stack_ipv6_setup()
if self.vppDebug: if self.vppDebug:
self.client_uni_dir_nsock_timeout = 120 self.client_uni_dir_nsock_timeout = 20
self.numSockets = "2" self.numSockets = "2"
else: else:
self.client_uni_dir_nsock_timeout = 120 self.client_uni_dir_nsock_timeout = 20
self.numSockets = "5" self.numSockets = "5"
self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X",