Reverting XFAIL-re-compatible

This commit is contained in:
Sergio Durigan Junior 2015-01-19 20:26:05 -05:00
parent a8ab56138b
commit 90555f880d

View file

@ -112,12 +112,6 @@ class DejaResults(object):
self.parse_sum_line(cur_results, line) self.parse_sum_line(cur_results, line)
return cur_results return cur_results
def transform_re (self, xfails):
ret = {}
for r in xfails:
ret[r] = re.compile (r)
return ret
# Compute regressions between RESULTS and BASELINE on BUILDER. # Compute regressions between RESULTS and BASELINE on BUILDER.
# BASELINE will be modified if any new PASSes are seen. # BASELINE will be modified if any new PASSes are seen.
# Returns a regression report, as a string. # Returns a regression report, as a string.
@ -128,18 +122,10 @@ class DejaResults(object):
xfails = self.read_xfail (builder) xfails = self.read_xfail (builder)
if xfails is None: if xfails is None:
xfails = {} xfails = {}
xfails_re = self.transform_re (xfails)
for key in our_keys: for key in our_keys:
# An XFAIL entry means we have an unreliable test. # An XFAIL entry means we have an unreliable test.
cont = False if key in xfails:
for x in xfails_re:
if re.match (xfails_re[x], (key)):
cont = True
break
if cont:
continue continue
# if key in xfails:
# continue
# A transition to PASS means we should update the baseline. # A transition to PASS means we should update the baseline.
if results[key] == 'PASS': if results[key] == 'PASS':
if key not in baseline or baseline[key] != 'PASS': if key not in baseline or baseline[key] != 'PASS':