Merge lp:~deryck/launchpad/disable-poppy-file-writer-close-798957 into lp:launchpad

[Deryck Hodge]

[r=julian-edwards][bug=798957][incr] Disable GPG checks on poppy uploads as they are not reliable.

Disable PoppyFileWriter.close to back out change on poppy.

[Julian Edwards (julian-edwards)]

Thanks for doing this Deryck.

25 + # Disable close as we search for a better fix to bug.

I'd say:
# Disable close() as ....

otherwise it took a couple of reads to see what you meant :)

review: Approve

=== 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-30 20:12:34 +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/tests/test_twistedftp.py'
--- lib/lp/poppy/tests/test_twistedftp.py	2012-01-01 02:58:52 +0000
+++ lib/lp/poppy/tests/test_twistedftp.py	2012-01-30 20:12:34 +0000
@@ -76,7 +76,9 @@
             d.addBoth(callback)
             return d
 
-    def test_changes_file_with_invalid_GPG(self):
+    # XXX: deryck, 2012-01-26, Bug 798957
+    # Disable as we search for a better fix to bug.
+    def disabled_test_changes_file_with_invalid_GPG(self):
         invalid_changes_file = os.path.join(
             self.test_files_dir, "broken_source.changes")
 

=== 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-30 20:12:34 +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)