Merge lp:~cjwatson/ols-jenkaas/ignore-hidden-votes into lp:~ols-jenkaas-admins/ols-jenkaas/trunk

[Colin Watson]

Ignore hidden votes on merge proposals.

This otherwise greatly confused ols-jenkaas (e.g. https://jenkins.ols.canonical.com/online-services/job/software-center-agent-junit/606/console; I worked around that by unhiding the relevant vote comment on the MP).

[Adam Collard (adam-collard)]

review: Approve

=== modified file 'olsjenkaas/launchpad.py'
--- olsjenkaas/launchpad.py	2017-02-07 13:46:30 +0000
+++ olsjenkaas/launchpad.py	2018-11-13 03:04:20 +0000
@@ -16,6 +16,7 @@
 
 from launchpadlib import (
     credentials,
+    errors,
     launchpad,
 )
 
@@ -87,7 +88,11 @@
         if vote.is_pending:
             votes[u'Pending'] += 1
         else:
-            comment = vote.comment
+            try:
+                comment = vote.comment
+            except errors.NotFound:
+                # Ignore hidden votes
+                continue
             if comment is not None and comment.vote != u'Abstain':
                 votes[comment.vote] += 1
     approved = False