Merge lp:~mars/tarmac/fix-needs-review-api-call into lp:~launchpad/tarmac/lp-tarmac

[Māris Fogels]

Fix the bundle-merge command's ability to set the 'Needs review' MP status.

This branch fixes a bug in the tarmac merge command that incorrectly sets the "Needs review" proposal status through the API.

[Māris Fogels (mars)]

review: Approve

=== modified file 'docs/introduction.txt'
--- docs/introduction.txt	2010-10-26 00:59:55 +0000
+++ docs/introduction.txt	2010-12-16 04:03:56 +0000
@@ -151,7 +151,7 @@
 The Command plugin takes the merged tree result and runs a command on that
 tree.  If the command fails, then it raises an exception that causes the merge
 to be abandoned, a comment on the merge proposal to be added, and the merge
-proposal set to "Needs Review" (so that Tarmac doesn't try to merge it in the
+proposal set to "Needs review" (so that Tarmac doesn't try to merge it in the
 next run).  This command can be a script that runs tests, verifies certain
 files aren't changed, a script that verifies a proper build, etc.  In order to
 use the Command plugin, your branch must have a ``verify_command`` option in

=== modified file 'docs/writingplugins.txt'
--- docs/writingplugins.txt	2010-09-17 21:57:28 +0000
+++ docs/writingplugins.txt	2010-12-16 04:03:56 +0000
@@ -105,7 +105,7 @@
 typically a longer message describing the issue in more detail. This comment
 will be posted to the merge proposal on Launchpad, to inform the developer
 of what went wrong during the merge of their branch. The merge proposal will
-also be set back to the ``Needs Review`` status, to avoid having tarmac
+also be set back to the ``Needs review`` status, to avoid having tarmac
 attempt to merge the branch again, without having the issues resolved. If
 no ``comment`` argument is supplied, the ``message`` argument will be used
 for the comment when posting to Launchpad, instead.

=== modified file 'tarmac/plugins/bundlecommand.py'
--- tarmac/plugins/bundlecommand.py	2010-12-14 14:44:33 +0000
+++ tarmac/plugins/bundlecommand.py	2010-12-16 04:03:56 +0000
@@ -186,7 +186,7 @@
 
         In this case, the full failure is emailed to the proposal subscribers,
         a summary of the test failure is posted as a comment and the
-        proposal is then set to "Needs Review" so that Tarmac doesn't attempt
+        proposal is then set to "Needs review" so that Tarmac doesn't attempt
         to merge it again without human interaction.
         '''
         # Make output into a Result object, and create a tgz of the
@@ -241,7 +241,7 @@
 
         proposal.createComment(subject=subject,
                                content=comment)
-        proposal.setStatus(status=u'Needs Review')
+        proposal.setStatus(status=u'Needs review')
         proposal.lp_save()
 
     def get_subscribers_emails(self, proposal):

=== modified file 'tarmac/plugins/tests/test_bundlecommand.py'
--- tarmac/plugins/tests/test_bundlecommand.py	2010-12-14 14:44:33 +0000
+++ tarmac/plugins/tests/test_bundlecommand.py	2010-12-16 04:03:56 +0000
@@ -261,8 +261,8 @@
 
         # Proposals status is updated.
         proposal1, proposal2 = self.collected_proposals
-        self.assertEqual(proposal1[1].queue_status, "Needs Review")
-        self.assertEqual(proposal2[1].queue_status, "Needs Review")
+        self.assertEqual(proposal1[1].queue_status, "Needs review")
+        self.assertEqual(proposal2[1].queue_status, "Needs review")
 
     def test_send_report_email(self):
         """Test send_report_email()."""

=== modified file 'tarmac/tests/__init__.py'
--- tarmac/tests/__init__.py	2010-11-23 17:18:33 +0000
+++ tarmac/tests/__init__.py	2010-12-16 04:03:56 +0000
@@ -132,7 +132,7 @@
 
         self.proposals = [Thing(
                 self_link=u'http://api.edge.launchpad.net/devel/proposal0',
-                queue_status=u'Needs Review',
+                queue_status=u'Needs review',
                 commit_message=u'Commitable.',
                 source_branch=self.branches[0],
                 target_branch=self.branches[1],

=== modified file 'tarmac/tests/mock.py'
--- tarmac/tests/mock.py	2010-12-14 14:44:33 +0000
+++ tarmac/tests/mock.py	2010-12-16 04:03:56 +0000
@@ -71,7 +71,7 @@
     def lp_save(self, *args, **kwargs):
         pass
 
-    def setStatus(self, status="Needs Review"):
+    def setStatus(self, status="Needs review"):
         self.queue_status = status
 
 

=== modified file 'tarmac/tests/test_commands.py'
--- tarmac/tests/test_commands.py	2010-12-15 16:52:26 +0000
+++ tarmac/tests/test_commands.py	2010-12-16 04:03:56 +0000
@@ -176,7 +176,7 @@
         # Set up an unapproved proposal for the prerequisite
         b3_proposal = Thing(
             self_link=u'http://api.edge.launchpad.net/devel/proposal3',
-            queue_status=u'Work in Progress',
+            queue_status=u'Work in progress',
             commit_message=u'Commitable.',
             source_branch=branch3.lp_branch,
             target_branch=self.branches[1],
@@ -218,7 +218,7 @@
         # Set up an unapproved proposal for the prerequisite
         b3_proposal = Thing(
             self_link=u'http://api.edge.launchpad.net/devel/proposal3',
-            queue_status=u'Work in Progress',
+            queue_status=u'Work in progress',
             commit_message=u'Commitable.',
             source_branch=branch3.lp_branch,
             target_branch=self.branches[1],
@@ -260,7 +260,7 @@
         # Set up an unapproved proposal for the prerequisite
         b3_proposal = Thing(
             self_link=u'http://api.edge.launchpad.net/devel/proposal3',
-            queue_status=u'Work in Progress',
+            queue_status=u'Work in progress',
             commit_message=u'Commitable.',
             source_branch=branch3.lp_branch,
             target_branch=self.branches[1],
@@ -277,7 +277,7 @@
             b3_proposal,
             Thing(
                 target_branch=self.branches[1],
-                queue_status='Needs Review')]
+                queue_status='Needs review')]
 
         self.proposals.append(b3_proposal)
         self.proposals[1].prerequisite_branch = branch3.lp_branch