launchpad-reviewers team mailing list archive

[Enrique Sánchez <mp+494999@xxxxxxxxxxxxxxxxxx>]

Enrique Sánchez has proposed merging ~enriqueesanchz/launchpad:fix-channel-string-to-list-tests into launchpad:master.

Commit message:
Fix import/export broken tests

- Add `'` missing char
- Add external link to result dict

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~enriqueesanchz/launchpad/+git/launchpad/+merge/494999
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~enriqueesanchz/launchpad:fix-channel-string-to-list-tests into launchpad:master.

diff --git a/lib/lp/bugs/browser/tests/test_buglisting.py b/lib/lp/bugs/browser/tests/test_buglisting.py
index 4652ae2..c7a517d 100644
--- a/lib/lp/bugs/browser/tests/test_buglisting.py
+++ b/lib/lp/bugs/browser/tests/test_buglisting.py
@@ -67,7 +67,7 @@ class TestBugTaskSearchListingPage(BrowserTestCase):
         # An external package from url will use unknown type
         self.assertTextMatchesExpressionIgnoreWhitespace(
             """
-            ep - Snap in Ep-distro
+            ep - Snap @12.1/stable in Ep-distro
             does not use Launchpad for bug tracking.
             Getting started with bug tracking in Launchpad.""",
             extract_text(top_portlet[0]),
@@ -195,7 +195,7 @@ class TestBugTaskSearchListingPage(BrowserTestCase):
         )
         self.assertTextMatchesExpressionIgnoreWhitespace(
             """
-            test-sp - Snap in Test-series does not
+            test-sp - Snap @12.1/stable in Test-series does not
             use Launchpad for bug tracking.
             Getting started with bug tracking in Launchpad.""",
             extract_text(top_portlet[0]),
diff --git a/lib/lp/bugs/tests/test_exportvulnerabilityjob.py b/lib/lp/bugs/tests/test_exportvulnerabilityjob.py
index fb099a6..8711c02 100644
--- a/lib/lp/bugs/tests/test_exportvulnerabilityjob.py
+++ b/lib/lp/bugs/tests/test_exportvulnerabilityjob.py
@@ -509,15 +509,11 @@ class ExportVulnerabilityTestViaCelery(WithScenarios, TestCaseWithFactory):
             "sources": [],
         }
 
-        metadata_result = {
-            "error_description": [],
-            "succeeded": cve_names,
-            "failed": [],
-        }
-
         self.assertEqual(self.handler, job.handler)
         self.assertEqual(metadata_request, naked_job_metadata["request"])
-        self.assertEqual(metadata_result, naked_job_metadata["result"])
+        self.assertEqual([], naked_job_metadata["result"]["error_description"])
+        self.assertEqual(cve_names, naked_job_metadata["result"]["succeeded"])
+        self.assertEqual([], naked_job_metadata["result"]["failed"])
 
         self.assertThat(
             naked_job_metadata["result"]["export_link"],
diff --git a/lib/lp/registry/model/externalpackage.py b/lib/lp/registry/model/externalpackage.py
index 75e62dd..69f7e88 100644
--- a/lib/lp/registry/model/externalpackage.py
+++ b/lib/lp/registry/model/externalpackage.py
@@ -79,14 +79,14 @@ class ExternalPackage(
         if self.channel:
             return "%s - %s @%s in %s" % (
                 self.sourcepackagename.name,
-                self.packagetype,
+                self.packagetype.title,
                 self.display_channel,
                 self.distribution.display_name,
             )
 
         return "%s - %s in %s" % (
             self.sourcepackagename.name,
-            self.packagetype,
+            self.packagetype.title,
             self.distribution.display_name,
         )
 
diff --git a/lib/lp/registry/model/externalpackageseries.py b/lib/lp/registry/model/externalpackageseries.py
index 60caa4d..0a3956e 100644
--- a/lib/lp/registry/model/externalpackageseries.py
+++ b/lib/lp/registry/model/externalpackageseries.py
@@ -84,14 +84,14 @@ class ExternalPackageSeries(
         if self.channel:
             return "%s - %s @%s in %s" % (
                 self.sourcepackagename.name,
-                self.packagetype,
+                self.packagetype.title,
                 self.display_channel,
                 self.distroseries.display_name,
             )
 
         return "%s - %s in %s" % (
             self.sourcepackagename.name,
-            self.packagetype,
+            self.packagetype.title,
             self.distroseries.display_name,
         )
 
diff --git a/lib/lp/services/channels.py b/lib/lp/services/channels.py
index e828190..a7a39ee 100644
--- a/lib/lp/services/channels.py
+++ b/lib/lp/services/channels.py
@@ -40,7 +40,7 @@ def channel_string_to_list(channel):
 
     # Only 1, 2, or 3 components are allowed
     if len(components) > 3:
-        raise ValueError(f"Invalid channel name: {channel}")
+        raise ValueError(f"Invalid channel name: '{channel}'")
 
     track = None
     risk = None
@@ -54,16 +54,16 @@ def channel_string_to_list(channel):
         elif _is_risk(components[1]):
             track, risk = components
         else:
-            raise ValueError(f"No valid risk provided: {channel}")
+            raise ValueError(f"No valid risk provided: '{channel}'")
     elif len(components) == 1:
         risk = components[0]
 
     # Validate risk and branch names
     if not _is_risk(risk):
-        raise ValueError(f"No valid risk provided: {channel}")
+        raise ValueError(f"No valid risk provided: '{channel}'")
 
     if branch and _is_risk(branch):
-        raise ValueError(f"Branch name cannot match a risk name: {channel}")
+        raise ValueError(f"Branch name cannot match a risk name: '{channel}'")
 
     return track, risk, branch