Re: [PATCH 1/4] recipes: extend timeout for all tests in phase1 and phase2

[Jiri Prochazka]

2015-09-18 2:31 GMT+02:00 Jan Tluka <jtluka(a)redhat.com&gt;:

>  In the recent test runs we have seen timeout issues while running
>  netperf on baremetal setups. This patch extends the timeout in these
>  setups as we did in virtual setups.
>
>  Signed-off-by: Jan Tluka <jtluka(a)redhat.com&gt;
>  ---
>   recipes/regression_tests/phase1/3_vlans.py               |  8 ++++----
>   recipes/regression_tests/phase1/3_vlans_over_bond.py     |  8 ++++----
>   recipes/regression_tests/phase1/bonding_test.py          |  8 ++++----
>   .../phase1/virtual_bridge_2_vlans_over_bond.py           |  4 ++--
>   .../phase1/virtual_bridge_vlan_in_guest.py               |  8 ++++----
>   .../phase1/virtual_bridge_vlan_in_host.py                |  8 ++++----
>   recipes/regression_tests/phase2/3_vlans_over_team.py     |  8 ++++----
>   recipes/regression_tests/phase2/team_test.py             | 16
>  ++++++++--------
>   ...virtual_ovs_bridge_2_vlans_over_active_backup_bond.py |  4 ++--
>   .../phase2/virtual_ovs_bridge_vlan_in_guest.py           |  8 ++++----
>   .../phase2/virtual_ovs_bridge_vlan_in_host.py            |  8 ++++----
>   11 files changed, 44 insertions(+), 44 deletions(-)
>
>  diff --git a/recipes/regression_tests/phase1/3_vlans.py
>  b/recipes/regression_tests/phase1/3_vlans.py
>  index 158816f..e950721 100644
>  --- a/recipes/regression_tests/phase1/3_vlans.py
>  +++ b/recipes/regression_tests/phase1/3_vlans.py
>  @@ -194,8 +194,8 @@ for vlan1 in vlans:
>                           # Netperf test (both TCP and UDP)
>                           srv_proc = m1.run(netperf_srv, bg=True)
>                           ctl.wait(2)
>  -                        tcp_res_data = m2.run(netperf_cli_tcp, timeout =
>  int(netperf_duration)*5 + 20)
>  -                        udp_res_data = m2.run(netperf_cli_udp, timeout =
>  int(netperf_duration)*5 + 20)
>  +                        tcp_res_data = m2.run(netperf_cli_tcp, timeout =
>  (int(netperf_duration) + 20)*5)
>  +                        udp_res_data = m2.run(netperf_cli_udp, timeout =
>  (int(netperf_duration) + 20)*5)
>                           srv_proc.intr()
>
>                           if result_tcp is not None and\
>  @@ -276,8 +276,8 @@ for vlan1 in vlans:
>                           # Netperf test (both TCP and UDP)
>                           srv_proc = m1.run(netperf_srv6, bg=True)
>                           ctl.wait(2)
>  -                        tcp_res_data = m2.run(netperf_cli_tcp6, timeout =
>  int(netperf_duration)*5 + 20)
>  -                        udp_res_data = m2.run(netperf_cli_udp6, timeout =
>  int(netperf_duration)*5 + 20)
>  +                        tcp_res_data = m2.run(netperf_cli_tcp6, timeout =
>  (int(netperf_duration) + 20)*5)
>  +                        udp_res_data = m2.run(netperf_cli_udp6, timeout =
>  (int(netperf_duration) + 20)*5)
>                           srv_proc.intr()
>
>                           if result_tcp is not None and
>  tcp_res_data.get_result() is not None and\
>  diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py
>  b/recipes/regression_tests/phase1/3_vlans_over_bond.py
>  index 372c689..92d2344 100644
>  --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py
>  +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py
>  @@ -196,8 +196,8 @@ for vlan1 in vlans:
>                           # Netperf test (both TCP and UDP)
>                           srv_proc = m1.run(netperf_srv, bg=True)
>                           ctl.wait(2)
>  -                        tcp_res_data = m2.run(netperf_cli_tcp, timeout =
>  int(netperf_duration)*5 + 20)
>  -                        udp_res_data = m2.run(netperf_cli_udp, timeout =
>  int(netperf_duration)*5 + 20)
>  +                        tcp_res_data = m2.run(netperf_cli_tcp, timeout =
>  (int(netperf_duration) + 20)*5)
>  +                        udp_res_data = m2.run(netperf_cli_udp, timeout =
>  (int(netperf_duration) + 20)*5)
>                           srv_proc.intr()
>
>                           if result_tcp is not None and\
>  @@ -278,8 +278,8 @@ for vlan1 in vlans:
>                           # Netperf test (both TCP and UDP)
>                           srv_proc = m1.run(netperf_srv6, bg=True)
>                           ctl.wait(2)
>  -                        tcp_res_data = m2.run(netperf_cli_tcp6, timeout =
>  int(netperf_duration)*5 + 20)
>  -                        udp_res_data = m2.run(netperf_cli_udp6, timeout =
>  int(netperf_duration)*5 + 20)
>  +                        tcp_res_data = m2.run(netperf_cli_tcp6, timeout =
>  (int(netperf_duration) + 20)*5)
>  +                        udp_res_data = m2.run(netperf_cli_udp6, timeout =
>  (int(netperf_duration) + 20)*5)
>                           srv_proc.intr()
>
>                           if result_tcp is not None and
>  tcp_res_data.get_result() is not None and\
>  diff --git a/recipes/regression_tests/phase1/bonding_test.py
>  b/recipes/regression_tests/phase1/bonding_test.py
>  index 5c4777b..1ed02c0 100644
>  --- a/recipes/regression_tests/phase1/bonding_test.py
>  +++ b/recipes/regression_tests/phase1/bonding_test.py
>  @@ -175,8 +175,8 @@ for offload in offloads:
>
>               server_proc = m1.run(netperf_srv, bg=True)
>               ctl.wait(2)
>  -            tcp_res_data = m2.run(netperf_cli_tcp, timeout =
>  int(netperf_duration)*5 + 20)
>  -            udp_res_data = m2.run(netperf_cli_udp, timeout =
>  int(netperf_duration)*5 + 20)
>  +            tcp_res_data = m2.run(netperf_cli_tcp, timeout =
>  (int(netperf_duration) + 20)*5)
>  +            udp_res_data = m2.run(netperf_cli_udp, timeout =
>  (int(netperf_duration) + 20)*5)
>               server_proc.intr()
>
>               if result_tcp is not None and\
>  @@ -251,8 +251,8 @@ for offload in offloads:
>
>               server_proc = m1.run(netperf_srv6, bg=True)
>               ctl.wait(2)
>  -            tcp_res_data = m2.run(netperf_cli_tcp6, timeout =
>  int(netperf_duration)*5 + 20)
>  -            udp_res_data = m2.run(netperf_cli_udp6, timeout =
>  int(netperf_duration)*5 + 20)
>  +            tcp_res_data = m2.run(netperf_cli_tcp6, timeout =
>  (int(netperf_duration) + 20)*5)
>  +            udp_res_data = m2.run(netperf_cli_udp6, timeout =
>  (int(netperf_duration) + 20)*5)
>               server_proc.intr()
>
>               if result_tcp is not None and tcp_res_data.get_result() is
>  not None and\
>  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 c2e9280..860d418 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
>  @@ -354,9 +354,9 @@ for offload in offloads:
>
>               server_proc = g1.run(netperf_srv6, bg=True)
>               ctl.wait(2)
>  -            tcp_res_data = g3.run(netperf_cli_tcp6, timeout =
>  int(netperf_duration)*5 + 20)
>  +            tcp_res_data = g3.run(netperf_cli_tcp6, timeout =
>  (int(netperf_duration) + 20)*5)
>               if enable_udp_perf is not None:
>  -                udp_res_data = g3.run(netperf_cli_udp6, timeout =
>  int(netperf_duration)*5 + 20)
>  +                udp_res_data = g3.run(netperf_cli_udp6, timeout =
>  (int(netperf_duration) + 20)*5)
>               server_proc.intr()
>
>               if result_tcp is not None and tcp_res_data.get_result() is
>  not None and\
>  diff --git
>  a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
>  b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
>  index 79cddd3..936ef0e 100644
>  --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
>  +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
>  @@ -192,9 +192,9 @@ for offload in offloads:
>
>               server_proc = g1.run(netperf_srv, bg=True)
>               ctl.wait(2)
>  -            tcp_res_data = h2.run(netperf_cli_tcp, timeout =
>  int(netperf_duration)*5 + 20)
>  +            tcp_res_data = h2.run(netperf_cli_tcp, timeout =
>  (int(netperf_duration) + 20)*5)
>               if enable_udp_perf is not None:
>  -                udp_res_data = h2.run(netperf_cli_udp, timeout =
>  int(netperf_duration)*5 + 20)
>  +                udp_res_data = h2.run(netperf_cli_udp, timeout =
>  (int(netperf_duration) + 20)*5)
>
>               server_proc.intr()
>
>  @@ -275,8 +275,8 @@ for offload in offloads:
>
>               server_proc = g1.run(netperf_srv6, bg=True)
>               ctl.wait(2)
>  -            tcp_res_data = h2.run(netperf_cli_tcp6, timeout =
>  int(netperf_duration)*5 + 20)
>  -            udp_res_data = h2.run(netperf_cli_udp6, timeout =
>  int(netperf_duration)*5 + 20)
>  +            tcp_res_data = h2.run(netperf_cli_tcp6, timeout =
>  (int(netperf_duration) + 20)*5)
>  +            udp_res_data = h2.run(netperf_cli_udp6, timeout =
>  (int(netperf_duration) + 20)*5)
>
>               server_proc.intr()
>
>  diff --git
>  a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
>  b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
>  index 9a0b6bf..92ba7bb 100644
>  --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
>  +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
>  @@ -192,9 +192,9 @@ for offload in offloads:
>
>               server_proc = g1.run(netperf_srv, bg=True)
>               ctl.wait(2)
>  -            tcp_res_data = h2.run(netperf_cli_tcp, timeout =
>  int(netperf_duration)*5 + 20)
>  +            tcp_res_data = h2.run(netperf_cli_tcp, timeout =
>  (int(netperf_duration) + 20)*5)
>               if enable_udp_perf is not None:
>  -                udp_res_data = h2.run(netperf_cli_udp, timeout =
>  int(netperf_duration)*5 + 20)
>  +                udp_res_data = h2.run(netperf_cli_udp, timeout =
>  (int(netperf_duration) + 20)*5)
>
>               server_proc.intr()
>
>  @@ -275,8 +275,8 @@ for offload in offloads:
>
>               server_proc = g1.run(netperf_srv6, bg=True)
>               ctl.wait(2)
>  -            tcp_res_data = h2.run(netperf_cli_tcp6, timeout =
>  int(netperf_duration)*5 + 20)
>  -            udp_res_data = h2.run(netperf_cli_udp6, timeout =
>  int(netperf_duration)*5 + 20)
>  +            tcp_res_data = h2.run(netperf_cli_tcp6, timeout =
>  (int(netperf_duration) + 20)*5)
>  +            udp_res_data = h2.run(netperf_cli_udp6, timeout =
>  (int(netperf_duration) + 20)*5)
>               server_proc.intr()
>
>               if result_tcp is not None and tcp_res_data.get_result() is
>  not None and\
>  diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py
>  b/recipes/regression_tests/phase2/3_vlans_over_team.py
>  index a6dbd49..59e32a6 100644
>  --- a/recipes/regression_tests/phase2/3_vlans_over_team.py
>  +++ b/recipes/regression_tests/phase2/3_vlans_over_team.py
>  @@ -197,8 +197,8 @@ for vlan1 in vlans:
>                           # Netperf test (both TCP and UDP)
>                           srv_proc = m1.run(netperf_srv, bg=True)
>                           ctl.wait(2)
>  -                        tcp_res_data = m2.run(netperf_cli_tcp, timeout =
>  int(netperf_duration)*5 + 20)
>  -                        udp_res_data = m2.run(netperf_cli_udp, timeout =
>  int(netperf_duration)*5 + 20)
>  +                        tcp_res_data = m2.run(netperf_cli_tcp, timeout =
>  (int(netperf_duration) + 20)*5)
>  +                        udp_res_data = m2.run(netperf_cli_udp, timeout =
>  (int(netperf_duration) + 20)*5)
>                           srv_proc.intr()
>
>                           if result_tcp is not None and\
>  @@ -278,8 +278,8 @@ for vlan1 in vlans:
>                           # Netperf test (both TCP and UDP)
>                           srv_proc = m1.run(netperf_srv6, bg=True)
>                           ctl.wait(2)
>  -                        tcp_res_data = m2.run(netperf_cli_tcp6, timeout =
>  int(netperf_duration)*5 + 20)
>  -                        udp_res_data = m2.run(netperf_cli_udp6, timeout =
>  int(netperf_duration)*5 + 20)
>  +                        tcp_res_data = m2.run(netperf_cli_tcp6, timeout =
>  (int(netperf_duration) + 20)*5)
>  +                        udp_res_data = m2.run(netperf_cli_udp6, timeout =
>  (int(netperf_duration) + 20)*5)
>                           srv_proc.intr()
>
>                           if result_tcp is not None and
>  tcp_res_data.get_result() is not None and\
>  diff --git a/recipes/regression_tests/phase2/team_test.py
>  b/recipes/regression_tests/phase2/team_test.py
>  index 95dcfd8..80cc6e4 100644
>  --- a/recipes/regression_tests/phase2/team_test.py
>  +++ b/recipes/regression_tests/phase2/team_test.py
>  @@ -181,8 +181,8 @@ for offload in offloads:
>
>               server_proc = m1.run(netperf_srv, bg=True)
>               ctl.wait(2)
>  -            tcp_res_data = m2.run(netperf_cli_tcp, timeout =
>  int(netperf_duration)*5 + 20)
>  -            udp_res_data = m2.run(netperf_cli_udp, timeout =
>  int(netperf_duration)*5 + 20)
>  +            tcp_res_data = m2.run(netperf_cli_tcp, timeout =
>  (int(netperf_duration) + 20)*5)
>  +            udp_res_data = m2.run(netperf_cli_udp, timeout =
>  (int(netperf_duration) + 20)*5)
>               server_proc.intr()
>
>               if result_tcp is not None and\
>  @@ -261,8 +261,8 @@ for offload in offloads:
>
>               server_proc = m1.run(netperf_srv6, bg=True)
>               ctl.wait(2)
>  -            tcp_res_data = m2.run(netperf_cli_tcp6, timeout =
>  int(netperf_duration)*5 + 20)
>  -            udp_res_data = m2.run(netperf_cli_udp6, timeout =
>  int(netperf_duration)*5 + 20)
>  +            tcp_res_data = m2.run(netperf_cli_tcp6, timeout =
>  (int(netperf_duration) + 20)*5)
>  +            udp_res_data = m2.run(netperf_cli_udp6, timeout =
>  (int(netperf_duration) + 20)*5)
>               server_proc.intr()
>
>               if result_tcp is not None and tcp_res_data.get_result() is
>  not None and\
>  @@ -370,8 +370,8 @@ for offload in offloads:
>
>               server_proc = m2.run(netperf_srv, bg=True)
>               ctl.wait(2)
>  -            tcp_res_data = m1.run(netperf_cli_tcp, timeout =
>  int(netperf_duration)*5 + 20)
>  -            udp_res_data = m1.run(netperf_cli_udp, timeout =
>  int(netperf_duration)*5 + 20)
>  +            tcp_res_data = m1.run(netperf_cli_tcp, timeout =
>  (int(netperf_duration) + 20)*5)
>  +            udp_res_data = m1.run(netperf_cli_udp, timeout =
>  (int(netperf_duration) + 20)*5)
>               server_proc.intr()
>
>               if result_tcp is not None and\
>  @@ -450,8 +450,8 @@ for offload in offloads:
>
>               server_proc = m2.run(netperf_srv6, bg=True)
>               ctl.wait(2)
>  -            tcp_res_data = m1.run(netperf_cli_tcp6, timeout =
>  int(netperf_duration)*5 + 20)
>  -            udp_res_data = m1.run(netperf_cli_udp6, timeout =
>  int(netperf_duration)*5 + 20)
>  +            tcp_res_data = m1.run(netperf_cli_tcp6, timeout =
>  (int(netperf_duration) + 20)*5)
>  +            udp_res_data = m1.run(netperf_cli_udp6, timeout =
>  (int(netperf_duration) + 20)*5)
>               server_proc.intr()
>
>               if result_tcp is not None and tcp_res_data.get_result() 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 1f37c55..d7cf68d 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
>  @@ -322,8 +322,8 @@ for offload in offloads:
>
>               server_proc = g1.run(netperf_srv6, bg=True)
>               ctl.wait(2)
>  -            tcp_res_data = g3.run(netperf_cli_tcp6, timeout =
>  int(netperf_duration)*5 + 20)
>  -            udp_res_data = g3.run(netperf_cli_udp6, timeout =
>  int(netperf_duration)*5 + 20)
>  +            tcp_res_data = g3.run(netperf_cli_tcp6, timeout =
>  (int(netperf_duration) + 20)*5)
>  +            udp_res_data = g3.run(netperf_cli_udp6, timeout =
>  (int(netperf_duration) + 20)*5)
>               server_proc.intr()
>
>               if result_tcp is not None and tcp_res_data.get_result() is
>  not None and\
>  diff --git
>  a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py
>  b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py
>  index fc1f015..7d6d8de 100644
>  --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py
>  +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py
>  @@ -175,8 +175,8 @@ for offload in offloads:
>
>               server_proc = g1.run(netperf_srv, bg=True)
>               ctl.wait(2)
>  -            tcp_res_data = h2.run(netperf_cli_tcp, timeout =
>  int(netperf_duration)*5 + 20)
>  -            udp_res_data = h2.run(netperf_cli_udp, timeout =
>  int(netperf_duration)*5 + 20)
>  +            tcp_res_data = h2.run(netperf_cli_tcp, timeout =
>  (int(netperf_duration) + 20)*5)
>  +            udp_res_data = h2.run(netperf_cli_udp, timeout =
>  (int(netperf_duration) + 20)*5)
>
>               server_proc.intr()
>
>  @@ -252,8 +252,8 @@ for offload in offloads:
>
>               server_proc = g1.run(netperf_srv6, bg=True)
>               ctl.wait(2)
>  -            tcp_res_data = h2.run(netperf_cli_tcp6, timeout =
>  int(netperf_duration)*5 + 20)
>  -            udp_res_data = h2.run(netperf_cli_udp6, timeout =
>  int(netperf_duration)*5 + 20)
>  +            tcp_res_data = h2.run(netperf_cli_tcp6, timeout =
>  (int(netperf_duration) + 20)*5)
>  +            udp_res_data = h2.run(netperf_cli_udp6, timeout =
>  (int(netperf_duration) + 20)*5)
>
>               server_proc.intr()
>
>  diff --git
>  a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py
>  b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py
>  index 5a6ec5f..d1b407b 100644
>  --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py
>  +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py
>  @@ -174,8 +174,8 @@ for offload in offloads:
>
>               server_proc = g1.run(netperf_srv, bg=True)
>               ctl.wait(2)
>  -            tcp_res_data = h2.run(netperf_cli_tcp, timeout =
>  int(netperf_duration)*5 + 20)
>  -            udp_res_data = h2.run(netperf_cli_udp, timeout =
>  int(netperf_duration)*5 + 20)
>  +            tcp_res_data = h2.run(netperf_cli_tcp, timeout =
>  (int(netperf_duration) + 20)*5)
>  +            udp_res_data = h2.run(netperf_cli_udp, timeout =
>  (int(netperf_duration) + 20)*5)
>               server_proc.intr()
>
>               if result_tcp is not None and\
>  @@ -250,8 +250,8 @@ for offload in offloads:
>
>               server_proc = g1.run(netperf_srv6, bg=True)
>               ctl.wait(2)
>  -            tcp_res_data = h2.run(netperf_cli_tcp6, timeout =
>  int(netperf_duration)*5 + 20)
>  -            udp_res_data = h2.run(netperf_cli_udp6, timeout =
>  int(netperf_duration)*5 + 20)
>  +            tcp_res_data = h2.run(netperf_cli_tcp6, timeout =
>  (int(netperf_duration) + 20)*5)
>  +            udp_res_data = h2.run(netperf_cli_udp6, timeout =
>  (int(netperf_duration) + 20)*5)
>               server_proc.intr()
>
>               if result_tcp is not None and tcp_res_data.get_result() is
>  not None and\
>  --
>  2.1.0
>
>  _______________________________________________
>  LNST-developers mailing list
>  LNST-developers(a)lists.fedorahosted.org
>  https://lists.fedorahosted.org/mailman/listinfo/lnst-developers
>  
​This will increase test duration by quite a bit, isn't this a little
overkill?
I thought we were aiming for shorter test durations..​

-- 
​Best regards,​

Jiri Prochazka
LNST Developer
​| www.lnst-project.org​

[phone] | jprochaz(a)redhat.com
Red Hat Czech | Purkyňova 71/99, 612 00 Brno