Merge ~cjwatson/launchpad:ids-misleading-error into launchpad:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: b29466d65127f7d2f8221fa6898a266fa237905d
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:ids-misleading-error
Merge into: launchpad:master
Diff against target: 43 lines (+4/-4)
2 files modified
lib/lp/soyuz/scripts/initialize_distroseries.py (+1/-1)
lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py (+3/-3)
Reviewer Review Type Date Requested Status
Cristian Gonzalez (community) Approve
Review via email: mp+410308@code.launchpad.net

Commit message

Fix misleading error message in InitializeDistroSeries

Description of the change

`_checkQueue` is looking for builds in any of the relevant statuses, not source uploads.

To post a comment you must log in.
Revision history for this message
Cristian Gonzalez (cristiangsp) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/soyuz/scripts/initialize_distroseries.py b/lib/lp/soyuz/scripts/initialize_distroseries.py
2index 857f8b0..9c9a2ae 100644
3--- a/lib/lp/soyuz/scripts/initialize_distroseries.py
4+++ b/lib/lp/soyuz/scripts/initialize_distroseries.py
5@@ -269,7 +269,7 @@ class InitializeDistroSeries:
6 parent, statuses, list(INIT_POCKETS), spns)
7 if not items.is_empty():
8 raise InitializationError(
9- "The parent series has sources waiting in its upload "
10+ "The parent series has builds waiting in its upload "
11 "queues that match your selection.")
12
13 def _checkSeries(self):
14diff --git a/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py b/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py
15index c63dbc8..e06e5a5 100644
16--- a/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py
17+++ b/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py
18@@ -524,7 +524,7 @@ class TestInitializeDistroSeries(InitializationHelperTestCase):
19
20 self.assertRaisesWithContent(
21 InitializationError,
22- ("The parent series has sources waiting in its upload "
23+ ("The parent series has builds waiting in its upload "
24 "queues that match your selection."),
25 ids.check)
26
27@@ -549,7 +549,7 @@ class TestInitializeDistroSeries(InitializationHelperTestCase):
28
29 self.assertRaisesWithContent(
30 InitializationError,
31- ("The parent series has sources waiting in its upload "
32+ ("The parent series has builds waiting in its upload "
33 "queues that match your selection."),
34 ids.check)
35
36@@ -638,7 +638,7 @@ class TestInitializeDistroSeries(InitializationHelperTestCase):
37
38 self.assertRaisesWithContent(
39 InitializationError,
40- ("The parent series has sources waiting in its upload "
41+ ("The parent series has builds waiting in its upload "
42 "queues that match your selection."),
43 ids.check)
44

Subscribers

People subscribed via source and target branches

to status/vote changes: