ActiveMaster in AnnotationObserver

scripts/master/chromium_step.py

 # Copyright (c) 2012 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.
 
 """Subclasses of various slave command classes."""
 
 from datetime import datetime
 import copy
 import errno
 import json
@@ skipping 607 matching lines @@
     },
     'Debug': {
       'chromium-dbg-linux': 'linux-debug',
       'chromium-dbg-win': 'win-debug',
       'chromium-dbg-mac': 'mac-debug',
       'chromium-dbg-xp': 'xp-debug',
       'chromium-dbg-linux-try': 'linux-try-debug',
     },
   }
   def __init__(self, command=None, show_perf=False, perf_id=None,
-               perf_report_url_suffix=None, target=None, *args, **kwargs):
+               perf_report_url_suffix=None, target=None, active_master=None,
+               *args, **kwargs):
     buildstep.LogLineObserver.__init__(self, *args, **kwargs)
     self.command = command
     self.sections = []
     self.annotate_status = builder.SUCCESS
     self.halt_on_failure = False
     self.honor_zero_return_code = False
     self.cursor = None
 
     self.show_perf = show_perf
     self.perf_id = perf_id
     self.perf_report_url_suffix = perf_report_url_suffix
     self.target = target
+    self.active_master = active_master
 
   def initialSection(self):
     """Initializes the annotator's sections.
 
     Annotator uses a list of dictionaries which hold information stuch as status
     and logs for each added step. This method populates the section list with an
     entry referencing the original buildbot step."""
     if self.sections:
       return
     # Add a log section for output before the first section heading.
@@ skipping 717 matching lines @@
                                     'closed')
 
     step_deferreds = [s['step'].waitUntilFinished()
                       for s in sections_to_wait]
     return defer.DeferredList(step_deferreds)
 
 
 class AnnotatedCommand(ProcessLogShellStep):
   """Buildbot command that knows how to display annotations."""
 
-  def __init__(self, target=None, *args, **kwargs):
+  def __init__(self, target=None, active_master=None, *args, **kwargs):
+    self.active_master = active_master
     clobber = ''
     perf_id = None
     perf_report_url_suffix = None
     show_perf = None
     if 'factory_properties' in kwargs:
       if kwargs['factory_properties'].get('clobber'):
         clobber = '1'
       perf_id = kwargs['factory_properties'].get('perf_id')
       perf_report_url_suffix = kwargs['factory_properties'].get(
           'perf_report_url_suffix')
@@ skipping 19 matching lines @@
     }
     # Apply the passed in environment on top.
     old_env = kwargs.get('env') or {}
     env.update(old_env)
     # Change passed in args (ok as a copy is made internally).
     kwargs['env'] = env
 
     ProcessLogShellStep.__init__(self, *args, **kwargs)
     self.script_observer = AnnotationObserver(
         self, show_perf=show_perf, perf_id=perf_id,
-        perf_report_url_suffix=perf_report_url_suffix, target=target)
+        perf_report_url_suffix=perf_report_url_suffix, target=target,
+        active_master=active_master)
     self.addLogObserver('stdio', self.script_observer)
 
   def describe(self, done=False):
     if self.step_status and self.step_status.isStarted():
       observer_text = self.script_observer.describe()
     else:
       observer_text = []
     if observer_text:
       return observer_text
     else:
@@ skipping 35 matching lines @@
       and starts to wait for remaining steps to finish. Returns command_result
       as Deferred."""
       self.scriptComplete(command_result)
       steps_d = self.script_observer.waitForSteps()
       # Ignore the waitForSteps' result and return the original result,
       # so the caller of runCommand receives command_result.
       steps_d.addCallback(lambda *_: command_result)
       return steps_d
     d.addCallback(onCommandFinished)
     return d