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 265 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)
 
 
+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 UnitTest2(unittest.TestCase):
+  def fake_mbw(self, files=None, win32=False):
+    mbw = FakeMBW(win32=win32)
+    mbw.files.setdefault(mbw.default_config, TEST_BAD_CONFIG)
+    if files:
+      for path, contents in files.items():
+        mbw.files[path] = contents
+    return mbw
+
+  def test_validate(self):
+    mbw = self.fake_mbw()

[Dirk Pranke, 2016/03/09 19:47:07]

This is, I think, somewhat more complicated than it needs to be. Can't you just
move this whole test_validate() function into the regular UnitTest class and
rewrite it as:

  def test_validate(self):
    mbw = self.fake_mbw()
    mbw.files[mbw.default_config] = TEST_BAD_CONFIG
    mbw.ParseArgs(['validate'])
    self.check(['validate'], ret=1, mbw=mbw, out=TES_BAD_CONFIG_ERR) 

?

[DaleCurtis, 2016/03/09 21:36:27]

Whoops, yeah it was late when I wrote the other code is my excuse :) It didn't
work quite as you wrote since when mb raises MBErr the prints to stderr, stdout
never happen. So I extended check() to support exceptions.

+    mbw.ParseArgs(['validate'])
+    self.assertRaisesRegexp(Exception, TEST_BAD_CONFIG_ERR, mbw.args.func)
+
+
 if __name__ == '__main__':
   unittest.main()