| OLD | NEW |
| 1 # Copyright (C) 2010 Google Inc. All rights reserved. | 1 # Copyright (C) 2010 Google Inc. All rights reserved. |
| 2 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Sze
ged | 2 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Sze
ged |
| 3 # | 3 # |
| 4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
| 5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
| 6 # met: | 6 # met: |
| 7 # | 7 # |
| 8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
| 9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
| 10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 | 166 |
| 167 tests_to_retry = self._tests_to_retry(initial_results) | 167 tests_to_retry = self._tests_to_retry(initial_results) |
| 168 all_retry_results = [] | 168 all_retry_results = [] |
| 169 if should_retry_failures and tests_to_retry: | 169 if should_retry_failures and tests_to_retry: |
| 170 enabled_pixel_tests_in_retry = self._force_pixel_tests_if_needed
() | 170 enabled_pixel_tests_in_retry = self._force_pixel_tests_if_needed
() |
| 171 | 171 |
| 172 for retry_attempt in xrange(1, self._options.num_retries + 1): | 172 for retry_attempt in xrange(1, self._options.num_retries + 1): |
| 173 if not tests_to_retry: | 173 if not tests_to_retry: |
| 174 break | 174 break |
| 175 | 175 |
| 176 self._stop_servers() |
| 177 self._start_servers(tests_to_retry) |
| 178 |
| 176 _log.info('') | 179 _log.info('') |
| 177 _log.info('Retrying %s, attempt %d of %d...', | 180 _log.info('Retrying %s, attempt %d of %d...', |
| 178 grammar.pluralize('unexpected failure', len(tests_
to_retry)), | 181 grammar.pluralize('unexpected failure', len(tests_
to_retry)), |
| 179 retry_attempt, self._options.num_retries) | 182 retry_attempt, self._options.num_retries) |
| 180 | 183 |
| 181 retry_results = self._run_tests(tests_to_retry, | 184 retry_results = self._run_tests(tests_to_retry, |
| 182 tests_to_skip=set(), | 185 tests_to_skip=set(), |
| 183 repeat_each=1, | 186 repeat_each=1, |
| 184 iterations=1, | 187 iterations=1, |
| 185 num_workers=num_workers, | 188 num_workers=num_workers, |
| (...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 555 | 558 |
| 556 stats = {} | 559 stats = {} |
| 557 for result in initial_results.results_by_name.values(): | 560 for result in initial_results.results_by_name.values(): |
| 558 if result.type != test_expectations.SKIP: | 561 if result.type != test_expectations.SKIP: |
| 559 stats[result.test_name] = {'results': (_worker_number(result.wor
ker_name), result.test_number, result.pid, int( | 562 stats[result.test_name] = {'results': (_worker_number(result.wor
ker_name), result.test_number, result.pid, int( |
| 560 result.test_run_time * 1000), int(result.total_run_time * 10
00))} | 563 result.test_run_time * 1000), int(result.total_run_time * 10
00))} |
| 561 stats_trie = {} | 564 stats_trie = {} |
| 562 for name, value in stats.iteritems(): | 565 for name, value in stats.iteritems(): |
| 563 json_results_generator.add_path_to_trie(name, value, stats_trie) | 566 json_results_generator.add_path_to_trie(name, value, stats_trie) |
| 564 return stats_trie | 567 return stats_trie |
| OLD | NEW |