Roll chromium_revision 22b81f6c45..d604de96c9 (459032:459307)

tools-webrtc/mb/mb_unittest.py

 #!/usr/bin/python
 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 """Tests for mb.py."""
@@ skipping 360 matching lines @@
                       '/fake_src/testing/buildbot/gn_isolate_map.pyl'],
                      files=test_files, ret=0)
 
     isolate_file = mbw.files['/fake_src/out/Default/base_unittests.isolate']
     isolate_file_contents = ast.literal_eval(isolate_file)
     files = isolate_file_contents['variables']['files']
     command = isolate_file_contents['variables']['command']
 
     self.assertEqual(files, ['base_unittests'])
     self.assertEqual(command, [
-        './../../build/android/test_wrapper/logdog_wrapper.py',
-        '--logdog-bin-cmd', './../../bin/logdog_butler',
-        '--project', 'chromium',
-        '--service-account-json',
-        '/creds/service_accounts/service-account-luci-logdog-publisher.json',
-        '--prefix', 'android/swarming/logcats/${SWARMING_TASK_ID}',
-        '--source', '${ISOLATED_OUTDIR}/logcats',
-        '--name', 'unified_logcats',
-        'bin/run_base_unittests',
-        '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',
-        '--target-devices-file', '${SWARMING_BOT_FILE}',
-        '-v',
+        '../../build/android/test_wrapper/logdog_wrapper.py',
+        '--target', 'base_unittests',
+        '--logdog-bin-cmd', '../../bin/logdog_butler',
+        '--target-devices-file', '${SWARMING_BOT_FILE}'
     ])
 
   def test_gn_gen_swarming_android_junit_test(self):
     test_files = {
       '/tmp/swarming_targets': 'base_unittests\n',
       '/fake_src/testing/buildbot/gn_isolate_map.pyl': (
           "{'base_unittests': {"
           "  'label': '//base:base_unittests',"
           "  'type': 'junit_test',"
           "}}\n"
       ),
       '/fake_src/out/Default/base_unittests.runtime_deps': (
           "base_unittests\n"
       ),
     }
     mbw = self.check(['gen', '-c', 'gn_android_bot', '//out/Default',
                       '--swarming-targets-file', '/tmp/swarming_targets',
                       '--isolate-map-file',
                       '/fake_src/testing/buildbot/gn_isolate_map.pyl'],
                      files=test_files, ret=0)
 
     isolate_file = mbw.files['/fake_src/out/Default/base_unittests.isolate']
     isolate_file_contents = ast.literal_eval(isolate_file)
     files = isolate_file_contents['variables']['files']
     command = isolate_file_contents['variables']['command']
 
     self.assertEqual(files, ['base_unittests'])
     self.assertEqual(command, [
-        './../../build/android/test_wrapper/logdog_wrapper.py',
-        '--logdog-bin-cmd', './../../bin/logdog_butler',
-        '--project', 'chromium',
-        '--service-account-json',
-        '/creds/service_accounts/service-account-luci-logdog-publisher.json',
-        '--prefix', 'android/swarming/logcats/${SWARMING_TASK_ID}',
-        '--source', '${ISOLATED_OUTDIR}/logcats',
-        '--name', 'unified_logcats',
-        'bin/run_base_unittests',
-        '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',
-        '-v',
+        '../../build/android/test_wrapper/logdog_wrapper.py',
+        '--target', 'base_unittests',
+        '--logdog-bin-cmd', '../../bin/logdog_butler',
     ])
 
   def test_gn_gen_non_parallel_console_test_launcher(self):
     test_files = {
       '/tmp/swarming_targets': 'base_unittests\n',
       '/fake_src/testing/buildbot/gn_isolate_map.pyl': (
           "{'base_unittests': {"
           "  'label': '//base:base_unittests',"
           "  'type': 'non_parallel_console_test_launcher',"
           "}}\n"
@@ skipping 336 matching lines @@
     self.check(['lookup', '-c', 'fake_config'], mbw=mbw,
                ret=0,
                out=("GYP_DEFINES='foo=bar baz=1'\n"
                     "GYP_LINK_CONCURRENCY=1\n"
                     "LLVM_FORCE_HEAD_REVISION=1\n"
                     "python build/gyp_chromium -G output_dir=_path_\n"))
 
 
 if __name__ == '__main__':
   unittest.main()