OLD | NEW |
1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 """Run specific test on specific environment.""" | 5 """Run specific test on specific environment.""" |
6 | 6 |
7 import logging | 7 import logging |
8 import os | 8 import os |
9 import tempfile | 9 import tempfile |
10 | 10 |
(...skipping 22 matching lines...) Expand all Loading... |
33 for t in tests: | 33 for t in tests: |
34 test_name = '%s#%s' % (t['class'], t['method']) | 34 test_name = '%s#%s' % (t['class'], t['method']) |
35 logging.debug(' %s', test_name) | 35 logging.debug(' %s', test_name) |
36 test_list_file.write('%s\n' % test_name) | 36 test_list_file.write('%s\n' % test_name) |
37 test_list_file.flush() | 37 test_list_file.flush() |
38 self._test_instance._data_deps.append( | 38 self._test_instance._data_deps.append( |
39 (os.path.abspath(test_list_file.name), None)) | 39 (os.path.abspath(test_list_file.name), None)) |
40 | 40 |
41 env_vars = self._test_instance.GetDriverEnvironmentVars( | 41 env_vars = self._test_instance.GetDriverEnvironmentVars( |
42 test_list_file_path=test_list_file.name) | 42 test_list_file_path=test_list_file.name) |
| 43 env_vars.update(self._test_instance.GetHttpServerEnvironmentVars()) |
43 | 44 |
44 logging.debug('extras:') | 45 logging.debug('extras:') |
45 for k, v in env_vars.iteritems(): | 46 for k, v in env_vars.iteritems(): |
46 logging.debug(' %s: %s', k, v) | 47 logging.debug(' %s: %s', k, v) |
47 | 48 |
48 self._AmInstrumentTestSetup( | 49 self._AmInstrumentTestSetup( |
49 self._test_instance.apk_under_test, | 50 self._test_instance.apk_under_test, |
50 self._test_instance.driver_apk, | 51 self._test_instance.driver_apk, |
51 self._test_instance.driver_name, | 52 self._test_instance.driver_name, |
52 environment_variables=env_vars, | 53 environment_variables=env_vars, |
(...skipping 12 matching lines...) Expand all Loading... |
65 | 66 |
66 if isinstance(result, base_test_result.BaseTestResult): | 67 if isinstance(result, base_test_result.BaseTestResult): |
67 r.AddResult(result) | 68 r.AddResult(result) |
68 elif isinstance(result, list): | 69 elif isinstance(result, list): |
69 r.AddResults(result) | 70 r.AddResults(result) |
70 else: | 71 else: |
71 raise Exception('Unexpected result type: %s' % type(result).__name__) | 72 raise Exception('Unexpected result type: %s' % type(result).__name__) |
72 | 73 |
73 self._DetectPlatformErrors(r) | 74 self._DetectPlatformErrors(r) |
74 return r | 75 return r |
OLD | NEW |