Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(703)

Side by Side Diff: build/android/pylib/remote/device/remote_device_instrumentation_test_run.py

Issue 1141793003: Update from https://crrev.com/329939 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 self._test_instance.driver_name, 53 self._test_instance.driver_name,
54 environment_variables=env_vars, 54 environment_variables=env_vars,
55 extra_apks=[self._test_instance.test_apk]) 55 extra_apks=[self._test_instance.test_apk])
56 56
57 #override 57 #override
58 def _ParseTestResults(self): 58 def _ParseTestResults(self):
59 logging.info('Parsing results from stdout.') 59 logging.info('Parsing results from stdout.')
60 r = base_test_result.TestRunResults() 60 r = base_test_result.TestRunResults()
61 result_code, result_bundle, statuses = ( 61 result_code, result_bundle, statuses = (
62 self._test_instance.ParseAmInstrumentRawOutput( 62 self._test_instance.ParseAmInstrumentRawOutput(
63 self._GetRawTestOutput().splitlines())) 63 self._results['results']['output'].splitlines()))
64 result = self._test_instance.GenerateTestResults( 64 result = self._test_instance.GenerateTestResults(
65 result_code, result_bundle, statuses, 0, 0) 65 result_code, result_bundle, statuses, 0, 0)
66 66
67 if isinstance(result, base_test_result.BaseTestResult): 67 if isinstance(result, base_test_result.BaseTestResult):
68 r.AddResult(result) 68 r.AddResult(result)
69 elif isinstance(result, list): 69 elif isinstance(result, list):
70 r.AddResults(result) 70 r.AddResults(result)
71 else: 71 else:
72 raise Exception('Unexpected result type: %s' % type(result).__name__) 72 raise Exception('Unexpected result type: %s' % type(result).__name__)
73 73
74 return r 74 return r
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698