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

Proposed by Nick Rosbrook
Status: Merged
Merged at revision: 1d4fe801b37b9a370a7643c299b780e71600a781
Proposed branch: ~enr0n/ubuntu/+source/systemd:impish-248.3-1ubuntu8.5
Merge into: ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-impish
Diff against target: 28 lines (+9/-0)
2 files modified
debian/changelog (+6/-0)
debian/tests/boot-and-services (+3/-0)
Reviewer Review Type Date Requested Status
William Wilson Approve
Review via email: mp+418566@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
William Wilson (jawn-smith) wrote :

Looks good, let's get this merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 0f7298d..383059e 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,9 @@
6+systemd (248.3-1ubuntu8.5) impish; urgency=medium
7+
8+ * debian/tests/boot-and-services: Ignore failed snap mount units in test_no_failed (LP: #1967576)
9+
10+ -- Nick Rosbrook <nick.rosbrook@canonical.com> Fri, 01 Apr 2022 16:39:25 -0400
11+
12 systemd (248.3-1ubuntu8.4) impish; urgency=medium
13
14 [ Lukas Märdian ]
15diff --git a/debian/tests/boot-and-services b/debian/tests/boot-and-services
16index bb9320f..ccf78c1 100755
17--- a/debian/tests/boot-and-services
18+++ b/debian/tests/boot-and-services
19@@ -57,6 +57,9 @@ class ServicesTest(unittest.TestCase):
20 failed = [f for f in failed if 'console-setup' not in f]
21 # cpi.service fails on s390x
22 failed = [f for f in failed if 'cpi.service' not in f]
23+ # If snapd is not properly removed/purged, it can leave behind
24+ # snap-*.mount units which will always fail.
25+ failed = [f for f in failed if not re.match(r'snap-.*\.mount.*', f)]
26 # https://bugs.debian.org/926138
27 if is_container:
28 failed = [f for f in failed if 'e2scrub_reap.service' not in f]

Subscribers

People subscribed via source and target branches