diff --git a/debian/changelog b/debian/changelog index 0ac167a..1cf971c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +unattended-upgrades (2.9.1+nmu2ubuntu2) lunar; urgency=medium + + * test/autopkgtest_kernel_patterns.py: Anchor running_escaped_regexp to + ensure the test operates correctly on architectures which have kernel + flavors that are prefixes of other flavors (e.g. -generic and -generic-64k + under arm64). + * d/t/control: Restrict kernel-patterns test to isolation-machine as the + test assumes a meaningful link between the running kernel and the archive + + -- Dave Jones Tue, 03 Jan 2023 20:50:53 +0000 + unattended-upgrades (2.9.1+nmu2ubuntu1) lunar; urgency=medium * Merge from Debian unstable (LP: #1998787). Remaining changes: diff --git a/debian/tests/control b/debian/tests/control index 02d9ba3..c5a1249 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -12,4 +12,4 @@ Depends: @, @builddeps@, apt, debootstrap Tests: kernel-patterns Depends: @, @builddeps@, apt -Restrictions: build-needed, allow-stderr +Restrictions: build-needed, allow-stderr, isolation-machine diff --git a/test/autopkgtest_kernel_patterns.py b/test/autopkgtest_kernel_patterns.py index 111c72d..34cbd2b 100755 --- a/test/autopkgtest_kernel_patterns.py +++ b/test/autopkgtest_kernel_patterns.py @@ -18,7 +18,7 @@ class TestKernelPatterns(unittest.TestCase): running_regexp = running_kernel_pkgs_regexp() running_kernel_version = subprocess.check_output( ["uname", "-r"], universal_newlines=True).rstrip() - running_escaped_regexp = ".*" + re.escape(running_kernel_version) + running_escaped_regexp = ".*" + re.escape(running_kernel_version) + "$" try: running_noflavor_regexp = "linux.*-" + re.escape( re.match("[1-9][0-9]*\\.[0-9]+\\.[0-9]+-[0-9]+",