Merge ~enr0n/ubuntu/+source/systemd:impish-248.3-1ubuntu8.5 into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-impish

[Nick Rosbrook]

This change was made for LP #1967576, but was sponsored as a debdiff instead of being PR'd here first.

[William Wilson (jawn-smith)]

Looks good, let's get this merged.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 0f7298d..383059e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+systemd (248.3-1ubuntu8.5) impish; urgency=medium
+
+  * debian/tests/boot-and-services: Ignore failed snap mount units in test_no_failed (LP: #1967576)
+
+ -- Nick Rosbrook <[e-mail]>  Fri, 01 Apr 2022 16:39:25 -0400
+
 systemd (248.3-1ubuntu8.4) impish; urgency=medium
 
   [ Lukas Märdian ]
diff --git a/debian/tests/boot-and-services b/debian/tests/boot-and-services
index bb9320f..ccf78c1 100755
--- a/debian/tests/boot-and-services
+++ b/debian/tests/boot-and-services
@@ -57,6 +57,9 @@ class ServicesTest(unittest.TestCase):
         failed = [f for f in failed if 'console-setup' not in f]
         # cpi.service fails on s390x
         failed = [f for f in failed if 'cpi.service' not in f]
+        # If snapd is not properly removed/purged, it can leave behind
+        # snap-*.mount units which will always fail.
+        failed = [f for f in failed if not re.match(r'snap-.*\.mount.*', f)]
         # https://bugs.debian.org/926138
         if is_container:
             failed = [f for f in failed if 'e2scrub_reap.service' not in f]