| OLD | NEW |
| 1 # Copyright (C) 2012 Google Inc. All rights reserved. | 1 # Copyright (C) 2012 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 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 354 return False | 354 return False |
| 355 if parsed_response.get('status') != 'OK': | 355 if parsed_response.get('status') != 'OK': |
| 356 _log.error("Uploaded JSON to %s but got an error:" % url) | 356 _log.error("Uploaded JSON to %s but got an error:" % url) |
| 357 _log.error(json.dumps(parsed_response, indent=4)) | 357 _log.error(json.dumps(parsed_response, indent=4)) |
| 358 return False | 358 return False |
| 359 | 359 |
| 360 _log.info("JSON file uploaded to %s." % url) | 360 _log.info("JSON file uploaded to %s." % url) |
| 361 return True | 361 return True |
| 362 | 362 |
| 363 def _run_tests_set(self, tests): | 363 def _run_tests_set(self, tests): |
| 364 result_count = len(tests) | |
| 365 failures = 0 | 364 failures = 0 |
| 366 self._results = [] | 365 self._results = [] |
| 367 | 366 |
| 368 for i, test in enumerate(tests): | 367 for i, test in enumerate(tests): |
| 369 _log.info('Running %s (%d of %d)' % (test.test_name(), i + 1, len(te
sts))) | 368 _log.info('Running %s (%d of %d)' % (test.test_name(), i + 1, len(te
sts))) |
| 370 start_time = time.time() | 369 start_time = time.time() |
| 371 metrics = test.run(self._options.time_out_ms) | 370 metrics = test.run(self._options.time_out_ms) |
| 372 if metrics: | 371 if metrics: |
| 373 self._results.append((test, metrics)) | 372 self._results.append((test, metrics)) |
| 374 else: | 373 else: |
| 375 failures += 1 | 374 failures += 1 |
| 376 _log.error('FAILED') | 375 _log.error('FAILED') |
| 377 | 376 |
| 378 _log.info('Finished: %f s' % (time.time() - start_time)) | 377 _log.info('Finished: %f s' % (time.time() - start_time)) |
| 379 _log.info('') | 378 _log.info('') |
| 380 | 379 |
| 381 return failures | 380 return failures |
| OLD | NEW |