launchpad-reviewers team mailing list archive

Thread
Date

[Merge] lp:~cjwatson/launchpad/orig-tarball-signatures-more-tests into lp:launchpad

To: mp+296156@xxxxxxxxxxxxxxxxxx
From: Colin Watson <cjwatson@xxxxxxxxxxxxx>
Date: Wed, 01 Jun 2016 02:34:26 -0000
Reply-to: mp+296156@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Colin Watson has proposed merging lp:~cjwatson/launchpad/orig-tarball-signatures-more-tests into lp:launchpad with lp:~cjwatson/launchpad/orig-tarball-signatures as a prerequisite.

Commit message:
Add upload processor tests for original tarball signatures.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/orig-tarball-signatures-more-tests/+merge/296156

Add upload processor tests for original tarball signatures.

This can't land until we have a dpkg with the necessary cherry-picks to be able to unpack these packages.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/orig-tarball-signatures-more-tests into lp:launchpad.

=== modified file 'lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1.dsc'
--- lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1.dsc	2011-03-21 12:55:50 +0000
+++ lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1.dsc	2016-06-01 02:33:50 +0000
@@ -7,19 +7,25 @@
 Standards-Version: 3.6.2
 Checksums-Sha1: 
  e7a106587e0f11220e27ccc5db7527cae05e4054 178 bar_1.0.orig-comp1.tar.gz
+ fd681cf95c93ebfb77c3c4ef276aa0bacc29e098 463 bar_1.0.orig-comp1.tar.gz.asc
  a645cc0856469f549f11bb9bdc4ca6dda4eedd4b 156 bar_1.0.orig-comp2.tar.bz2
  bda4aae72bc911d25db3837f644c21fa60a30394 192 bar_1.0.orig-comp3.tar.xz
  73a04163fee97fd2257ab266bd48f1d3d528e012 164 bar_1.0.orig.tar.gz
+ d2da43007b5c8ffc2819508c14d24e2be306d253 449 bar_1.0.orig.tar.gz.asc
  727de2395d3a3e35c375159db01072935fea02f8 737 bar_1.0-1.debian.tar.bz2
 Checksums-Sha256: 
  aff0bbc01c5883ac76e89cba7a9b6cd79b521183f0de86c93e93ab8804f5a256 178 bar_1.0.orig-comp1.tar.gz
+ 878be3c26e67862a38a4a2e6a74382c55cec834108849db6d1a964e9a7eeb486 463 bar_1.0.orig-comp1.tar.gz.asc
  955131b3a5bd881c008ff822c0f9b7544350647fe1f355f65a138e0e5e5e8d71 156 bar_1.0.orig-comp2.tar.bz2
  189ca14ff5de56e9ee1ad119992d8dada416b4d3e527a3c1ea6c068e6c9ab04f 192 bar_1.0.orig-comp3.tar.xz
  f1ecff929899b567f45d6734b69d59a4f3c04dabce3cc8e6ed6d64073eda360e 164 bar_1.0.orig.tar.gz
+ 194bd6f479cae9101aaf9173c9b1c11d116cbe2b2dd68069c3355c606e66e921 449 bar_1.0.orig.tar.gz.asc
  3d2137f9f80f4b6c80f73acb8b3ac7986c962c4268d8948f54823d27148a6116 737 bar_1.0-1.debian.tar.bz2
 Files: 
  eed105761436486f7eebaa8c017bc59a 178 bar_1.0.orig-comp1.tar.gz
+ 74a2ffba8faf2336a7ec704b385e53e4 463 bar_1.0.orig-comp1.tar.gz.asc
  0a30b50fa846e75261808ee1f41d1cbe 156 bar_1.0.orig-comp2.tar.bz2
  151443692da0d20731ff79df1e22cc37 192 bar_1.0.orig-comp3.tar.xz
  fc1464e5985b962a042d5354452f361d 164 bar_1.0.orig.tar.gz
+ 52cde729fbc441276e067e40642f12e5 449 bar_1.0.orig.tar.gz.asc
  e68110184d4d9e7afd81520cc490b396 737 bar_1.0-1.debian.tar.bz2

=== modified file 'lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1_source.changes'
--- lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1_source.changes	2011-03-25 16:44:39 +0000
+++ lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0-1_source.changes	2016-06-01 02:33:50 +0000
@@ -15,23 +15,29 @@
  .
    * Initial version
 Checksums-Sha1: 
- e7422c6fba68e168e0d19c691a4a125eed1d7e23 1347 bar_1.0-1.dsc
+ 1eba87e0b6ec3388b04897e5b14fd11287f1118b 1817 bar_1.0-1.dsc
  e7a106587e0f11220e27ccc5db7527cae05e4054 178 bar_1.0.orig-comp1.tar.gz
+ fd681cf95c93ebfb77c3c4ef276aa0bacc29e098 463 bar_1.0.orig-comp1.tar.gz.asc
  a645cc0856469f549f11bb9bdc4ca6dda4eedd4b 156 bar_1.0.orig-comp2.tar.bz2
  bda4aae72bc911d25db3837f644c21fa60a30394 192 bar_1.0.orig-comp3.tar.xz
  73a04163fee97fd2257ab266bd48f1d3d528e012 164 bar_1.0.orig.tar.gz
+ d2da43007b5c8ffc2819508c14d24e2be306d253 449 bar_1.0.orig.tar.gz.asc
  727de2395d3a3e35c375159db01072935fea02f8 737 bar_1.0-1.debian.tar.bz2
 Checksums-Sha256: 
- e400747cc2d24517e9303ddddc008e0be678d622a0d36c929bbb572c11d36bad 1347 bar_1.0-1.dsc
+ 57b73fb46bc64488978b25933cf564dd20ae9b79a96989214f4c862a4ed429a8 1817 bar_1.0-1.dsc
  aff0bbc01c5883ac76e89cba7a9b6cd79b521183f0de86c93e93ab8804f5a256 178 bar_1.0.orig-comp1.tar.gz
+ 878be3c26e67862a38a4a2e6a74382c55cec834108849db6d1a964e9a7eeb486 463 bar_1.0.orig-comp1.tar.gz.asc
  955131b3a5bd881c008ff822c0f9b7544350647fe1f355f65a138e0e5e5e8d71 156 bar_1.0.orig-comp2.tar.bz2
  189ca14ff5de56e9ee1ad119992d8dada416b4d3e527a3c1ea6c068e6c9ab04f 192 bar_1.0.orig-comp3.tar.xz
  f1ecff929899b567f45d6734b69d59a4f3c04dabce3cc8e6ed6d64073eda360e 164 bar_1.0.orig.tar.gz
+ 194bd6f479cae9101aaf9173c9b1c11d116cbe2b2dd68069c3355c606e66e921 449 bar_1.0.orig.tar.gz.asc
  3d2137f9f80f4b6c80f73acb8b3ac7986c962c4268d8948f54823d27148a6116 737 bar_1.0-1.debian.tar.bz2
 Files: 
- 7db2a612a48d87116b7b3651c4a43aa1 1347 devel optional bar_1.0-1.dsc
+ 5d0c4b067930b4d698d4ba82f39e1547 1817 devel optional bar_1.0-1.dsc
  eed105761436486f7eebaa8c017bc59a 178 devel optional bar_1.0.orig-comp1.tar.gz
+ 74a2ffba8faf2336a7ec704b385e53e4 463 devel optional bar_1.0.orig-comp1.tar.gz.asc
  0a30b50fa846e75261808ee1f41d1cbe 156 devel optional bar_1.0.orig-comp2.tar.bz2
  151443692da0d20731ff79df1e22cc37 192 devel optional bar_1.0.orig-comp3.tar.xz
  fc1464e5985b962a042d5354452f361d 164 devel optional bar_1.0.orig.tar.gz
+ 52cde729fbc441276e067e40642f12e5 449 devel optional bar_1.0.orig.tar.gz.asc
  e68110184d4d9e7afd81520cc490b396 737 devel optional bar_1.0-1.debian.tar.bz2

=== added file 'lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0.orig-comp1.tar.gz.asc'
Binary files lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0.orig-comp1.tar.gz.asc	1970-01-01 00:00:00 +0000 and lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0.orig-comp1.tar.gz.asc	2016-06-01 02:33:50 +0000 differ
=== added file 'lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0.orig.tar.gz.asc'
Binary files lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0.orig.tar.gz.asc	1970-01-01 00:00:00 +0000 and lib/lp/archiveuploader/tests/data/suite/bar_1.0-1_3.0-quilt/bar_1.0.orig.tar.gz.asc	2016-06-01 02:33:50 +0000 differ
=== modified file 'lib/lp/archiveuploader/tests/data/suite/bar_1.0-2_3.0-quilt_without_orig/bar_1.0-2.dsc'
--- lib/lp/archiveuploader/tests/data/suite/bar_1.0-2_3.0-quilt_without_orig/bar_1.0-2.dsc	2009-11-01 06:11:40 +0000
+++ lib/lp/archiveuploader/tests/data/suite/bar_1.0-2_3.0-quilt_without_orig/bar_1.0-2.dsc	2016-06-01 02:33:50 +0000
@@ -7,16 +7,22 @@
 Standards-Version: 3.6.2
 Checksums-Sha1: 
  e7a106587e0f11220e27ccc5db7527cae05e4054 178 bar_1.0.orig-comp1.tar.gz
+ fd681cf95c93ebfb77c3c4ef276aa0bacc29e098 463 bar_1.0.orig-comp1.tar.gz.asc
  a645cc0856469f549f11bb9bdc4ca6dda4eedd4b 156 bar_1.0.orig-comp2.tar.bz2
  73a04163fee97fd2257ab266bd48f1d3d528e012 164 bar_1.0.orig.tar.gz
+ d2da43007b5c8ffc2819508c14d24e2be306d253 449 bar_1.0.orig.tar.gz.asc
  62776c07df0412798956af8b625a9f1744c8f0fb 807 bar_1.0-2.debian.tar.bz2
 Checksums-Sha256: 
  aff0bbc01c5883ac76e89cba7a9b6cd79b521183f0de86c93e93ab8804f5a256 178 bar_1.0.orig-comp1.tar.gz
+ 878be3c26e67862a38a4a2e6a74382c55cec834108849db6d1a964e9a7eeb486 463 bar_1.0.orig-comp1.tar.gz.asc
  955131b3a5bd881c008ff822c0f9b7544350647fe1f355f65a138e0e5e5e8d71 156 bar_1.0.orig-comp2.tar.bz2
  f1ecff929899b567f45d6734b69d59a4f3c04dabce3cc8e6ed6d64073eda360e 164 bar_1.0.orig.tar.gz
+ 194bd6f479cae9101aaf9173c9b1c11d116cbe2b2dd68069c3355c606e66e921 449 bar_1.0.orig.tar.gz.asc
  a2a4a82e6f6b212e7de11df327fea18bf2b8e846d221e417b0a479d0f8bf9d79 807 bar_1.0-2.debian.tar.bz2
 Files: 
  eed105761436486f7eebaa8c017bc59a 178 bar_1.0.orig-comp1.tar.gz
+ 74a2ffba8faf2336a7ec704b385e53e4 463 bar_1.0.orig-comp1.tar.gz.asc
  0a30b50fa846e75261808ee1f41d1cbe 156 bar_1.0.orig-comp2.tar.bz2
  fc1464e5985b962a042d5354452f361d 164 bar_1.0.orig.tar.gz
+ 52cde729fbc441276e067e40642f12e5 449 bar_1.0.orig.tar.gz.asc
  8b17b1469943483df4d5093955553992 807 bar_1.0-2.debian.tar.bz2

=== modified file 'lib/lp/archiveuploader/tests/data/suite/bar_1.0-2_3.0-quilt_without_orig/bar_1.0-2_source.changes'
--- lib/lp/archiveuploader/tests/data/suite/bar_1.0-2_3.0-quilt_without_orig/bar_1.0-2_source.changes	2009-11-01 06:11:40 +0000
+++ lib/lp/archiveuploader/tests/data/suite/bar_1.0-2_3.0-quilt_without_orig/bar_1.0-2_source.changes	2016-06-01 02:33:50 +0000
@@ -15,11 +15,11 @@
  .
    * Another version
 Checksums-Sha1: 
- d9ccd09135965a759bd741fba1f5223a0314aac8 1115 bar_1.0-2.dsc
+ 400d018767b52d515929591abc88bd3ebaf49993 1585 bar_1.0-2.dsc
  62776c07df0412798956af8b625a9f1744c8f0fb 807 bar_1.0-2.debian.tar.bz2
 Checksums-Sha256: 
- 53ec1fb4c1671e203c433db570a667750bf4a503e4556ac2c9600389e119744a 1115 bar_1.0-2.dsc
+ 0c4d2b8004b183597c08674d6d96fcfb0f519b4c8fe7590233277abe4b41b15d 1585 bar_1.0-2.dsc
  a2a4a82e6f6b212e7de11df327fea18bf2b8e846d221e417b0a479d0f8bf9d79 807 bar_1.0-2.debian.tar.bz2
 Files: 
- 014288c2cdeca7a9a5e3201aca044c3b 1115 devel optional bar_1.0-2.dsc
+ e6ec6a0a747885aaee312b1a598dbf39 1585 devel optional bar_1.0-2.dsc
  8b17b1469943483df4d5093955553992 807 devel optional bar_1.0-2.debian.tar.bz2

=== added file 'lib/lp/archiveuploader/tests/data/suite/bar_1.0-2_3.0-quilt_without_orig/bar_1.0.orig-comp1.tar.gz.asc'
Binary files lib/lp/archiveuploader/tests/data/suite/bar_1.0-2_3.0-quilt_without_orig/bar_1.0.orig-comp1.tar.gz.asc	1970-01-01 00:00:00 +0000 and lib/lp/archiveuploader/tests/data/suite/bar_1.0-2_3.0-quilt_without_orig/bar_1.0.orig-comp1.tar.gz.asc	2016-06-01 02:33:50 +0000 differ
=== added file 'lib/lp/archiveuploader/tests/data/suite/bar_1.0-2_3.0-quilt_without_orig/bar_1.0.orig.tar.gz.asc'
Binary files lib/lp/archiveuploader/tests/data/suite/bar_1.0-2_3.0-quilt_without_orig/bar_1.0.orig.tar.gz.asc	1970-01-01 00:00:00 +0000 and lib/lp/archiveuploader/tests/data/suite/bar_1.0-2_3.0-quilt_without_orig/bar_1.0.orig.tar.gz.asc	2016-06-01 02:33:50 +0000 differ
=== modified file 'lib/lp/archiveuploader/tests/test_uploadprocessor.py'
--- lib/lp/archiveuploader/tests/test_uploadprocessor.py	2016-01-26 15:47:37 +0000
+++ lib/lp/archiveuploader/tests/test_uploadprocessor.py	2016-06-01 02:33:50 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Functional tests for uploadprocessor.py."""
@@ -1785,12 +1785,17 @@
               SourcePackageFileType.DSC),
              ('bar_1.0.orig-comp1.tar.gz',
               SourcePackageFileType.COMPONENT_ORIG_TARBALL),
+             ('bar_1.0.orig-comp1.tar.gz.asc',
+              SourcePackageFileType.COMPONENT_ORIG_TARBALL_SIGNATURE),
              ('bar_1.0.orig-comp2.tar.bz2',
               SourcePackageFileType.COMPONENT_ORIG_TARBALL),
              ('bar_1.0.orig-comp3.tar.xz',
               SourcePackageFileType.COMPONENT_ORIG_TARBALL),
              ('bar_1.0.orig.tar.gz',
-              SourcePackageFileType.ORIG_TARBALL)])
+              SourcePackageFileType.ORIG_TARBALL),
+             ('bar_1.0.orig.tar.gz.asc',
+              SourcePackageFileType.ORIG_TARBALL_SIGNATURE),
+             ])
 
     def test30QuiltUploadWithSameComponentOrig(self):
         """Ensure that 3.0 (quilt) uploads with shared component origs work.
@@ -1825,10 +1830,15 @@
               SourcePackageFileType.DSC),
              ('bar_1.0.orig-comp1.tar.gz',
               SourcePackageFileType.COMPONENT_ORIG_TARBALL),
+             ('bar_1.0.orig-comp1.tar.gz',
+              SourcePackageFileType.COMPONENT_ORIG_TARBALL_SIGNATURE),
              ('bar_1.0.orig-comp2.tar.bz2',
               SourcePackageFileType.COMPONENT_ORIG_TARBALL),
              ('bar_1.0.orig.tar.gz',
-              SourcePackageFileType.ORIG_TARBALL)])
+              SourcePackageFileType.ORIG_TARBALL),
+             ('bar_1.0.orig.tar.gz.asc',
+              SourcePackageFileType.ORIG_TARBALL_SIGNATURE),
+             ])
 
     def test30NativeUpload(self):
         """Ensure that 3.0 (native) uploads work properly. """

Follow ups

[Merge] lp:~cjwatson/launchpad/orig-tarball-signatures-more-tests into lp:launchpad
From: noreply, 2016-07-01
Re: [Merge] lp:~cjwatson/launchpad/orig-tarball-signatures-more-tests into lp:launchpad
From: William Grant, 2016-06-01