For netperf runs in virtual tests we started hitting the timeout too
early. This patch extends expected time by additional 20 seconds for
every run.
Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
---
recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py | 4 ++--
.../phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py
b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py
index 74f78e4..0f4103c 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py
@@ -268,8 +268,8 @@ for offload in offloads:
server_proc = g1.run(netperf_srv, bg=True)
ctl.wait(2)
- tcp_res_data = g3.run(netperf_cli_tcp, timeout = int(netperf_duration)*5 +
20)
- udp_res_data = g3.run(netperf_cli_udp, timeout = int(netperf_duration)*5 +
20)
+ tcp_res_data = g3.run(netperf_cli_tcp, timeout = (int(netperf_duration) +
20)*5)
+ udp_res_data = g3.run(netperf_cli_udp, timeout = (int(netperf_duration) +
20)*5)
server_proc.intr()
if result_tcp is not None and\
diff --git
a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py
b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py
index 833e19e..1f37c55 100644
---
a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py
+++
b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py
@@ -243,8 +243,8 @@ for offload in offloads:
server_proc = g1.run(netperf_srv, bg=True)
ctl.wait(2)
- tcp_res_data = g3.run(netperf_cli_tcp, timeout = int(netperf_duration)*5 +
20)
- udp_res_data = g3.run(netperf_cli_udp, timeout = int(netperf_duration)*5 +
20)
+ tcp_res_data = g3.run(netperf_cli_tcp, timeout = (int(netperf_duration) +
20)*5)
+ udp_res_data = g3.run(netperf_cli_udp, timeout = (int(netperf_duration) +
20)*5)
server_proc.intr()
if result_tcp is not None and\
--
2.1.0