launchpad-reviewers team mailing list archive

[Colin Watson <mp+410308@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:ids-misleading-error into launchpad:master.

Commit message:
Fix misleading error message in InitializeDistroSeries

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/410308

`_checkQueue` is looking for builds in any of the relevant statuses, not source uploads.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:ids-misleading-error into launchpad:master.

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:
             parent, statuses, list(INIT_POCKETS), spns)
         if not items.is_empty():
             raise InitializationError(
-                "The parent series has sources waiting in its upload "
+                "The parent series has builds waiting in its upload "
                 "queues that match your selection.")
 
     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):
 
             self.assertRaisesWithContent(
                 InitializationError,
-                ("The parent series has sources waiting in its upload "
+                ("The parent series has builds waiting in its upload "
                  "queues that match your selection."),
                 ids.check)
 
@@ -549,7 +549,7 @@ class TestInitializeDistroSeries(InitializationHelperTestCase):
 
             self.assertRaisesWithContent(
                 InitializationError,
-                ("The parent series has sources waiting in its upload "
+                ("The parent series has builds waiting in its upload "
                  "queues that match your selection."),
                 ids.check)
 
@@ -638,7 +638,7 @@ class TestInitializeDistroSeries(InitializationHelperTestCase):
 
         self.assertRaisesWithContent(
             InitializationError,
-            ("The parent series has sources waiting in its upload "
+            ("The parent series has builds waiting in its upload "
              "queues that match your selection."),
             ids.check)