Issue 3681 - Add suport for "Fixes XXXX - ..." commit messages

sitescripts/hg/test/update_issues.py

 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2016 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ skipping 38 matching lines @@
     """Base class for hook tests that prepares the environment."""
 
     def _patchWith(self, target, return_value):
         patcher = mock.patch(target, return_value=return_value)
         patcher.start()
         self.addCleanup(patcher.stop)
 
     def _create_mock_milestone_multicall(self):
         ret = []
         multicall = mock.Mock(return_value=ret)
-        multicall.ticket.milestone.get = lambda id: ret.append(MILESTONES[id])
+        multicall.ticket.milestone.get = lambda i: ret.append(MILESTONES[i])
         return multicall
 
     def _mock_trac(self):
         trac = mock.Mock()
-        trac.ticket.get = lambda id: [id, mock.ANY, mock.ANY,
-                                      ISSUES[id]['attrs']]
-        trac.ticket.getActions = lambda id: ISSUES[id]['actions']
+        trac.ticket.get = lambda i: [i, mock.ANY, mock.ANY, ISSUES[i]['attrs']]
+        trac.ticket.getActions = lambda i: ISSUES[i]['actions']
         trac.ticket.milestone.getAll = lambda: MILESTONES.keys()
         self.trac_proxy_mock = trac
         self._patchWith('xmlrpclib.ServerProxy', trac)
         self._patchWith('xmlrpclib.MultiCall',
                         self._create_mock_milestone_multicall())
 
     def _mock_config(self):
         config = ConfigParser.ConfigParser()
         config.add_section('hg')
         config.set('hg', 'trac_xmlrpc_url', 'foo')
@@ skipping 18 matching lines @@
             mock_commit.rev.return_value = i
             mock_commit.hex.return_value = '{:010x}'.format(i) + '0' * 30
             mock_commit.description.return_value = message
             self.append(mock_commit)
         self.changelog = mock.Mock()
         self.changelog.findmissingrevs = self._findmissingrevs
 
     def _findmissingrevs(self, olds, news):
         return range(olds[0] + 1, news[0] + 1)
 
-    def __getitem__(self, id):
-        if isinstance(id, str):
-            return [commit for commit in self if commit.hex() == id][0]
-        return list.__getitem__(self, id)
+    def __getitem__(self, commit_id):
+        if isinstance(commit_id, str):
+            return [commit for commit in self if commit.hex() == commit_id][0]
+        return list.__getitem__(self, commit_id)
 
     def url(self):
         return 'mock/repo'
 
 
 class TestChangegroupHook(_TestBase):
 
     def _run_hook(self, commit_messages, warning_count=0, update_count=0):
         repo = _MockRepo(commit_messages)
         update_issues.changegroup_hook(self.ui, repo, 0)
@@ skipping 87 matching lines @@
         self._check_update(updates[0], 1337)
         self._check_update(updates[1], 2448, action='leave', milestone='other')
 
     def test_fix_nonexistent(self):
         self._run_hook(['Fixes 7331 - Foo'], warning_count=1)
 
     def test_fix_closed_with_assigned_milestone(self):
         self._run_hook(['fixes 3559 - Foo'])  # No updates.
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     unittest.main()