Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1661)

Side by Side Diff: Tools/Scripts/webkitpy/layout_tests/controllers/manager.py

Issue 23496003: User interruption should still create results.html for run-webkit-tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 summarized_full_results = test_run_results.summarize_results(self._port, self._expectations, initial_results, retry_results, enabled_pixel_tests_in_retr y) 242 summarized_full_results = test_run_results.summarize_results(self._port, self._expectations, initial_results, retry_results, enabled_pixel_tests_in_retr y)
243 summarized_failing_results = test_run_results.summarize_results(self._po rt, self._expectations, initial_results, retry_results, enabled_pixel_tests_in_r etry, only_include_failing=True) 243 summarized_failing_results = test_run_results.summarize_results(self._po rt, self._expectations, initial_results, retry_results, enabled_pixel_tests_in_r etry, only_include_failing=True)
244 244
245 exit_code = summarized_failing_results['num_regressions'] 245 exit_code = summarized_failing_results['num_regressions']
246 if not self._options.dry_run: 246 if not self._options.dry_run:
247 self._write_json_files(summarized_full_results, summarized_failing_r esults, initial_results) 247 self._write_json_files(summarized_full_results, summarized_failing_r esults, initial_results)
248 self._upload_json_files() 248 self._upload_json_files()
249 249
250 results_path = self._filesystem.join(self._results_directory, "resul ts.html") 250 results_path = self._filesystem.join(self._results_directory, "resul ts.html")
251 self._copy_results_html_file(results_path) 251 self._copy_results_html_file(results_path)
252 if self._options.show_results and (exit_code or (self._options.full_ results_html and initial_results.total_failures)): 252 if not initial_results.interrupted and self._options.show_results an d (exit_code or (self._options.full_results_html and initial_results.total_failu res)):
253 self._port.show_results_html_file(results_path) 253 self._port.show_results_html_file(results_path)
254 254
255 self._printer.print_results(time.time() - start_time, initial_results, s ummarized_failing_results) 255 self._printer.print_results(time.time() - start_time, initial_results, s ummarized_failing_results)
256 return test_run_results.RunDetails(exit_code, summarized_full_results, s ummarized_failing_results, initial_results, retry_results, enabled_pixel_tests_i n_retry) 256 return test_run_results.RunDetails(exit_code, summarized_full_results, s ummarized_failing_results, initial_results, retry_results, enabled_pixel_tests_i n_retry)
257 257
258 def _run_tests(self, tests_to_run, tests_to_skip, repeat_each, iterations, n um_workers, retrying): 258 def _run_tests(self, tests_to_run, tests_to_skip, repeat_each, iterations, n um_workers, retrying):
259 259
260 test_inputs = [] 260 test_inputs = []
261 for _ in xrange(iterations): 261 for _ in xrange(iterations):
262 for test in tests_to_run: 262 for test in tests_to_run:
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 return int(worker_name.split('/')[1]) if worker_name else -1 415 return int(worker_name.split('/')[1]) if worker_name else -1
416 416
417 stats = {} 417 stats = {}
418 for result in initial_results.results_by_name.values(): 418 for result in initial_results.results_by_name.values():
419 if result.type != test_expectations.SKIP: 419 if result.type != test_expectations.SKIP:
420 stats[result.test_name] = {'results': (_worker_number(result.wor ker_name), result.test_number, result.pid, int(result.test_run_time * 1000), int (result.total_run_time * 1000))} 420 stats[result.test_name] = {'results': (_worker_number(result.wor ker_name), result.test_number, result.pid, int(result.test_run_time * 1000), int (result.total_run_time * 1000))}
421 stats_trie = {} 421 stats_trie = {}
422 for name, value in stats.iteritems(): 422 for name, value in stats.iteritems():
423 json_results_generator.add_path_to_trie(name, value, stats_trie) 423 json_results_generator.add_path_to_trie(name, value, stats_trie)
424 return stats_trie 424 return stats_trie
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698