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
diff --git a/lib/lp/soyuz/scripts/initialize_distroseries.py b/lib/lp/soyuz/scripts/initialize_distroseries.py
index 857f8b0..9c9a2ae 100644
--- a/lib/lp/soyuz/scripts/initialize_distroseries.py
+++ b/lib/lp/soyuz/scripts/initialize_distroseries.py
@@ -269,7 +269,7 @@ class InitializeDistroSeries:
269 parent, statuses, list(INIT_POCKETS), spns)269 parent, statuses, list(INIT_POCKETS), spns)
270 if not items.is_empty():270 if not items.is_empty():
271 raise InitializationError(271 raise InitializationError(
272 "The parent series has sources waiting in its upload "272 "The parent series has builds waiting in its upload "
273 "queues that match your selection.")273 "queues that match your selection.")
274274
275 def _checkSeries(self):275 def _checkSeries(self):
diff --git a/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py b/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py
index c63dbc8..e06e5a5 100644
--- a/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py
+++ b/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py
@@ -524,7 +524,7 @@ class TestInitializeDistroSeries(InitializationHelperTestCase):
524524
525 self.assertRaisesWithContent(525 self.assertRaisesWithContent(
526 InitializationError,526 InitializationError,
527 ("The parent series has sources waiting in its upload "527 ("The parent series has builds waiting in its upload "
528 "queues that match your selection."),528 "queues that match your selection."),
529 ids.check)529 ids.check)
530530
@@ -549,7 +549,7 @@ class TestInitializeDistroSeries(InitializationHelperTestCase):
549549
550 self.assertRaisesWithContent(550 self.assertRaisesWithContent(
551 InitializationError,551 InitializationError,
552 ("The parent series has sources waiting in its upload "552 ("The parent series has builds waiting in its upload "
553 "queues that match your selection."),553 "queues that match your selection."),
554 ids.check)554 ids.check)
555555
@@ -638,7 +638,7 @@ class TestInitializeDistroSeries(InitializationHelperTestCase):
638638
639 self.assertRaisesWithContent(639 self.assertRaisesWithContent(
640 InitializationError,640 InitializationError,
641 ("The parent series has sources waiting in its upload "641 ("The parent series has builds waiting in its upload "
642 "queues that match your selection."),642 "queues that match your selection."),
643 ids.check)643 ids.check)
644644

Subscribers

People subscribed via source and target branches

to status/vote changes: