| 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 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 def _run_tests(self, tests_to_run, tests_to_skip, repeat_each, iterations, n
um_workers, retrying): | 316 def _run_tests(self, tests_to_run, tests_to_skip, repeat_each, iterations, n
um_workers, retrying): |
| 317 | 317 |
| 318 test_inputs = [] | 318 test_inputs = [] |
| 319 for _ in xrange(iterations): | 319 for _ in xrange(iterations): |
| 320 for test in tests_to_run: | 320 for test in tests_to_run: |
| 321 for _ in xrange(repeat_each): | 321 for _ in xrange(repeat_each): |
| 322 test_inputs.append(self._test_input_for_file(test)) | 322 test_inputs.append(self._test_input_for_file(test)) |
| 323 return self._runner.run_tests(self._expectations, test_inputs, tests_to_
skip, num_workers, retrying) | 323 return self._runner.run_tests(self._expectations, test_inputs, tests_to_
skip, num_workers, retrying) |
| 324 | 324 |
| 325 def _start_servers(self, tests_to_run): | 325 def _start_servers(self, tests_to_run): |
| 326 if self._port.requires_http_server() or any(self._is_http_test(test) for
test in tests_to_run): | 326 if self._port.requires_sky_server() or any(self._is_http_test(test) for
test in tests_to_run): |
| 327 self._printer.write_update('Starting HTTP server ...') | 327 self._printer.write_update('Starting HTTP server ...') |
| 328 self._port.start_http_server(additional_dirs={}, number_of_drivers=s
elf._options.max_locked_shards) | 328 self._port.start_sky_server(additional_dirs={}, number_of_drivers=se
lf._options.max_locked_shards) |
| 329 self._http_server_started = True | 329 self._http_server_started = True |
| 330 | 330 |
| 331 if any(self._is_websocket_test(test) for test in tests_to_run): | 331 if any(self._is_websocket_test(test) for test in tests_to_run): |
| 332 self._printer.write_update('Starting WebSocket server ...') | 332 self._printer.write_update('Starting WebSocket server ...') |
| 333 self._port.start_websocket_server() | 333 self._port.start_websocket_server() |
| 334 self._websockets_server_started = True | 334 self._websockets_server_started = True |
| 335 | 335 |
| 336 def _stop_servers(self): | 336 def _stop_servers(self): |
| 337 if self._http_server_started: | 337 if self._http_server_started: |
| 338 self._printer.write_update('Stopping HTTP server ...') | 338 self._printer.write_update('Stopping HTTP server ...') |
| 339 self._http_server_started = False | 339 self._http_server_started = False |
| 340 self._port.stop_http_server() | 340 self._port.stop_sky_server() |
| 341 if self._websockets_server_started: | 341 if self._websockets_server_started: |
| 342 self._printer.write_update('Stopping WebSocket server ...') | 342 self._printer.write_update('Stopping WebSocket server ...') |
| 343 self._websockets_server_started = False | 343 self._websockets_server_started = False |
| 344 self._port.stop_websocket_server() | 344 self._port.stop_websocket_server() |
| 345 | 345 |
| 346 def _clean_up_run(self): | 346 def _clean_up_run(self): |
| 347 _log.debug("Flushing stdout") | 347 _log.debug("Flushing stdout") |
| 348 sys.stdout.flush() | 348 sys.stdout.flush() |
| 349 _log.debug("Flushing stderr") | 349 _log.debug("Flushing stderr") |
| 350 sys.stderr.flush() | 350 sys.stderr.flush() |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 476 return int(worker_name.split('/')[1]) if worker_name else -1 | 476 return int(worker_name.split('/')[1]) if worker_name else -1 |
| 477 | 477 |
| 478 stats = {} | 478 stats = {} |
| 479 for result in initial_results.results_by_name.values(): | 479 for result in initial_results.results_by_name.values(): |
| 480 if result.type != test_expectations.SKIP: | 480 if result.type != test_expectations.SKIP: |
| 481 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))} | 481 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))} |
| 482 stats_trie = {} | 482 stats_trie = {} |
| 483 for name, value in stats.iteritems(): | 483 for name, value in stats.iteritems(): |
| 484 json_results_generator.add_path_to_trie(name, value, stats_trie) | 484 json_results_generator.add_path_to_trie(name, value, stats_trie) |
| 485 return stats_trie | 485 return stats_trie |
| OLD | NEW |