| 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 1008 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1019 for path in self.get_option('additional_expectations', []): | 1019 for path in self.get_option('additional_expectations', []): |
| 1020 expanded_path = self._filesystem.expanduser(path) | 1020 expanded_path = self._filesystem.expanduser(path) |
| 1021 if self._filesystem.exists(expanded_path): | 1021 if self._filesystem.exists(expanded_path): |
| 1022 _log.debug("reading additional_expectations from path '%s'" % pa
th) | 1022 _log.debug("reading additional_expectations from path '%s'" % pa
th) |
| 1023 expectations[path] = self._filesystem.read_text_file(expanded_pa
th) | 1023 expectations[path] = self._filesystem.read_text_file(expanded_pa
th) |
| 1024 else: | 1024 else: |
| 1025 _log.warning("additional_expectations path '%s' does not exist"
% path) | 1025 _log.warning("additional_expectations path '%s' does not exist"
% path) |
| 1026 return expectations | 1026 return expectations |
| 1027 | 1027 |
| 1028 def bot_expectations(self): | 1028 def bot_expectations(self): |
| 1029 if self.get_option('ignore_flaky_tests') == 'default': | 1029 if not self.get_option('ignore_flaky_tests'): |
| 1030 return {} | 1030 return {} |
| 1031 | 1031 |
| 1032 full_port_name = self.determine_full_port_name(self.host, self._options,
self.port_name) | 1032 full_port_name = self.determine_full_port_name(self.host, self._options,
self.port_name) |
| 1033 ignore_only_very_flaky = self.get_option('ignore_flaky_tests') == 'very-
flaky' | 1033 ignore_only_very_flaky = self.get_option('ignore_flaky_tests') == 'very-
flaky' |
| 1034 return BotTestExpectations(ignore_only_very_flaky).expectations(full_por
t_name) | 1034 return BotTestExpectations(ignore_only_very_flaky).expectations(full_por
t_name) |
| 1035 | 1035 |
| 1036 def _port_specific_expectations_files(self): | 1036 def _port_specific_expectations_files(self): |
| 1037 # Unlike baseline_search_path, we only want to search [WK2-PORT, PORT-VE
RSION, PORT] and any directories | 1037 # Unlike baseline_search_path, we only want to search [WK2-PORT, PORT-VE
RSION, PORT] and any directories |
| 1038 # included via --additional-platform-directory, not the full casade. | 1038 # included via --additional-platform-directory, not the full casade. |
| 1039 search_paths = [self.port_name] | 1039 search_paths = [self.port_name] |
| (...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1396 | 1396 |
| 1397 class VirtualTestSuite(object): | 1397 class VirtualTestSuite(object): |
| 1398 def __init__(self, name, base, args, tests=None): | 1398 def __init__(self, name, base, args, tests=None): |
| 1399 self.name = name | 1399 self.name = name |
| 1400 self.base = base | 1400 self.base = base |
| 1401 self.args = args | 1401 self.args = args |
| 1402 self.tests = tests or set() | 1402 self.tests = tests or set() |
| 1403 | 1403 |
| 1404 def __repr__(self): | 1404 def __repr__(self): |
| 1405 return "VirtualTestSuite('%s', '%s', %s)" % (self.name, self.base, self.
args) | 1405 return "VirtualTestSuite('%s', '%s', %s)" % (self.name, self.base, self.
args) |
| OLD | NEW |