Merge ppa-dev-tools:fix-lp2038651-bionic-not-included into ppa-dev-tools:main

[Bryce Harrington]

Simple fix for issue discovered and reported by Sebastien Bacher, that the trigger list misses packages targeting ESM releases.

I included with this change an expansion of the relevant test case to cover this issue. Running 'make check' without the fix applied will result in a test failure, and with it applied it then passes.

Admittedly, the test case has some bitrot potential in that eventually even ESM releases will become EOL, so eventually this test case will start failing when 'bionic' hits that point. But this isn't the only test case with such an issue. (Eventually these will need fixed by mocking distro-info to allow hardcoding the releases, however that's a larger scope cleanup than this bugfix.)

[Andreas Hasenack (ahasenack)]

supported_esm() currently also includes trusty and xenial. Should we test for those as well, or are you worried about the test becoming wrong once those become unsupported via esm?

[Bryce Harrington (bryce)]

> supported_esm() currently also includes trusty and xenial. Should we test for
> those as well, or are you worried about the test becoming wrong once those
> become unsupported via esm?

Exactly, this is destined to bitrot but by ignoring those two I'm hoping to put that day off a few years. :-)

For purposes of the code, checking just one of them is going to be sufficient, and bionic will be around the longest of the three.

[Andreas Hasenack (ahasenack)]

Thanks, +1

review: Approve

[Sebastien Bacher (seb128)]

seems also fine to me thanks!

review: Approve

[Bryce Harrington (bryce)]

Thanks, landed:

Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
To git+ssh://git.launchpad.net/ppa-dev-tools
   a2a04a8..3ce7aaf main -> main

diff --git a/scripts/ppa b/scripts/ppa
index f252363..16a7456 100755
--- a/scripts/ppa
+++ b/scripts/ppa
@@ -940,6 +940,7 @@ def command_tests(lp: Lp, config: dict[str, str]) -> int:
     if releases is None:
         udi = UbuntuDistroInfo()
         releases = udi.supported()
+        releases.extend(r for r in udi.supported_esm() if r not in releases)
     if isinstance(releases, str):
         releases = list(unpack_to_dict(releases).keys())
     if not isinstance(releases, list):
diff --git a/tests/test_scripts_ppa.py b/tests/test_scripts_ppa.py
index 4052172..07a1b32 100644
--- a/tests/test_scripts_ppa.py
+++ b/tests/test_scripts_ppa.py
@@ -742,22 +742,55 @@ def test_command_show(fake_config):
     assert script.command_show(lp, fake_config) == 0
 
 
[e-mail]('params, format, expected_in_stdout', [
[e-mail]('params, pubs, format, expected_in_stdout', [
     (
+        # General behavior
         {
             'releases': None,
             'architectures': 'amd64',
             'show_urls': True
         },
+        [('x', '1', 'Published', 'jammy')],
         'plain',
         'arch=amd64&trigger=x%2F1&ppa=me%2Ftesting'
     ),
+    (
+        # Specified release
+        {
+            'releases': 'focal',
+            'architectures': 'amd64',
+            'show_urls': True
+        },
+        [
+            ('x', '3.2.1', 'Published', 'jammy'),
+            ('x', '1.2.3', 'Published', 'focal'),
+            ('x', '1.0.0', 'Published', 'bionic'),
+        ],
+        'plain',
+        'arch=amd64&trigger=x%2F1.2.3&ppa=me%2Ftesting'
+    ),
+    (
+        # Default behavior should include ESM releases (LP: #2038651)
+        {
+            'releases': None,
+            'architectures': 'amd64',
+            'show_urls': True
+        },
+        [
+            ('x', '3.2.1', 'Published', 'jammy'),
+            ('x', '1.2.3', 'Published', 'focal'),
+            ('x', '1.0.0', 'Published', 'bionic'),
+        ],
+        'plain',
+        'arch=amd64&trigger=x%2F1.0.0&ppa=me%2Ftesting'
+    ),
 ])
 @patch('urllib.request.urlopen')
 @patch('ppa.io.open_url')
 def test_command_tests(urlopen_mock,
                        open_url_mock,
-                       fake_config, capfd, params, format, expected_in_stdout):
+                       fake_config, capfd,
+                       params, pubs, format, expected_in_stdout):
     '''Checks that the tests command retrieves and displays correct results.'''
     lp = LpServiceMock()
     urlopen_mock.return_value = "{}"
@@ -770,7 +803,8 @@ def test_command_tests(urlopen_mock,
     the_ppa = lp.me.getPPAByName(fake_config['ppa_name'])
 
     # Add some fake publications
-    the_ppa.published_sources.append(PublicationMock('x', '1', 'Published', 'jammy'))
+    for pub in pubs:
+        the_ppa.published_sources.append(PublicationMock(*pub))
 
     config = {**fake_config, **params}
     assert script.command_tests(lp, config) == 0