Suppress error handling for test coverage in push and merge scripts.

tools/push-to-trunk/auto_roll.py

 #!/usr/bin/env python
 # Copyright 2013 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
@@ skipping 64 matching lines @@
     if re.search(r"nopush|no push", self["tree_message"], flags=re.I):
       self.Die("Push to trunk disabled by tree state: %s"
                % self["tree_message"])
 
 
 class FetchLatestRevision(Step):
   MESSAGE = "Fetching latest V8 revision."
 
   def RunStep(self):
     match = re.match(r"^r(\d+) ", self.GitSVNLog())
-    if not match:
+    if not match:  # pragma: no cover
       self.Die("Could not extract current svn revision from log.")
     self["latest"] = match.group(1)
 
 
 class CheckLastPush(Step):
   MESSAGE = "Checking last V8 push to trunk."
 
   def RunStep(self):
     last_push_hash = self.FindLastTrunkPush()
     last_push = int(self.GitSVNFindSVNRev(last_push_hash))
 
     # TODO(machenbach): This metric counts all revisions. It could be
     # improved by counting only the revisions on bleeding_edge.
-    if int(self["latest"]) - last_push < 10:
+    if int(self["latest"]) - last_push < 10:  # pragma: no cover
       # This makes sure the script doesn't push twice in a row when the cron
       # job retries several times.
       self.Die("Last push too recently: %d" % last_push)
 
 
 class FetchLKGR(Step):
   MESSAGE = "Fetching V8 LKGR."
 
   def RunStep(self):
     lkgr_url = "https://v8-status.appspot.com/lkgr"
@@ skipping 21 matching lines @@
   def RunStep(self):
     latest = int(self["latest"])
     lkgr = int(self["lkgr"])
     if latest == lkgr:
       print "ToT (r%d) is clean. Pushing to trunk." % latest
       self.PushTreeStatus("Tree is closed (preparing to push)")
 
       # TODO(machenbach): Update the script before calling it.
       try:
         if self._options.push:
+          P = push_to_trunk.PushToTrunk
           self._side_effect_handler.Call(
-              PushToTrunk(push_to_trunk.CONFIG, self._side_effect_handler).Run,
+              P(push_to_trunk.CONFIG, self._side_effect_handler).Run,
               ["-a", self._options.author,
                "-c", self._options.chromium,
                "-r", self._options.reviewer,
                "-f"])
       finally:
         self.PushTreeStatus(self["tree_message"])
     else:
       print("ToT (r%d) is ahead of the LKGR (r%d). Skipping push to trunk."
             % (latest, lkgr))
 
 
 class AutoRoll(ScriptsBase):
   def _PrepareOptions(self, parser):
     parser.add_argument("-c", "--chromium", required=True,
                         help=("The path to your Chromium src/ "
                               "directory to automate the V8 roll."))
     parser.add_argument("-p", "--push",
                         help="Push to trunk. Dry run if unspecified.",
                         default=False, action="store_true")
     parser.add_argument("--status-password",
                         help="A file with the password to the status app.")
 
   def _ProcessOptions(self, options):
-    if not options.author or not options.reviewer:
+    if not options.author or not options.reviewer:  # pragma: no cover
       print "You need to specify author and reviewer."
       return False
     options.requires_editor = False
     return True
 
   def _Steps(self):
     return [
       Preparation,
       CheckAutoRollSettings,
       CheckTreeStatus,
       FetchLatestRevision,
       CheckLastPush,
       FetchLKGR,
       PushToTrunk,
     ]
 
 
-if __name__ == "__main__":
+if __name__ == "__main__":  # pragma: no cover
   sys.exit(AutoRoll(CONFIG).Run())