launchpad-reviewers team mailing list archive

[Deryck Hodge <deryck.hodge@xxxxxxxxxxxxx>]

Deryck Hodge has proposed merging lp:~deryck/launchpad/disable-poppy-file-writer-close-798957 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #798957 in Launchpad itself: "PPA Uploads are seemingly (but not actually) rejected"
  https://bugs.launchpad.net/launchpad/+bug/798957

For more details, see:
https://code.launchpad.net/~deryck/launchpad/disable-poppy-file-writer-close-798957/+merge/90276

Disable PoppyFileWriter.close to back out change on poppy.
-- 
https://code.launchpad.net/~deryck/launchpad/disable-poppy-file-writer-close-798957/+merge/90276
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~deryck/launchpad/disable-poppy-file-writer-close-798957 into lp:launchpad.

=== modified file 'lib/lp/poppy/tests/test_poppy.py'
--- lib/lp/poppy/tests/test_poppy.py	2012-01-01 02:58:52 +0000
+++ lib/lp/poppy/tests/test_poppy.py	2012-01-26 15:39:26 +0000
@@ -371,7 +371,9 @@
                 self.root_dir, upload_dirs[index], "test")).read()
             self.assertEqual(content, expected_contents[index])
 
-    def test_bad_gpg_on_changesfile(self):
+    # XXX: deryck, 2012-01-26, Bug 798957
+    # PoppyFileWriter.close has been disabled, so disable test, too.
+    def disabled_test_bad_gpg_on_changesfile(self):
         """Check that we get a rejection error when uploading .changes files
         with invalid GPG signatures.
         """

=== modified file 'lib/lp/poppy/twistedftp.py'
--- lib/lp/poppy/twistedftp.py	2012-01-01 02:58:52 +0000
+++ lib/lp/poppy/twistedftp.py	2012-01-26 15:39:26 +0000
@@ -154,7 +154,9 @@
 class PoppyFileWriter(ftp._FileWriter):
     """An `IWriteFile` that checks for signed changes files."""
 
-    def close(self):
+    # XXX: deryck, 2012-01-26, Bug 798957
+    # Disable close as we search for a better fix to bug.
+    def disabled_close(self):
         """Called after the file has been completely downloaded."""
         if self.fObj.name.endswith(".changes"):
             error = self.validateGPG(self.fObj.name)