| OLD | NEW |
| 1 # Copyright (C) 2010 Google Inc. All rights reserved. | 1 # Copyright (C) 2010 Google Inc. All rights reserved. |
| 2 # | 2 # |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
| 5 # met: | 5 # met: |
| 6 # | 6 # |
| 7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
| 9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
| (...skipping 1244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1255 _log.warning("additional_expectations path '%s' does not exist"
% path) | 1255 _log.warning("additional_expectations path '%s' does not exist"
% path) |
| 1256 return expectations | 1256 return expectations |
| 1257 | 1257 |
| 1258 def bot_expectations(self): | 1258 def bot_expectations(self): |
| 1259 if not self.get_option('ignore_flaky_tests'): | 1259 if not self.get_option('ignore_flaky_tests'): |
| 1260 return {} | 1260 return {} |
| 1261 | 1261 |
| 1262 full_port_name = self.determine_full_port_name(self.host, self._options,
self.port_name) | 1262 full_port_name = self.determine_full_port_name(self.host, self._options,
self.port_name) |
| 1263 builder_category = self.get_option('ignore_builder_category', 'layout') | 1263 builder_category = self.get_option('ignore_builder_category', 'layout') |
| 1264 factory = BotTestExpectationsFactory() | 1264 factory = BotTestExpectationsFactory() |
| 1265 # FIXME: This only grabs release builder's flakiness data. If we're runn
ing debug, |
| 1266 # when we should grab the debug builder's data. |
| 1265 expectations = factory.expectations_for_port(full_port_name, builder_cat
egory) | 1267 expectations = factory.expectations_for_port(full_port_name, builder_cat
egory) |
| 1266 | 1268 |
| 1267 if not expectations: | 1269 if not expectations: |
| 1268 return {} | 1270 return {} |
| 1269 | 1271 |
| 1270 ignore_mode = self.get_option('ignore_flaky_tests') | 1272 ignore_mode = self.get_option('ignore_flaky_tests') |
| 1271 if ignore_mode == 'very-flaky' or ignore_mode == 'maybe-flaky': | 1273 if ignore_mode == 'very-flaky' or ignore_mode == 'maybe-flaky': |
| 1272 return expectations.flakes_by_path(ignore_mode == 'very-flaky') | 1274 return expectations.flakes_by_path(ignore_mode == 'very-flaky') |
| 1273 if ignore_mode == 'unexpected': | 1275 if ignore_mode == 'unexpected': |
| 1274 return expectations.unexpected_results_by_path() | 1276 return expectations.unexpected_results_by_path() |
| (...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1924 | 1926 |
| 1925 class PhysicalTestSuite(object): | 1927 class PhysicalTestSuite(object): |
| 1926 def __init__(self, base, args): | 1928 def __init__(self, base, args): |
| 1927 self.name = base | 1929 self.name = base |
| 1928 self.base = base | 1930 self.base = base |
| 1929 self.args = args | 1931 self.args = args |
| 1930 self.tests = set() | 1932 self.tests = set() |
| 1931 | 1933 |
| 1932 def __repr__(self): | 1934 def __repr__(self): |
| 1933 return "PhysicalTestSuite('%s', '%s', %s)" % (self.name, self.base, self
.args) | 1935 return "PhysicalTestSuite('%s', '%s', %s)" % (self.name, self.base, self
.args) |
| OLD | NEW |