| 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 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 435 def _upload_json_files(self): | 435 def _upload_json_files(self): |
| 436 if not self._options.test_results_server: | 436 if not self._options.test_results_server: |
| 437 return | 437 return |
| 438 | 438 |
| 439 if not self._options.master_name: | 439 if not self._options.master_name: |
| 440 _log.error("--test-results-server was set, but --master-name was not
. Not uploading JSON files.") | 440 _log.error("--test-results-server was set, but --master-name was not
. Not uploading JSON files.") |
| 441 return | 441 return |
| 442 | 442 |
| 443 _log.debug("Uploading JSON files for builder: %s", self._options.builder
_name) | 443 _log.debug("Uploading JSON files for builder: %s", self._options.builder
_name) |
| 444 attrs = [("builder", self._options.builder_name), | 444 attrs = [("builder", self._options.builder_name), |
| 445 ("testtype", "mojob test"), | 445 ("testtype", "Sky tests"), |
| 446 ("master", self._options.master_name)] | 446 ("master", self._options.master_name)] |
| 447 | 447 |
| 448 files = [(file, self._filesystem.join(self._results_directory, file)) fo
r file in ["failing_results.json", "full_results.json", "times_ms.json"]] | 448 files = [(file, self._filesystem.join(self._results_directory, file)) fo
r file in ["failing_results.json", "full_results.json", "times_ms.json"]] |
| 449 | 449 |
| 450 url = "http://%s/testfile/upload" % self._options.test_results_server | 450 url = "http://%s/testfile/upload" % self._options.test_results_server |
| 451 # Set uploading timeout in case appengine server is having problems. | 451 # Set uploading timeout in case appengine server is having problems. |
| 452 # 120 seconds are more than enough to upload test results. | 452 # 120 seconds are more than enough to upload test results. |
| 453 uploader = FileUploader(url, 120) | 453 uploader = FileUploader(url, 120) |
| 454 try: | 454 try: |
| 455 response = uploader.upload_as_multipart_form_data(self._filesystem,
files, attrs) | 455 response = uploader.upload_as_multipart_form_data(self._filesystem,
files, attrs) |
| (...skipping 20 matching lines...) Expand all 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 |