Android: do not run telemetry directly.

scripts/slave/unittests/telemetry_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for telemetry.py.
 
 This is a basic check that telemetry.py forms commands properly.
 
 """
@@ skipping 56 matching lines @@
     fp = self._GetDefaultFactoryProperties()
 
     cmd = [self.telemetry, '--print-cmd',
            '--factory-properties=%s' % json.dumps(fp)]
 
     ret = runScript(cmd, filter_obj=self.capture, print_cmd=False)
     self.assertEqual(ret, 0)
 
     runtest = os.path.abspath(os.path.join(SCRIPT_DIR, '..', 'runtest.py'))
 
-    expectedText = (['\'adb\' \'root\'',
-        '\'adb\' \'wait-for-device\'',
+    expectedText = ([
         '\'%s\' ' % sys.executable +
         '\'%s\' \'--run-python-script\' \'--target\' \'Release\' ' % runtest +
             '\'--build-dir\' \'src/build\' \'--no-xvfb\' ' +
             '\'--factory-properties=' +
             '{"target": "Release", ' +
             '"build_dir": "src/build", "perf_id": "android-gn", ' +
             '"step_name": "sunspider", "test_name": "sunspider", ' +
             '"target_platform": "linux2", "target_os": "android", ' +
             '"show_perf_results": true}\' ' +
-            '\'src/tools/perf/run_benchmark\' \'-v\' ' +
-            '\'--output-format=buildbot\' ' +
-            '\'--browser=android-chromium-testshell\' \'sunspider\''
+            '\'src/build/android/test_runner.py\' \'perf\' ' +
+            '\'--print\' ' +
+            '\'sunspider\''
         ])
-
     self.assertEqual(expectedText, self.capture.text)
 
   def testExtraArg(self):
     fp = self._GetDefaultFactoryProperties()
     fp['extra_args'] = ['--profile-dir=fake_dir']
 
     cmd = [self.telemetry, '--print-cmd',
            '--factory-properties=%s' % json.dumps(fp)]
 
     ret = runScript(cmd, filter_obj=self.capture, print_cmd=False)
     self.assertEqual(ret, 0)
 
     runtest = os.path.abspath(os.path.join(SCRIPT_DIR, '..', 'runtest.py'))
 
-    expectedText = (['\'adb\' \'root\'',
-        '\'adb\' \'wait-for-device\'',
+    expectedText = ([
         '\'%s\' ' % sys.executable +
         '\'%s\' \'--run-python-script\' \'--target\' \'Release\' ' % runtest +
             '\'--build-dir\' \'src/build\' \'--no-xvfb\' ' +
             '\'--factory-properties=' +
             '{"target": "Release", "build_dir": "src/build", ' +
             '"extra_args": ["--profile-dir=fake_dir"], ' +
             '"perf_id": "android-gn", ' +
             '"step_name": "sunspider", "test_name": "sunspider", ' +
             '"target_platform": "linux2", "target_os": "android", ' +
             '"show_perf_results": true}\' ' +
-            '\'src/tools/perf/run_benchmark\' \'-v\' ' +
-            '\'--output-format=buildbot\' ' +
-            '\'--profile-dir=fake_dir\' '+
-            '\'--browser=android-chromium-testshell\' \'sunspider\''
+            '\'src/build/android/test_runner.py\' \'perf\' ' +
+            '\'--print\' ' +
+            '\'sunspider\''
         ])
 
     self.assertEqual(expectedText, self.capture.text)
 
 if __name__ == '__main__':
   unittest.main()