Launchpad itself

Merge lp:~wgrant/launchpad/less-crackful-ddeb-tests into lp:launchpad

  1. less-crackful-ddeb-tests
  2. Merge into devel
Proposed by William Grant
Status: Merged
Approved by: Aaron Bentley
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~wgrant/launchpad/less-crackful-ddeb-tests
Merge into: lp:launchpad
Diff against target: 206 lines (+43/-32)
4 files modified
lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug_1.0-1.dsc (+5/-5)
lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug_1.0-1_i386.changes (+10/-5)
lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug_1.0-1_source.changes (+12/-6)
lib/lp/archiveuploader/tests/nascentupload-ddebs.txt (+16/-16)
To merge this branch: bzr merge lp:~wgrant/launchpad/less-crackful-ddeb-tests
Reviewer Review Type Date Requested Status
Aaron Bentley (community) Approve
Review via email: mp+16393@code.launchpad.net

Commit message

Rename the test suite's ddeb to match the naming scheme found on real packages.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) wrote :

In order to start handling DDEBs in Soyuz, we need to be able to link up DEBs with their corresponding DDEBs. We can only do this by matching on the name (in all real-world cases a DDEB's name is $DEBNAME-dbgsym).

Unfortunately, the binaries used in the test suite do not follow this mandatory standard. This branch renames the DDEB from debug-dbg to debug-bin-dbgsym, paving the way for my other DDEB support branches which would otherwise cause this upload to be rejected.

Revision history for this message
Aaron Bentley (abentley) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed directory 'lib/lp/archiveuploader/tests/data/suite/debug_1.0' => 'lib/lp/archiveuploader/tests/data/suite/debug_1.0-1'
2=== added file 'lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug-bin-dbgsym_1.0-1_i386.ddeb'
3Binary files lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug-bin-dbgsym_1.0-1_i386.ddeb 1970-01-01 00:00:00 +0000 and lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug-bin-dbgsym_1.0-1_i386.ddeb 2009-12-20 03:47:18 +0000 differ
4=== renamed file 'lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug-bin_1.0_i386.deb' => 'lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug-bin_1.0-1_i386.deb'
5Binary files lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug-bin_1.0_i386.deb 2009-04-15 13:45:42 +0000 and lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug-bin_1.0-1_i386.deb 2009-12-20 03:47:18 +0000 differ
6=== renamed file 'lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug_1.0.dsc' => 'lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug_1.0-1.dsc'
7--- lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug_1.0.dsc 2009-04-15 13:45:42 +0000
8+++ lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug_1.0-1.dsc 2009-12-20 03:47:18 +0000
9@@ -1,13 +1,13 @@
10 Format: 1.0
11 Source: debug
12-Binary: debug-bin, debug-dbg
13+Binary: debug-bin, debug-bin-dbgsym
14 Architecture: any
15-Version: 1.0
16+Version: 1.0-1
17 Maintainer: Launchpad team <launchpad@lists.canonical.com>
18 Standards-Version: 3.6.2
19 Checksums-Sha1:
20- f1b127517fca94cd06444d452ce32a68fbe24c93 744 debug_1.0.tar.gz
21+ 6851f625a32f6c83a1af4c972b5bead14fbee06c 740 debug_1.0-1.tar.gz
22 Checksums-Sha256:
23- 95537a19d65855ea42695589d8f876e6d4390c906583de7cd4a16842b303d440 744 debug_1.0.tar.gz
24+ 1a1ed198644169f16eeee93c843ab8b7d9eef25cd91b83f55f497dbe744d3c95 740 debug_1.0-1.tar.gz
25 Files:
26- 499069ad47e21b7dde887b46eada8972 744 debug_1.0.tar.gz
27+ 8225b515f30dd8c0252847f17f4b7069 740 debug_1.0-1.tar.gz
28
29=== renamed file 'lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug_1.0.tar.gz' => 'lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug_1.0-1.tar.gz'
30Binary files lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug_1.0.tar.gz 2009-04-15 13:45:42 +0000 and lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug_1.0-1.tar.gz 2009-12-20 03:47:18 +0000 differ
31=== renamed file 'lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug_1.0_i386.changes' => 'lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug_1.0-1_i386.changes'
32--- lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug_1.0_i386.changes 2009-05-11 20:55:01 +0000
33+++ lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug_1.0-1_i386.changes 2009-12-20 03:47:18 +0000
34@@ -3,7 +3,7 @@
35 Source: debug
36 Binary: debug-bin
37 Architecture: i386
38-Version: 1.0
39+Version: 1.0-1
40 Distribution: hoary
41 Urgency: low
42 Maintainer: Launchpad team <launchpad@lists.canonical.com>
43@@ -11,10 +11,15 @@
44 Description:
45 debug-bin - Stuff for testing
46 Changes:
47- debug (1.0) hoary; urgency=low
48+ debug (1.0-1) hoary; urgency=low
49 .
50 * Testing debug binaries
51+Checksums-Sha1:
52+ 91556113ad38eb35d2fe03d27ae646e0ed487a3d 654 debug-bin_1.0-1_i386.deb
53+ d120be63a4535e31ec08657cc4d3018cc8b62d54 668 debug-bin-dbgsym_1.0-1_i386.ddeb
54+Checksums-Sha256:
55+ 5ca0ce3d3bfde3cc698d9ad4b027663abecb958bea641d29ac3bf8333fd3ebad 654 debug-bin_1.0-1_i386.deb
56+ 9c0013badb1bb78fa1ccbf1508398cbf51904f7242d8931f4994c1aa18519b63 668 debug-bin-dbgsym_1.0-1_i386.ddeb
57 Files:
58- 88eae94b28fcffdbfaeb520549f81d1d 654 devel optional debug-bin_1.0_i386.deb
59- 0ab4cf3b1b0422192c41060d903c3f51 664 devel optional debug-dbg_1.0_i386.ddeb
60-
61+ 48b4eed5980c754cc74a06ffc4372f64 654 devel optional debug-bin_1.0-1_i386.deb
62+ ac5c44025ffc026485b22722e0f13804 668 devel optional debug-bin-dbgsym_1.0-1_i386.ddeb
63
64=== renamed file 'lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug_1.0_source.changes' => 'lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug_1.0-1_source.changes'
65--- lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug_1.0_source.changes 2009-04-15 13:45:42 +0000
66+++ lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug_1.0-1_source.changes 2009-12-20 03:47:18 +0000
67@@ -1,20 +1,26 @@
68 Format: 1.8
69 Date: Thu, 15 Apr 2009 15:14:09 +0100
70 Source: debug
71-Binary: debug-bin debug-dbg
72+Binary: debug-bin debug-bin-dbgsym
73 Architecture: source
74-Version: 1.0
75+Version: 1.0-1
76 Distribution: hoary
77 Urgency: low
78 Maintainer: Launchpad team <launchpad@lists.canonical.com>
79 Changed-By: Celso Providelo <cprov@canonical.com>
80 Description:
81 debug-bin - Stuff for testing
82- debug-dbg - Stuff for testing DDEBs
83+ debug-bin-dbgsym - Stuff for testing DDEBs
84 Changes:
85- debug (1.0) hoary; urgency=low
86+ debug (1.0-1) hoary; urgency=low
87 .
88 * Testing debug binaries
89+Checksums-Sha1:
90+ f30c2462e897e07534a5c9960a8f653d5a51b066 434 debug_1.0-1.dsc
91+ 6851f625a32f6c83a1af4c972b5bead14fbee06c 740 debug_1.0-1.tar.gz
92+Checksums-Sha256:
93+ ab5e1eea2551828761d8734224d1a024be401ac05e83010494a0d9c69b8982c3 434 debug_1.0-1.dsc
94+ 1a1ed198644169f16eeee93c843ab8b7d9eef25cd91b83f55f497dbe744d3c95 740 debug_1.0-1.tar.gz
95 Files:
96- f9361791f0d81a607f6b4ce911fdbb0d 419 devel optional debug_1.0.dsc
97- 499069ad47e21b7dde887b46eada8972 744 devel optional debug_1.0.tar.gz
98+ 81d19cae151472dfd2f797a69a2c1f54 434 devel optional debug_1.0-1.dsc
99+ 8225b515f30dd8c0252847f17f4b7069 740 devel optional debug_1.0-1.tar.gz
100
101=== removed file 'lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug-dbg_1.0_i386.ddeb'
102Binary files lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug-dbg_1.0_i386.ddeb 2009-04-15 13:45:42 +0000 and lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug-dbg_1.0_i386.ddeb 1970-01-01 00:00:00 +0000 differ
103=== modified file 'lib/lp/archiveuploader/tests/nascentupload-ddebs.txt'
104--- lib/lp/archiveuploader/tests/nascentupload-ddebs.txt 2009-05-06 20:53:05 +0000
105+++ lib/lp/archiveuploader/tests/nascentupload-ddebs.txt 2009-12-20 03:47:18 +0000
106@@ -11,8 +11,8 @@
107
108 First we will create a source and a corresponding binary publication
109 in the database, 'debug' and 'debug-bin' version '0.9', which will be
110-an ancestor for the subsequent upload containing a 'debug-dbg' DDEB.
111-This is done using `SoyuzTestPublisher`.
112+an ancestor for the subsequent upload containing a 'debug-bin-dbgsym'
113+DDEB. This is done using `SoyuzTestPublisher`.
114
115 >>> from lp.soyuz.tests.test_publishing import (
116 ... SoyuzTestPublisher)
117@@ -43,28 +43,28 @@
118 >>> LaunchpadZopelessLayer.txn.commit()
119 >>> LaunchpadZopelessLayer.switchDbUser('uploader')
120
121-With that done, we now upload a new source, 'debug - 1.0', which is
122+With that done, we now upload a new source, 'debug - 1.0-1', which is
123 immediately accepted and stands pending publication.
124
125 >>> src = getUploadForSource(
126- ... 'suite/debug_1.0/debug_1.0_source.changes')
127+ ... 'suite/debug_1.0-1/debug_1.0-1_source.changes')
128 >>> src.process()
129 >>> result = src.do_accept()
130 >>> print src.queue_root.status.name
131 DONE
132
133 >>> [src_pub] = src.queue_root.archive.getPublishedSources(
134- ... name='debug', version='1.0', exact_match=True)
135+ ... name='debug', version='1.0-1', exact_match=True)
136
137 >>> print src_pub.displayname, src_pub.status.name
138- debug 1.0 in hoary PENDING
139+ debug 1.0-1 in hoary PENDING
140
141 At this point a deb and a ddeb, produced during a normal build
142 process, are uploaded. This is exactly the same procedure used for
143 binary uploads with only ordinary debs.
144
145 >>> bin = getUploadForBinary(
146- ... 'suite/debug_1.0/debug_1.0_i386.changes')
147+ ... 'suite/debug_1.0-1/debug_1.0-1_i386.changes')
148
149 DDEBs undergo exactly the same checks as ordinary DEBs. These are
150 never considered NEW, so the binary upload has a 'never-seen-before'
151@@ -91,8 +91,8 @@
152 ... print '%s %s %s' % (
153 ... bin_pub.displayname, bin_pub.status.name,
154 ... bin_pub.archive.purpose.name)
155- debug-bin 1.0 in hoary i386 PENDING PRIMARY
156- debug-dbg 1.0 in hoary i386 PENDING DEBUG
157+ debug-bin 1.0-1 in hoary i386 PENDING PRIMARY
158+ debug-bin-dbgsym 1.0-1 in hoary i386 PENDING DEBUG
159
160 DEBs and DDEBs are uploaded to separate archives, because the size
161 impact of uploading them to a single archive on mirrors would be
162@@ -104,7 +104,7 @@
163 >>> ddeb = ddeb_pub.binarypackagerelease
164
165 >>> print ddeb.title
166- debug-dbg-1.0
167+ debug-bin-dbgsym-1.0-1
168
169 The corresponding `BinaryPackageRelease` is recorded with DDEB format.
170
171@@ -115,7 +115,7 @@
172
173 >>> for bin_file in ddeb.files:
174 ... print bin_file.libraryfile.filename, bin_file.filetype.name
175- debug-dbg_1.0_i386.ddeb DDEB
176+ debug-bin-dbgsym_1.0-1_i386.ddeb DDEB
177
178
179 == DDEBs in other archives ==
180@@ -144,15 +144,15 @@
181 ... binaryname='debug-bin', pub_source=copied_source, archive=copy)
182
183 >>> src_pub = test_publisher.getPubSource(
184- ... sourcename='debug', version='1.0', archive=copy)
185+ ... sourcename='debug', version='1.0-1', archive=copy)
186
187 >>> print src_pub.displayname, src_pub.status.name
188- debug 1.0 in hoary PENDING
189+ debug 1.0-1 in hoary PENDING
190
191 Now we upload the DEB and the DDEB, which are auto-accepted.
192
193 >>> bin = getUploadForBinary(
194- ... 'suite/debug_1.0/debug_1.0_i386.changes')
195+ ... 'suite/debug_1.0-1/debug_1.0-1_i386.changes')
196 >>> bin.policy.archive = copy
197
198 >>> bin.process()
199@@ -175,6 +175,6 @@
200 ... print '%s %s %s' % (
201 ... bin_pub.displayname, bin_pub.status.name,
202 ... bin_pub.archive.purpose.name)
203- debug-bin 1.0 in hoary i386 PENDING COPY
204- debug-dbg 1.0 in hoary i386 PENDING COPY
205+ debug-bin 1.0-1 in hoary i386 PENDING COPY
206+ debug-bin-dbgsym 1.0-1 in hoary i386 PENDING COPY
207