# TODO: Remove when definitely no NDRPDRDISC tests are used:
REGEX_RATE = re.compile(r'^[\D\d]*FINAL_RATE:\s(\d+\.\d+)\s(\w+)')
- REGEX_PLR_RATE = re.compile(r'PLRsearch lower bound::\s(\d+.\d+).*\n'
- r'PLRsearch upper bound::\s(\d+.\d+)')
+ REGEX_PLR_RATE = re.compile(r'PLRsearch lower bound::?\s(\d+.\d+).*\n'
+ r'PLRsearch upper bound::?\s(\d+.\d+)')
REGEX_NDRPDR_RATE = re.compile(r'NDR_LOWER:\s(\d+.\d+).*\n.*\n'
r'NDR_UPPER:\s(\d+.\d+).*\n'
REGEX_BMRR = re.compile(r'Maximum Receive Rate trial results'
r' in packets per second: \[(.*)\]')
+ REGEX_RECONF_LOSS = re.compile(r'Packets lost due to reconfig: (\d*)')
+ REGEX_RECONF_TIME = re.compile(r'Implied time lost: (\d*.\d*)')
+
REGEX_TC_TAG = re.compile(r'\d+[tT]\d+[cC]')
REGEX_TC_NAME_OLD = re.compile(r'-\d+[tT]\d+[cC]-')
groups = re.search(self.REGEX_TC_NAME_OLD, self._test_ID)
if not groups:
tag_count = 0
+ tag_tc = str()
for tag in test_result["tags"]:
groups = re.search(self.REGEX_TC_TAG, tag)
if groups:
"SOAK" in tags or
"TCP" in tags or
"MRR" in tags or
- "BMRR" in tags):
+ "BMRR" in tags or
+ "RECONF" in tags):
# TODO: Remove when definitely no NDRPDRDISC tests are used:
if "NDRDISC" in tags:
test_result["type"] = "NDR"
test_result["type"] = "MRR"
elif "FRMOBL" in tags or "BMRR" in tags:
test_result["type"] = "BMRR"
+ elif "RECONF" in tags:
+ test_result["type"] = "RECONF"
else:
test_result["status"] = "FAIL"
self._data["tests"][self._test_ID] = test_result
AvgStdevMetadataFactory.from_data([
float(groups.group(3)) / float(groups.group(1)), ])
+ elif test_result["type"] == "RECONF":
+ test_result["result"] = None
+ try:
+ grps_loss = re.search(self.REGEX_RECONF_LOSS, test.message)
+ grps_time = re.search(self.REGEX_RECONF_TIME, test.message)
+ test_result["result"] = {
+ "loss": int(grps_loss.group(1)),
+ "time": float(grps_time.group(1))
+ }
+ except (AttributeError, IndexError, ValueError, TypeError):
+ test_result["status"] = "FAIL"
+
self._data["tests"][self._test_ID] = test_result
def end_test(self, test):
job=job,
sep=SEPARATOR,
build=build["build"],
- name=file_name))
+ name=file_name.replace(".gz", "")))
try:
remove(full_name)
logs.append(("INFO",