Revert of MB: Run test with gtest-parallel on swarming.

tools/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 329 matching lines @@
         'import("//build/args/bots/fake_master/fake_gn_args_bot.gn")\n')
 
 
   def test_gn_gen_fails(self):
     mbw = self.fake_mbw()
     mbw.Call = lambda cmd, env=None, buffer_output=True: (1, '', '')
     self.check(['gen', '-c', 'gn_debug_goma', '//out/Default'], mbw=mbw, ret=1)
 
   def test_gn_gen_swarming(self):
     files = {
+      '/tmp/swarming_targets': 'base_unittests\n',
+      '/fake_src/testing/buildbot/gn_isolate_map.pyl': (
+          "{'base_unittests': {"
+          "  'label': '//base:base_unittests',"
+          "  'type': 'raw',"
+          "  'args': [],"
+          "}}\n"
+      ),
+      '/fake_src/out/Default/base_unittests.runtime_deps': (
+          "base_unittests\n"
+      ),
+    }
+    mbw = self.fake_mbw(files)
+    self.check(['gen',
+                '-c', 'gn_debug_goma',
+                '--swarming-targets-file', '/tmp/swarming_targets',
+                '//out/Default'], mbw=mbw, ret=0)
+    self.assertIn('/fake_src/out/Default/base_unittests.isolate',
+                  mbw.files)
+    self.assertIn('/fake_src/out/Default/base_unittests.isolated.gen.json',
+                  mbw.files)
+
+  def test_gn_gen_swarming_script(self):
+    files = {
       '/tmp/swarming_targets': 'cc_perftests\n',
       '/fake_src/testing/buildbot/gn_isolate_map.pyl': (
           "{'cc_perftests': {"
           "  'label': '//cc:cc_perftests',"
-          "  'type': 'console_test_launcher',"
+          "  'type': 'script',"
+          "  'script': '/fake_src/out/Default/test_script.py',"
+          "  'args': [],"
           "}}\n"
       ),
       'c:\\fake_src\out\Default\cc_perftests.exe.runtime_deps': (
           "cc_perftests\n"
       ),
     }
     mbw = self.fake_mbw(files=files, win32=True)
     self.check(['gen',
                 '-c', 'gn_debug_goma',
                 '--swarming-targets-file', '/tmp/swarming_targets',
                 '--isolate-map-file',
                 '/fake_src/testing/buildbot/gn_isolate_map.pyl',
                 '//out/Default'], mbw=mbw, ret=0)
     self.assertIn('c:\\fake_src\\out\\Default\\cc_perftests.isolate',
                   mbw.files)
     self.assertIn('c:\\fake_src\\out\\Default\\cc_perftests.isolated.gen.json',
                   mbw.files)
 
 
   def test_gn_isolate(self):
     files = {
       '/fake_src/out/Default/toolchain.ninja': "",
       '/fake_src/testing/buildbot/gn_isolate_map.pyl': (
           "{'base_unittests': {"
           "  'label': '//base:base_unittests',"
-          "  'type': 'non_parallel_console_test_launcher',"
+          "  'type': 'raw',"
           "  'args': [],"
           "}}\n"
       ),
       '/fake_src/out/Default/base_unittests.runtime_deps': (
           "base_unittests\n"
       ),
     }
     self.check(['isolate', '-c', 'gn_debug_goma', '//out/Default',
                 'base_unittests'], files=files, ret=0)
 
     # test running isolate on an existing build_dir
     files['/fake_src/out/Default/args.gn'] = 'is_debug = True\n'
     self.check(['isolate', '//out/Default', 'base_unittests'],
                files=files, ret=0)
 
     files['/fake_src/out/Default/mb_type'] = 'gn\n'
     self.check(['isolate', '//out/Default', 'base_unittests'],
                files=files, ret=0)
 
   def test_gn_run(self):
     files = {
       '/fake_src/testing/buildbot/gn_isolate_map.pyl': (
           "{'base_unittests': {"
           "  'label': '//base:base_unittests',"
-          "  'type': 'windowed_test_launcher',"
+          "  'type': 'raw',"
           "  'args': [],"
           "}}\n"
       ),
       '/fake_src/out/Default/base_unittests.runtime_deps': (
           "base_unittests\n"
       ),
     }
     self.check(['run', '-c', 'gn_debug_goma', '//out/Default',
                 'base_unittests'], files=files, ret=0)
 
@@ skipping 116 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()