diff options
| author | Don Garrett <dgarrett@google.com> | 2015-07-24 15:43:20 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-07-28 21:31:51 +0000 |
| commit | 35aa0fdf9f3a6458cf9525bc48dcbfc40471a60a (patch) | |
| tree | f9bc83f6bf356954e93274f55cd566eb33757737 | |
| parent | df80c23dfaf3493d7fe559ffc56edb141f6a837b (diff) | |
| download | chromite-35aa0fdf9f3a6458cf9525bc48dcbfc40471a60a.tar.gz | |
tree_status.ConstructDashboardURL: Fix un-updated callers.
When changing the signature of this method, I missed a couple of
callers. It was producing invalid URLs as a result. Fix up those
callers.
BUG=chromium:513788
TEST=Unittests
Change-Id: Ieda110d66c4493f404c4f73b8854e1438475d13b
Reviewed-on: https://chromium-review.googlesource.com/288374
Trybot-Ready: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Matthew Sartori <msartori@chromium.org>
Reviewed-by: Paul Hobbs <phobbs@google.com>
Commit-Queue: Don Garrett <dgarrett@chromium.org>
| -rw-r--r-- | cbuildbot/stages/report_stages.py | 5 | ||||
| -rw-r--r-- | cbuildbot/validation_pool.py | 3 | ||||
| -rw-r--r-- | cbuildbot/validation_pool_unittest.py | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/cbuildbot/stages/report_stages.py b/cbuildbot/stages/report_stages.py index abc5f4370..f7e7a0489 100644 --- a/cbuildbot/stages/report_stages.py +++ b/cbuildbot/stages/report_stages.py @@ -169,8 +169,11 @@ class BuildStartStage(generic_stages.BuilderStage): master_build_id = d['master_build_id'] if master_build_id is not None: master_build_status = db.GetBuildStatus(master_build_id) + master_waterfall_url = constants.WATERFALL_TO_DASHBOARD[ + master_build_status['waterfall']] + master_url = tree_status.ConstructDashboardURL( - master_build_status['waterfall'], + master_waterfall_url, master_build_status['builder_name'], master_build_status['build_number']) logging.PrintBuildbotLink('Link to master build', master_url) diff --git a/cbuildbot/validation_pool.py b/cbuildbot/validation_pool.py index e66fc17b0..97b304d37 100644 --- a/cbuildbot/validation_pool.py +++ b/cbuildbot/validation_pool.py @@ -1150,9 +1150,8 @@ class ValidationPool(object): @property def build_log(self): if self._run: - waterfall = self._run.attrs.metadata.GetValue('buildbot-master-name') return tree_status.ConstructDashboardURL( - waterfall, self._builder_name, self._build_number) + self._run.GetBuildbotUrl(), self._builder_name, self._build_number) @staticmethod def GetGerritHelpersForOverlays(overlays): diff --git a/cbuildbot/validation_pool_unittest.py b/cbuildbot/validation_pool_unittest.py index 28edd3831..036ffe195 100644 --- a/cbuildbot/validation_pool_unittest.py +++ b/cbuildbot/validation_pool_unittest.py @@ -83,6 +83,7 @@ class FakeBuilderRun(object): metadata_dict=metadata_dict)) FakeConfig = collections.namedtuple('FakeConfig', ['name']) self.config = FakeConfig(name='master-paladin') + self.GetBuildbotUrl = lambda: constants.WATERFALL_INTERNAL def GetCIDBHandle(self): """Get the build_id and cidb handle, if available. |