Enable all Android builders to use 'chrome_with_codecs'.

tools/mb/mb_unittest.py

 #!/usr/bin/python
 # Copyright 2015 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.
 
 """Tests for mb.py."""
 
 import json
 import StringIO
 import os
@@ skipping 95 matching lines @@
   'common_dev_configs': ['gn_debug'],
   'configs': {
     'gyp_rel_bot': ['gyp', 'rel', 'goma'],
     'gn_debug': ['gn', 'debug', 'goma'],
     'gyp_debug': ['gyp', 'debug'],
     'gn_rel_bot': ['gn', 'rel', 'goma'],
     'private': ['gyp', 'rel', 'fake_feature1'],
     'unsupported': ['gn', 'fake_feature2'],
   },
   'masters': {
+    'chromium': {},
     'fake_master': {
       'fake_builder': 'gyp_rel_bot',
       'fake_gn_builder': 'gn_rel_bot',
       'fake_gyp_builder': 'gyp_debug',
     },
   },
   'mixins': {
     'fake_feature1': {
       'gn_args': 'enable_doom_melon=true',
       'gyp_crosscompile': True,
@@ skipping 15 matching lines @@
     'debug': {
       'gn_args': 'is_debug=true',
     },
   },
   'private_configs': ['private'],
   'unsupported_configs': ['unsupported'],
 }
 """
 
 
+TEST_BAD_CONFIG = """\
+{
+  'common_dev_configs': ['gn_rel_bot_1'],
+  'configs': {
+    'gn_rel_bot_1': ['gn', 'rel', 'chrome_with_codecs'],
+    'gn_rel_bot_2': ['gn', 'rel', 'bad_nested_config'],
+  },
+  'masters': {
+    'chromium': {
+      'a': 'gn_rel_bot_1',
+      'b': 'gn_rel_bot_2',
+    },
+  },
+  'mixins': {
+    'gn': {'type': 'gn'},
+    'chrome_with_codecs': {
+      'gn_args': 'proprietary_codecs=true',
+    },
+    'bad_nested_config': {
+      'mixins': ['chrome_with_codecs'],
+    },
+    'rel': {
+      'gn_args': 'is_debug=false',
+    },
+  },
+  'private_configs': ['private'],
+  'unsupported_configs': ['unsupported'],
+}
+"""
+
+
+TEST_BAD_CONFIG_ERR = """\
+mb config file /fake_src/tools/mb/mb_config.pyl has problems:
+  Config "gn_rel_bot_1" used by a bot is also listed in "common_dev_configs".
+  Unknown config "unsupported" referenced from "unsupported_configs".
+  Unknown config "private" referenced from "private_configs".
+  Public artifact builder "a" can not contain the "chrome_with_codecs" mixin.
+  Public artifact builder "b" can not contain the "chrome_with_codecs" mixin."""
+
+
 class UnitTest(unittest.TestCase):
   def fake_mbw(self, files=None, win32=False):
     mbw = FakeMBW(win32=win32)
     mbw.files.setdefault(mbw.default_config, TEST_CONFIG)
     if files:
       for path, contents in files.items():
         mbw.files[path] = contents
     return mbw
 
-  def check(self, args, mbw=None, files=None, out=None, err=None, ret=None):
+  def check(self, args, mbw=None, files=None, out=None, err=None, ret=None,
+            exception=None):
     if not mbw:
       mbw = self.fake_mbw(files)
     mbw.ParseArgs(args)
-    actual_ret = mbw.args.func()
-    if ret is not None:
-      self.assertEqual(actual_ret, ret)
+
+    actual_ret = None
+    if exception is not None:
+      self.assertRaisesRegexp(Exception, exception, mbw.args.func)
+    else:
+      actual_ret = mbw.args.func()
+
+    self.assertEqual(actual_ret, ret)
     if out is not None:
       self.assertEqual(mbw.out, out)
     if err is not None:
       self.assertEqual(mbw.err, err)
     return mbw
 
   def test_clobber(self):
     files = {
       '/fake_src/out/Debug': None,
       '/fake_src/out/Debug/mb_type': None,
@@ skipping 179 matching lines @@
                     "goma_dir=\"/foo\"'\n" ))
 
   def test_gyp_analyze(self):
     mbw = self.check(['analyze', '-c', 'gyp_rel_bot', '//out/Release',
                      '/tmp/in.json', '/tmp/out.json'],
                      ret=0)
     self.assertIn('analyzer', mbw.calls[0])
 
   def test_gyp_crosscompile(self):
     mbw = self.fake_mbw()
-    self.check(['gen', '-c', 'private', '//out/Release'], mbw=mbw)
+    self.check(['gen', '-c', 'private', '//out/Release'], mbw=mbw, ret=0)
     self.assertTrue(mbw.cross_compile)
 
   def test_gyp_gen(self):
     self.check(['gen', '-c', 'gyp_rel_bot', '-g', '/goma', '//out/Release'],
                ret=0,
                out=("GYP_DEFINES='goma=1 gomadir=/goma'\n"
                     "python build/gyp_chromium -G output_dir=out\n"))
 
     mbw = self.fake_mbw(win32=True)
     self.check(['gen', '-c', 'gyp_rel_bot', '-g', 'c:\\goma', '//out/Release'],
@@ skipping 14 matching lines @@
   def test_help(self):
     orig_stdout = sys.stdout
     try:
       sys.stdout = StringIO.StringIO()
       self.assertRaises(SystemExit, self.check, ['-h'])
       self.assertRaises(SystemExit, self.check, ['help'])
       self.assertRaises(SystemExit, self.check, ['help', 'gen'])
     finally:
       sys.stdout = orig_stdout
 
-
   def test_validate(self):
     self.check(['validate'], ret=0)
 
+  def test_bad_validate(self):
+    mbw = self.fake_mbw()
+    mbw.files[mbw.default_config] = TEST_BAD_CONFIG
+    self.check(['validate'], mbw=mbw, exception=TEST_BAD_CONFIG_ERR)
+
 
 if __name__ == '__main__':
   unittest.main()