diff options
| author | Don Garrett <dgarrett@google.com> | 2015-05-28 15:35:32 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-05-29 20:44:06 +0000 |
| commit | 5e4b4caf0a25097074aa7a0ae04395c93a2db910 (patch) | |
| tree | 364bafad49d32d218a640df72ba90c30c6894515 /cbuildbot/cbuildbot_run_unittest.py | |
| parent | 8a83c625c57a1ad990ba8f5f95890b57d204501f (diff) | |
| download | chromite-5e4b4caf0a25097074aa7a0ae04395c93a2db910.tar.gz | |
config_lib: Remove simple cbuildbot_config references.
This CL gets rid of all cbuildbot_config references, other than those
related to GetConfig, and OverrideConfigForTrybot.
It also removes most symbols from cbuildbot_config to prove they
aren't being used.
BUG=chromium:483566
TEST=cbuildbot/run_tests
Change-Id: Id289d1aad190d865cd4c609c5550a64f9dfdd463
Reviewed-on: https://chromium-review.googlesource.com/273913
Trybot-Ready: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org>
Commit-Queue: Don Garrett <dgarrett@chromium.org>
Diffstat (limited to 'cbuildbot/cbuildbot_run_unittest.py')
| -rw-r--r-- | cbuildbot/cbuildbot_run_unittest.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cbuildbot/cbuildbot_run_unittest.py b/cbuildbot/cbuildbot_run_unittest.py index 087e7a825..a08f3c3ad 100644 --- a/cbuildbot/cbuildbot_run_unittest.py +++ b/cbuildbot/cbuildbot_run_unittest.py @@ -13,6 +13,7 @@ import time from chromite.cbuildbot import cbuildbot_config from chromite.cbuildbot import cbuildbot_run +from chromite.cbuildbot import config_lib from chromite.lib import cros_test_lib from chromite.lib import parallel @@ -39,15 +40,15 @@ DEFAULT_OPTIONS = cros_test_lib.EasyAttr( debug=False, postsync_patch=True, ) -DEFAULT_CONFIG = cbuildbot_config.BuildConfig( +DEFAULT_CONFIG = config_lib.BuildConfig( name=DEFAULT_BOT_NAME, master=True, boards=[DEFAULT_BOARD], postsync_patch=True, child_configs=[ - cbuildbot_config.BuildConfig( + config_lib.BuildConfig( name='foo', postsync_patch=False, boards=[]), - cbuildbot_config.BuildConfig( + config_lib.BuildConfig( name='bar', postsync_patch=False, boards=[]), ], ) @@ -66,7 +67,7 @@ def _ExtendDefaultConfig(**kwargs): """Extend DEFAULT_CONFIG with keys/values in kwargs.""" config_kwargs = DEFAULT_CONFIG.copy() config_kwargs.update(kwargs) - return cbuildbot_config.BuildConfig(**config_kwargs) + return config_lib.BuildConfig(**config_kwargs) class ExceptionsTest(cros_test_lib.TestCase): |