Launchpad itself

Merge lp:~cjwatson/launchpad/testfix-delete-unmodifiable-suite into lp:launchpad

  1. testfix-delete-unmodifiable-suite
  2. Merge into devel
Proposed by Colin Watson
Status: Merged
Merged at revision: 16528
Proposed branch: lp:~cjwatson/launchpad/testfix-delete-unmodifiable-suite
Merge into: lp:launchpad
Diff against target: 48 lines (+11/-1)
2 files modified
lib/lp/soyuz/doc/publishing.txt (+4/-1)
utilities/soyuz-sampledata-setup.py (+7/-0)
To merge this branch: bzr merge lp:~cjwatson/launchpad/testfix-delete-unmodifiable-suite
Reviewer Review Type Date Requested Status
Steve Kowalik (community) code Approve
Review via email: mp+152807@code.launchpad.net

Commit message

Make sure distroseries are marked as DEVELOPMENT before trying to delete packages from them.

Description of the change

Test fix for https://code.launchpad.net/~cjwatson/launchpad/delete-unmodifiable-suite/+merge/152529 - make sure distroseries are marked as DEVELOPMENT before trying to delete packages from them.

To post a comment you must log in.
Revision history for this message
Steve Kowalik (stevenk) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/soyuz/doc/publishing.txt'
2--- lib/lp/soyuz/doc/publishing.txt 2013-01-22 02:06:59 +0000
3+++ lib/lp/soyuz/doc/publishing.txt 2013-03-12 01:20:31 +0000
4@@ -379,7 +379,9 @@
5 removal_comment argument.
6
7 >>> from zope.component import getUtility
8+ >>> from lp.registry.interfaces.series import SeriesStatus
9 >>> mark = getUtility(IPersonSet).getByName('mark')
10+ >>> spph.distroseries.status = SeriesStatus.DEVELOPMENT
11 >>> spph.requestDeletion(mark, "testing deletion")
12
13 Inspecting the modified record shows it's ready for domination:
14@@ -414,6 +416,8 @@
15 >>> modified_spph.scheduleddeletiondate == transaction_timestamp
16 True
17
18+ >>> spph.distroseries.status = SeriesStatus.CURRENT
19+
20
21 Copying and published binarypackages lookup
22 ===========================================
23@@ -475,7 +479,6 @@
24
25 'distroseries' and 'archive' will be constant.
26
27- >>> from lp.registry.interfaces.series import SeriesStatus
28 >>> distroseries = source.distroseries
29 >>> distroseries.status = SeriesStatus.CURRENT
30 >>> archive = source.archive
31
32=== modified file 'utilities/soyuz-sampledata-setup.py'
33--- utilities/soyuz-sampledata-setup.py 2013-01-07 02:40:55 +0000
34+++ utilities/soyuz-sampledata-setup.py 2013-03-12 01:20:31 +0000
35@@ -128,6 +128,13 @@
36
37 def retire_distro_archives(distribution, culprit):
38 """Retire all items in `distribution`'s archives."""
39+
40+ # Temporarily mark all `DistroSeries` as in-development so that we can
41+ # delete publications from them. We're about to delete the series
42+ # anyway.
43+ for series in distribution.series:
44+ series.status = SeriesStatus.DEVELOPMENT
45+
46 for archive in distribution.all_distro_archives:
47 retire_active_publishing_histories(
48 archive.getPublishedSources, culprit)