v2: don't mix tabs and spaces
use 'in' instead of 'has_key'
Signed-off-by: Jan Vesely <jan.ves...@rutgers.edu>
---
framework/results.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/framework/results.py b/framework/results.py
index ddadcc1..820b39c 100644
--- a/framework/results.py
+++ b/framework/results.py
@@ -465,15 +465,17 @@ class TestResult(dict):
dictionary -- a dictionary instance to update the TestResult with
"""
- def update(d, u):
+ def update(d, u, check):
for k, v in u.iteritems():
if isinstance(v, dict):
- d[k] = update(d.get(k, {}), v)
+ d[k] = update(d.get(k, {}), v, True)
else:
+ if check and k in d:
+ print("Warning: duplicate subtest: {} value: {} old
value: {}".format(k, v, d[k]))
d[k] = v
return d
- update(self, dictionary)
+ update(self, dictionary, False)
class TestrunResult(object):
--
1.9.3
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit
