diff options
| author | David James <davidjames@google.com> | 2014-10-23 15:22:17 -0700 |
|---|---|---|
| committer | David James <davidjames@chromium.org> | 2014-10-23 23:12:09 +0000 |
| commit | bdfbdc5d2d66de874878dd125914ed2a0baa089b (patch) | |
| tree | 91ae282e3ed2f80f5d92df083cd849626ad90c26 /cbuildbot/cbuildbot_config_unittest.py | |
| parent | 3c5f0aa9fb63c98c27e6de458f38004806b0af44 (diff) | |
| download | chromite-bdfbdc5d2d66de874878dd125914ed2a0baa089b.tar.gz | |
Show defaults separately in config_dump.json.
BUG=none
TEST=Try it.
Change-Id: If44ca5d2907bd55c9c7d566e237cb973a8d65c0b
Reviewed-on: https://chromium-review.googlesource.com/225255
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>
Diffstat (limited to 'cbuildbot/cbuildbot_config_unittest.py')
| -rwxr-xr-x | cbuildbot/cbuildbot_config_unittest.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cbuildbot/cbuildbot_config_unittest.py b/cbuildbot/cbuildbot_config_unittest.py index c46ba497a..f641492e4 100755 --- a/cbuildbot/cbuildbot_config_unittest.py +++ b/cbuildbot/cbuildbot_config_unittest.py @@ -30,7 +30,7 @@ class ConfigDumpTest(cros_test_lib.TestCase): def testDump(self): """Make sure the json & config are kept in sync""" cmd = [os.path.join(constants.CHROMITE_BIN_DIR, 'cbuildbot_view_config'), - '-d', '--pretty'] + '-d', '-s', '--pretty'] dump_file_path = os.path.join(constants.CHROMITE_DIR, 'cbuildbot', 'config_dump.json') new_dump = cros_build_lib.RunCommand(cmd, capture_output=True).output @@ -38,7 +38,7 @@ class ConfigDumpTest(cros_test_lib.TestCase): self.assertTrue( new_dump == old_dump, 'config_dump.json does not match the ' 'configs defined in cbuildbot_config.py. Run ' - 'bin/cbuildbot_view_config -d --pretty > cbuildbot/config_dump.json') + 'bin/cbuildbot_view_config -d -s --pretty > cbuildbot/config_dump.json') class ConfigPickleTest(cros_test_lib.TestCase): @@ -72,8 +72,7 @@ class CBuildBotTest(cros_test_lib.MoxTestCase): This checks for mispelled keys, or keys that are somehow removed. """ - # pylint: disable=W0212 - expected_keys = set(cbuildbot_config._default.keys()) + expected_keys = set(cbuildbot_config.default.keys()) for build_name, config in cbuildbot_config.config.iteritems(): config_keys = set(config.keys()) |