OLD | NEW |
1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 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 json | 5 import json |
6 import logging | 6 import logging |
7 import os | 7 import os |
8 import pickle | 8 import pickle |
9 import re | 9 import re |
10 | 10 |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 self._max_battery_temp = args.max_battery_temp | 72 self._max_battery_temp = args.max_battery_temp |
73 self._min_battery_level = args.min_battery_level | 73 self._min_battery_level = args.min_battery_level |
74 self._no_timeout = args.no_timeout | 74 self._no_timeout = args.no_timeout |
75 self._output_chartjson_data = args.output_chartjson_data | 75 self._output_chartjson_data = args.output_chartjson_data |
76 self._output_json_list = args.output_json_list | 76 self._output_json_list = args.output_json_list |
77 self._print_step = args.print_step | 77 self._print_step = args.print_step |
78 self._single_step = ( | 78 self._single_step = ( |
79 ' '.join(args.single_step_command) if args.single_step else None) | 79 ' '.join(args.single_step_command) if args.single_step else None) |
80 self._steps = args.steps | 80 self._steps = args.steps |
81 self._test_filter = args.test_filter | 81 self._test_filter = args.test_filter |
| 82 self._trace_output = args.trace_output |
82 self._write_buildbot_json = args.write_buildbot_json | 83 self._write_buildbot_json = args.write_buildbot_json |
83 | 84 |
84 #override | 85 #override |
85 def SetUp(self): | 86 def SetUp(self): |
86 pass | 87 pass |
87 | 88 |
88 #override | 89 #override |
89 def TearDown(self): | 90 def TearDown(self): |
90 pass | 91 pass |
91 | 92 |
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
229 return self._single_step | 230 return self._single_step |
230 | 231 |
231 @property | 232 @property |
232 def steps(self): | 233 def steps(self): |
233 return self._steps | 234 return self._steps |
234 | 235 |
235 @property | 236 @property |
236 def test_filter(self): | 237 def test_filter(self): |
237 return self._test_filter | 238 return self._test_filter |
238 | 239 |
| 240 @property |
| 241 def trace_output(self): |
| 242 return self._trace_output |
| 243 |
239 | 244 |
240 class PersistentDataError(base_error.BaseError): | 245 class PersistentDataError(base_error.BaseError): |
241 def __init__(self, message): | 246 def __init__(self, message): |
242 super(PersistentDataError, self).__init__(message) | 247 super(PersistentDataError, self).__init__(message) |
243 self._is_infra_error = True | 248 self._is_infra_error = True |
OLD | NEW |