Merge lp:~henninge/launchpad/bug-446160 into lp:launchpad

[Henning Eggers]

[Henning Eggers (henninge)]

= Details =
See bug 446160

This branch fixes the bug by checking the state of an entry before setting it to approved.

== Tests ==
bin/test -vvct TranslationBranchApprover

== Demo/QA ==
1. Push a branch with a translation template file to a project on LP.
2. Select that branch as series branch and request a one-time import.
3. Wait for the file to appear in the queue. It should be "Approved". No need for it to wait for it to become "Imported".
4. Set the file to "Deleted" or "Blocked".
5. Change the file and push the branch again.
6. Request another one-time import.
7. The date on the queue entry will change but the state should not change to "Approved" again but remain "Deleted" or "Blocked", as selected in step 4.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/translations/model/translationbranchapprover.py
  lib/lp/translations/tests/test_translationbranchapprover.py

[Jeroen T. Vermeulen (jtv)]

Discussed on IRC. Looks fine, apart from a missing word in a comment and the naming of the test function.

review: Approve (code)

=== modified file 'lib/lp/translations/model/translationbranchapprover.py'
--- lib/lp/translations/model/translationbranchapprover.py	2009-08-06 15:14:02 +0000
+++ lib/lp/translations/model/translationbranchapprover.py	2009-10-20 09:59:13 +0000
@@ -164,6 +164,7 @@
 
         # Approve the entry
         entry.potemplate = potemplate
-        entry.setStatus(RosettaImportStatus.APPROVED)
+        if entry.status == RosettaImportStatus.NEEDS_REVIEW:
+            entry.setStatus(RosettaImportStatus.APPROVED)
         return entry
 

=== modified file 'lib/lp/translations/tests/test_translationbranchapprover.py'
--- lib/lp/translations/tests/test_translationbranchapprover.py	2009-08-06 15:14:02 +0000
+++ lib/lp/translations/tests/test_translationbranchapprover.py	2009-10-20 09:59:13 +0000
@@ -202,5 +202,22 @@
         approver.approve(entry2)
         self.assertEqual(RosettaImportStatus.NEEDS_REVIEW, entry2.status)
 
+    def test_approve_only_if_needs_review(self):
+        # If an entry is not in NEEDS_REVIEW state, it must not be approved.
+        pot_path = self.factory.getUniqueString()+".pot"
+        entry = self._upload_file(pot_path)
+        not_approve_status = (
+            RosettaImportStatus.IMPORTED,
+            RosettaImportStatus.DELETED,
+            RosettaImportStatus.FAILED,
+            RosettaImportStatus.BLOCKED,
+            )
+        for status in not_approve_status:
+            entry.setStatus(status)
+            approver = self._create_approver(pot_path)
+            approver.approve(entry)
+            self.assertEqual(status, entry.status)
+
 def test_suite():
     return TestLoader().loadTestsFromName(__name__)
+