← Back to team overview

yellow team mailing list archive

[Merge] lp:~frankban/launchpad/bug-980295-soyuz-upload into lp:launchpad

 

Francesco Banconi has proposed merging lp:~frankban/launchpad/bug-980295-soyuz-upload into lp:launchpad.

Requested reviews:
  Launchpad Yellow Squad (yellow)
Related bugs:
  Bug #980295 in Launchpad itself: "soyuz-upload.txt fails intermittently due to ordering issue"
  https://bugs.launchpad.net/launchpad/+bug/980295

For more details, see:
https://code.launchpad.net/~frankban/launchpad/bug-980295-soyuz-upload/+merge/102255

== Proposed fix ==

I've tried to reproduce the bug without success, so I ended up using the solution
suggested by Julian here: https://bugs.launchpad.net/launchpad/+bug/980295/comments/2

== Implementation details ==

Removed the failing tests.

== Demo and Q/A ==

No QA.

-- 
https://code.launchpad.net/~frankban/launchpad/bug-980295-soyuz-upload/+merge/102255
Your team Launchpad Yellow Squad is requested to review the proposed merge of lp:~frankban/launchpad/bug-980295-soyuz-upload into lp:launchpad.
=== modified file 'lib/lp/soyuz/doc/soyuz-upload.txt'
--- lib/lp/soyuz/doc/soyuz-upload.txt	2011-12-29 05:29:36 +0000
+++ lib/lp/soyuz/doc/soyuz-upload.txt	2012-04-17 08:57:26 +0000
@@ -451,15 +451,6 @@
     >>> stdout, stderr = process.communicate()
     >>> print stdout
     <BLANKLINE>
-    >>> print stderr
-    DEBUG Enabled by DEFAULT section
-    INFO  Creating lockfile: ...
-    DEBUG     Distribution: ubuntutest
-    ...
-    DEBUG   Added /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08.orig.tar.gz from library
-    DEBUG   Added /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08-1.diff.gz from library
-    DEBUG   Added /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08-1.dsc from library
-    ...
 
     >>> transaction.commit()
 
@@ -542,16 +533,6 @@
 already marked as published in the database and, if the files are
 already on disk, verify the contents are as expected.
 
-    >>> print stderr
-    DEBUG Enabled by DEFAULT section
-    INFO  Creating lockfile: ...
-    DEBUG     Distribution: ubuntutest
-    ...
-    DEBUG   /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08.orig.tar.gz is already in pool with the same content.
-    DEBUG   /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08-1.diff.gz is already in pool with the same content.
-    DEBUG   /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08-1.dsc is already in pool with the same content.
-    ...
-
 Check the publishing history again
 
     >>> for pub in SSPPH.selectBy(