From: Ondrej Lichtner <olichtne(a)redhat.com>
Parameters regarding the direction of the Netperf tests were
inconsistent and contained a few typos. This fixes the issue.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
---
recipes/regression_tests/phase2/team_test.py | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/recipes/regression_tests/phase2/team_test.py
b/recipes/regression_tests/phase2/team_test.py
index 6503bc9..0ecc25c 100644
--- a/recipes/regression_tests/phase2/team_test.py
+++ b/recipes/regression_tests/phase2/team_test.py
@@ -160,8 +160,8 @@ for offload in offloads:
if udp_ipv4_id is not None:
result_udp = perf_api.new_result(udp_ipv4_id,
"udp_ipv4_result")
result_udp.set_parameter(offload, state)
- result_tcp.set_parameter('netperf_server',
"testmachine1")
- result_tcp.set_parameter('netperf_client',
"testmachine2")
+ result_udp.set_parameter('netperf_server',
"testmachine1")
+ result_udp.set_parameter('netperf_client',
"testmachine2")
if product_name is not None:
result_udp.set_tag(product_name)
res_hash = result_udp.generate_hash(['kernel-release',
@@ -217,7 +217,8 @@ for offload in offloads:
if tcp_ipv6_id is not None:
result_tcp = perf_api.new_result(tcp_ipv6_id,
"tcp_ipv6_result")
result_tcp.set_parameter(offload, state)
- result_tcp.set_parameter('netperf_direction',
"testmachine1->testmachine2")
+ result_tcp.set_parameter('netperf_server',
"testmachine1")
+ result_tcp.set_parameter('netperf_client',
"testmachine2")
if product_name is not None:
result_tcp.set_tag(product_name)
res_hash = result_tcp.generate_hash(['kernel-release',
@@ -239,7 +240,8 @@ for offload in offloads:
if udp_ipv6_id is not None:
result_udp = perf_api.new_result(udp_ipv4_id,
"udp_ipv6_result")
result_udp.set_parameter(offload, state)
- result_tcp.set_parameter('netperf_direction',
"testmachine1->testmachine2")
+ result_udp.set_parameter('netperf_server',
"testmachine1")
+ result_udp.set_parameter('netperf_client',
"testmachine2")
if product_name is not None:
result_udp.set_tag(product_name)
res_hash = result_udp.generate_hash(['kernel-release',
@@ -347,8 +349,8 @@ for offload in offloads:
if udp_ipv4_id is not None:
result_udp = perf_api.new_result(udp_ipv4_id,
"udp_ipv4_result")
result_udp.set_parameter(offload, state)
- result_udp.set_parameter('netperf_server',
"testmachine1")
- result_udp.set_parameter('netperf_client',
"testmachine2")
+ result_udp.set_parameter('netperf_server',
"testmachine2")
+ result_udp.set_parameter('netperf_client',
"testmachine1")
if product_name is not None:
result_udp.set_tag(product_name)
res_hash = result_udp.generate_hash(['kernel-release',
--
2.5.0
Show replies by date
From: Ondrej Lichtner <olichtne(a)redhat.com>
If there where white space characters at the end of line in a mapping
file, the id would be skipped and therefore not used in the recipe. This
fixes that.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
---
lnst/Controller/PerfRepoUtils.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lnst/Controller/PerfRepoUtils.py b/lnst/Controller/PerfRepoUtils.py
index 4ae38b1..a8fbb6b 100644
--- a/lnst/Controller/PerfRepoUtils.py
+++ b/lnst/Controller/PerfRepoUtils.py
@@ -14,7 +14,7 @@ olichtne(a)redhat.com (Ondrej Lichtner)
import re
def parse_id_mapping(filename):
- line_re = re.compile(r"^(\w+)\s*=\s*(\w+)$")
+ line_re = re.compile(r"^(\w+)\s*=\s*(\w+)\s*$")
res_dict = {}
try:
with open(filename) as f:
--
2.5.0