| 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 pipes | 9 import pipes |
| 10 import re | 10 import re |
| (...skipping 855 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 866 annotate=annotate, | 866 annotate=annotate, |
| 867 results_url='https://chromeperf.appspot.com', | 867 results_url='https://chromeperf.appspot.com', |
| 868 perf_id=perf_id, | 868 perf_id=perf_id, |
| 869 env=env, | 869 env=env, |
| 870 chartjson_file=chartjson_file) | 870 chartjson_file=chartjson_file) |
| 871 except self.m.step.StepFailure as f: | 871 except self.m.step.StepFailure as f: |
| 872 failures.append(f) | 872 failures.append(f) |
| 873 finally: | 873 finally: |
| 874 if 'device_affinity' in test_data: | 874 if 'device_affinity' in test_data: |
| 875 step_result = self.m.step.active_result | 875 step_result = self.m.step.active_result |
| 876 affinity = test_data['device_affinity'] | |
| 877 | |
| 878 step_result.presentation.step_text += ( | 876 step_result.presentation.step_text += ( |
| 879 self.m.test_utils.format_step_text( | 877 self.m.test_utils.format_step_text( |
| 880 [['Device Affinity: %s' % affinity]])) | 878 [['Device Affinity: %s' % test_data['device_affinity']]])) |
| 881 step_result.presentation.logs['device affinity'] = str(affinity) | |
| 882 | 879 |
| 883 if archive: | 880 if archive: |
| 884 dest = '{builder}/{test}/{timestamp}_build_{buildno}.zip'.format( | 881 dest = '{builder}/{test}/{timestamp}_build_{buildno}.zip'.format( |
| 885 builder=self.m.properties['buildername'], | 882 builder=self.m.properties['buildername'], |
| 886 test=test_name, | 883 test=test_name, |
| 887 timestamp=_TimestampToIsoFormat(test_end_time), | 884 timestamp=_TimestampToIsoFormat(test_end_time), |
| 888 buildno=self.m.properties['buildnumber']) | 885 buildno=self.m.properties['buildnumber']) |
| 889 self.m.gsutil.upload( | 886 self.m.gsutil.upload( |
| 890 name='upload %s output dir archive' % test_name, | 887 name='upload %s output dir archive' % test_name, |
| 891 source=archive, | 888 source=archive, |
| (...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1638 script = self.c.test_runner | 1635 script = self.c.test_runner |
| 1639 if wrapper_script_suite_name: | 1636 if wrapper_script_suite_name: |
| 1640 script = self.m.chromium.output_dir.join('bin', 'run_%s' % | 1637 script = self.m.chromium.output_dir.join('bin', 'run_%s' % |
| 1641 wrapper_script_suite_name) | 1638 wrapper_script_suite_name) |
| 1642 else: | 1639 else: |
| 1643 env = kwargs.get('env', {}) | 1640 env = kwargs.get('env', {}) |
| 1644 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', | 1641 env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR', |
| 1645 self.m.chromium.output_dir) | 1642 self.m.chromium.output_dir) |
| 1646 kwargs['env'] = env | 1643 kwargs['env'] = env |
| 1647 return self.m.python(step_name, script, args, **kwargs) | 1644 return self.m.python(step_name, script, args, **kwargs) |
| OLD | NEW |