sergiodj/gdb-buildbot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Using OrderedDict instead of regular dictionaries because the order of the test results matters

Browse source
This commit is contained in:
Sergio Durigan Junior 2015-08-06 21:58:30 -04:00
parent 265c3f4c09
commit ca05efdbc7
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/sumfiles.py
View file

@ -3,6 +3,9 @@
import re import re
import os.path import os.path
from StringIO import StringIO from StringIO import StringIO
# Necessary for ordered dictionaries. We use them when the order or
# the tests matters to us.
from collections import OrderedDict
# Helper regex for parse_sum_line. # Helper regex for parse_sum_line.
sum_matcher = re.compile('^(.?(PASS|FAIL)): (.*)$') sum_matcher = re.compile('^(.?(PASS|FAIL)): (.*)$')
@ -57,7 +60,6 @@ class DejaResults(object):
os.makedirs (bdir, 0755) os.makedirs (bdir, 0755)
fname = os.path.join (bdir, filename) fname = os.path.join (bdir, filename)
keys = sum_dict.keys () keys = sum_dict.keys ()
keys.sort ()
mode = 'w' mode = 'w'
if header: if header:
with open (fname, 'w') as f: with open (fname, 'w') as f:
@ -87,7 +89,7 @@ class DejaResults(object):
else: else:
fname = os.path.join (gdb_web_base, subdir, rev_or_branch, filename) fname = os.path.join (gdb_web_base, subdir, rev_or_branch, filename)
if os.path.exists (fname): if os.path.exists (fname):
result = {} result = OrderedDict ()
with open (fname, 'r') as f: with open (fname, 'r') as f:
for line in f: for line in f:
self.parse_sum_line (result, line) self.parse_sum_line (result, line)
@ -112,7 +114,7 @@ class DejaResults(object):
# dictionary. # dictionary.
def read_sum_text (self, text): def read_sum_text (self, text):
cur_file = StringIO (text) cur_file = StringIO (text)
cur_results = {} cur_results = OrderedDict ()
for line in cur_file.readlines (): for line in cur_file.readlines ():
self.parse_sum_line (cur_results, line) self.parse_sum_line (cur_results, line)
return cur_results return cur_results
@ -122,7 +124,6 @@ class DejaResults(object):
# Returns a regression report, as a string. # Returns a regression report, as a string.
def compute_regressions (self, builder, branch, results, baseline): def compute_regressions (self, builder, branch, results, baseline):
our_keys = results.keys () our_keys = results.keys ()
our_keys.sort ()
result = '' result = ''
xfails = self.read_xfail (builder, branch) xfails = self.read_xfail (builder, branch)
if xfails is None: if xfails is None: