| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import contextlib | 5 import contextlib |
| 6 import datetime | 6 import datetime |
| 7 import json | 7 import json |
| 8 import os | 8 import os |
| 9 import re | 9 import re |
| 10 import sys | 10 import sys |
| (...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 790 annotate=annotate, | 790 annotate=annotate, |
| 791 results_url='https://chromeperf.appspot.com', | 791 results_url='https://chromeperf.appspot.com', |
| 792 perf_id=perf_id, | 792 perf_id=perf_id, |
| 793 env=env, | 793 env=env, |
| 794 chartjson_file=chartjson_file) | 794 chartjson_file=chartjson_file) |
| 795 except self.m.step.StepFailure as f: | 795 except self.m.step.StepFailure as f: |
| 796 failures.append(f) | 796 failures.append(f) |
| 797 finally: | 797 finally: |
| 798 if 'device_affinity' in test_data: | 798 if 'device_affinity' in test_data: |
| 799 step_result = self.m.step.active_result | 799 step_result = self.m.step.active_result |
| 800 affinity = test_data['device_affinity'] |
| 801 |
| 800 step_result.presentation.step_text += ( | 802 step_result.presentation.step_text += ( |
| 801 self.m.test_utils.format_step_text( | 803 self.m.test_utils.format_step_text( |
| 802 [['Device Affinity: %s' % test_data['device_affinity']]])) | 804 [['Device Affinity: %s' % affinity]])) |
| 805 step_result.presentation.logs['device affinity'] = str(affinity) |
| 803 | 806 |
| 804 if archive: | 807 if archive: |
| 805 dest = '{builder}/{test}/{timestamp}_build_{buildno}.zip'.format( | 808 dest = '{builder}/{test}/{timestamp}_build_{buildno}.zip'.format( |
| 806 builder=self.m.properties['buildername'], | 809 builder=self.m.properties['buildername'], |
| 807 test=test_name, | 810 test=test_name, |
| 808 timestamp=_TimestampToIsoFormat(test_end_time), | 811 timestamp=_TimestampToIsoFormat(test_end_time), |
| 809 buildno=self.m.properties['buildnumber']) | 812 buildno=self.m.properties['buildnumber']) |
| 810 self.m.gsutil.upload( | 813 self.m.gsutil.upload( |
| 811 name='upload %s output dir archive' % test_name, | 814 name='upload %s output dir archive' % test_name, |
| 812 source=archive, | 815 source=archive, |
| (...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1480 script = self.c.test_runner | 1483 script = self.c.test_runner |
| 1481 if wrapper_script_suite_name: | 1484 if wrapper_script_suite_name: |
| 1482 script = self.m.chromium.output_dir.join('bin', 'run_%s' % | 1485 script = self.m.chromium.output_dir.join('bin', 'run_%s' % |
| 1483 wrapper_script_suite_name) | 1486 wrapper_script_suite_name) |
| 1484 else: | 1487 else: |
| 1485 env = kwargs.get('env', {}) | 1488 env = kwargs.get('env', {}) |
| 1486 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', | 1489 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', |
| 1487 self.m.chromium.output_dir) | 1490 self.m.chromium.output_dir) |
| 1488 kwargs['env'] = env | 1491 kwargs['env'] = env |
| 1489 return self.m.python(step_name, script, args, **kwargs) | 1492 return self.m.python(step_name, script, args, **kwargs) |
| OLD | NEW |