Merge lp:~fginther/cupstream2distro-config/fix_lp1201466 into lp:cupstream2distro-config

[Francis Ginther]

When checking for stalled branches, do not attempt to include branches that don't exist in launchpad.

When checking for stalled branches, do not attempt to include branches that don't exist in launchpad.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:740
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/495/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-saucy-amd64-ci/293/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/cupstream2distro-config-ci/495/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:740
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/496/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-saucy-amd64-ci/294

Click here to trigger a rebuild:
http://s-jenkins:8080/job/cupstream2distro-config-ci/496/rebuild

review: Approve (continuous-integration)

[Chris Gagnon (chris.gagnon)]

LGTM

review: Approve

=== modified file 'c2dconfigutils/cu2dWatchDog.py'
--- c2dconfigutils/cu2dWatchDog.py	2013-04-10 15:57:24 +0000
+++ c2dconfigutils/cu2dWatchDog.py	2013-09-04 19:30:09 +0000
@@ -91,9 +91,11 @@
                     target_branch = 'lp:' + project
                     if parameters and 'target_branch' in parameters:
                         target_branch = parameters['target_branch']
-                    stalled = stalled + self.check_branch(launchpad,
-                                                          target_branch,
-                                                          threshold)
+                    branch_stalled = self.check_branch(launchpad,
+                                                       target_branch,
+                                                       threshold)
+                    if branch_stalled:
+                        stalled = stalled + branch_stalled
         for message in stalled:
             logging.error(message)
         if stalled:

=== modified file 'tests/test_CheckStalledMPs.py'
--- tests/test_CheckStalledMPs.py	2013-04-10 15:48:31 +0000
+++ tests/test_CheckStalledMPs.py	2013-09-04 19:30:09 +0000
@@ -154,6 +154,15 @@
             ret = self.command.process_stacks([1], 120, '')
             self.assertThat(ret, Equals(1))
 
+    def test_process_stacks_no_lp_branch(self):
+        '''Verify that if a branch is not found in lp, it is not stalled.'''
+        load_stack_cfg = lambda x, y: self.stack_cfg
+        self.command.check_branch = lambda x, y, z: None
+        with patch('c2dconfigutils.cu2dWatchDog.load_stack_cfg',
+                   load_stack_cfg):
+            ret = self.command.process_stacks([1], 120, '')
+            self.assertThat(ret, Equals(0))
+
     def test_process_stacks_stackcfg_fails_to_load(self):
         load_stack_cfg = lambda x, y: None
         with patch('c2dconfigutils.cu2dWatchDog.load_stack_cfg',