From 5e418b41599db0b2bb9379da3102d7ac1d8ccdab Mon Sep 17 00:00:00 2001 From: Katie May Date: Thu, 7 May 2026 11:59:59 +0200 Subject: [PATCH 1/4] tests: in interfaces-account-control simplify systems --- tests/main/interfaces-account-control/task.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/main/interfaces-account-control/task.yaml b/tests/main/interfaces-account-control/task.yaml index a73353044eb..3daa89e60fa 100644 --- a/tests/main/interfaces-account-control/task.yaml +++ b/tests/main/interfaces-account-control/task.yaml @@ -4,7 +4,7 @@ details: | This test makes sure that a snap using the account-control interface can handle the user accounts properly. -systems: [ubuntu-core-16-64, ubuntu-core-18-64, ubuntu-core-20-64, ubuntu-core-22-64, ubuntu-core-24-64, ubuntu-core-26-64] +systems: [ubuntu-core-*] environment: TSNAP: account-control-consumer From 59c91348ca2ef955a125b276a2e4a4995180c0c9 Mon Sep 17 00:00:00 2001 From: Katie May Date: Thu, 7 May 2026 12:00:12 +0200 Subject: [PATCH 2/4] tests: enable snap run --- tests/main/interfaces-account-control/task.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/main/interfaces-account-control/task.yaml b/tests/main/interfaces-account-control/task.yaml index 3daa89e60fa..1f8659fe0c2 100644 --- a/tests/main/interfaces-account-control/task.yaml +++ b/tests/main/interfaces-account-control/task.yaml @@ -42,5 +42,4 @@ execute: | snap run "${TSNAP}${SUFFIX}".useradd --extrausers alice echo alice:password | snap run "${TSNAP}${SUFFIX}".chpasswd - # User deletion is unsupported yet on Core: https://bugs.launchpad.net/ubuntu/+source/shadow/+bug/1659534 - # snap run "${TSNAP}${SUFFIX}".userdel --extrausers alice + snap run "${TSNAP}${SUFFIX}".userdel --extrausers alice From c2d9574d3bde252be053c532ecbe7910ded8bfe0 Mon Sep 17 00:00:00 2001 From: Katie May Date: Thu, 7 May 2026 12:42:36 +0200 Subject: [PATCH 3/4] tests: correct app name --- tests/main/interfaces-account-control/task.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/main/interfaces-account-control/task.yaml b/tests/main/interfaces-account-control/task.yaml index 1f8659fe0c2..24fc29526e1 100644 --- a/tests/main/interfaces-account-control/task.yaml +++ b/tests/main/interfaces-account-control/task.yaml @@ -42,4 +42,4 @@ execute: | snap run "${TSNAP}${SUFFIX}".useradd --extrausers alice echo alice:password | snap run "${TSNAP}${SUFFIX}".chpasswd - snap run "${TSNAP}${SUFFIX}".userdel --extrausers alice + snap run "${TSNAP}${SUFFIX}".deluser --extrausers alice From 7213a9a78892935dd031e4e202d3f62d9673c837 Mon Sep 17 00:00:00 2001 From: Katie May Date: Thu, 7 May 2026 15:05:10 +0200 Subject: [PATCH 4/4] tests: correct deluser -> userdel --- .../account-control-consumer-core18/bin/deluser | 3 --- .../account-control-consumer-core18/bin/userdel | 3 +++ .../account-control-consumer-core18/meta/snap.yaml | 4 ++-- .../account-control-consumer-core20/bin/deluser | 3 --- .../account-control-consumer-core20/bin/userdel | 3 +++ .../account-control-consumer-core20/meta/snap.yaml | 4 ++-- .../account-control-consumer-core22/bin/deluser | 3 --- .../account-control-consumer-core22/bin/userdel | 3 +++ .../account-control-consumer-core22/meta/snap.yaml | 4 ++-- .../account-control-consumer-core24/bin/deluser | 3 --- .../account-control-consumer-core24/bin/userdel | 3 +++ .../account-control-consumer-core24/meta/snap.yaml | 4 ++-- .../account-control-consumer-core26/bin/deluser | 3 --- .../account-control-consumer-core26/bin/userdel | 3 +++ .../account-control-consumer-core26/meta/snap.yaml | 4 ++-- .../account-control-consumer/bin/deluser | 3 --- .../account-control-consumer/bin/userdel | 3 +++ .../account-control-consumer/meta/snap.yaml | 4 ++-- tests/main/interfaces-account-control/task.yaml | 2 +- 19 files changed, 31 insertions(+), 31 deletions(-) delete mode 100755 tests/main/interfaces-account-control/account-control-consumer-core18/bin/deluser create mode 100755 tests/main/interfaces-account-control/account-control-consumer-core18/bin/userdel delete mode 100755 tests/main/interfaces-account-control/account-control-consumer-core20/bin/deluser create mode 100755 tests/main/interfaces-account-control/account-control-consumer-core20/bin/userdel delete mode 100755 tests/main/interfaces-account-control/account-control-consumer-core22/bin/deluser create mode 100755 tests/main/interfaces-account-control/account-control-consumer-core22/bin/userdel delete mode 100755 tests/main/interfaces-account-control/account-control-consumer-core24/bin/deluser create mode 100755 tests/main/interfaces-account-control/account-control-consumer-core24/bin/userdel delete mode 100755 tests/main/interfaces-account-control/account-control-consumer-core26/bin/deluser create mode 100755 tests/main/interfaces-account-control/account-control-consumer-core26/bin/userdel delete mode 100755 tests/main/interfaces-account-control/account-control-consumer/bin/deluser create mode 100755 tests/main/interfaces-account-control/account-control-consumer/bin/userdel diff --git a/tests/main/interfaces-account-control/account-control-consumer-core18/bin/deluser b/tests/main/interfaces-account-control/account-control-consumer-core18/bin/deluser deleted file mode 100755 index 10797bca0ad..00000000000 --- a/tests/main/interfaces-account-control/account-control-consumer-core18/bin/deluser +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec /usr/sbin/deluser "$@" diff --git a/tests/main/interfaces-account-control/account-control-consumer-core18/bin/userdel b/tests/main/interfaces-account-control/account-control-consumer-core18/bin/userdel new file mode 100755 index 00000000000..7142de65a58 --- /dev/null +++ b/tests/main/interfaces-account-control/account-control-consumer-core18/bin/userdel @@ -0,0 +1,3 @@ +#!/bin/sh + +exec /usr/sbin/userdel "$@" diff --git a/tests/main/interfaces-account-control/account-control-consumer-core18/meta/snap.yaml b/tests/main/interfaces-account-control/account-control-consumer-core18/meta/snap.yaml index c7f71229384..9e8e645a702 100644 --- a/tests/main/interfaces-account-control/account-control-consumer-core18/meta/snap.yaml +++ b/tests/main/interfaces-account-control/account-control-consumer-core18/meta/snap.yaml @@ -8,8 +8,8 @@ apps: useradd: command: bin/useradd plugs: [account-control] - deluser: - command: bin/deluser + userdel: + command: bin/userdel plugs: [account-control] chpasswd: command: bin/chpasswd diff --git a/tests/main/interfaces-account-control/account-control-consumer-core20/bin/deluser b/tests/main/interfaces-account-control/account-control-consumer-core20/bin/deluser deleted file mode 100755 index 10797bca0ad..00000000000 --- a/tests/main/interfaces-account-control/account-control-consumer-core20/bin/deluser +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec /usr/sbin/deluser "$@" diff --git a/tests/main/interfaces-account-control/account-control-consumer-core20/bin/userdel b/tests/main/interfaces-account-control/account-control-consumer-core20/bin/userdel new file mode 100755 index 00000000000..7142de65a58 --- /dev/null +++ b/tests/main/interfaces-account-control/account-control-consumer-core20/bin/userdel @@ -0,0 +1,3 @@ +#!/bin/sh + +exec /usr/sbin/userdel "$@" diff --git a/tests/main/interfaces-account-control/account-control-consumer-core20/meta/snap.yaml b/tests/main/interfaces-account-control/account-control-consumer-core20/meta/snap.yaml index c145ae2ef1f..f69d6e03bb6 100644 --- a/tests/main/interfaces-account-control/account-control-consumer-core20/meta/snap.yaml +++ b/tests/main/interfaces-account-control/account-control-consumer-core20/meta/snap.yaml @@ -8,8 +8,8 @@ apps: useradd: command: bin/useradd plugs: [account-control] - deluser: - command: bin/deluser + userdel: + command: bin/userdel plugs: [account-control] chpasswd: command: bin/chpasswd diff --git a/tests/main/interfaces-account-control/account-control-consumer-core22/bin/deluser b/tests/main/interfaces-account-control/account-control-consumer-core22/bin/deluser deleted file mode 100755 index 10797bca0ad..00000000000 --- a/tests/main/interfaces-account-control/account-control-consumer-core22/bin/deluser +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec /usr/sbin/deluser "$@" diff --git a/tests/main/interfaces-account-control/account-control-consumer-core22/bin/userdel b/tests/main/interfaces-account-control/account-control-consumer-core22/bin/userdel new file mode 100755 index 00000000000..7142de65a58 --- /dev/null +++ b/tests/main/interfaces-account-control/account-control-consumer-core22/bin/userdel @@ -0,0 +1,3 @@ +#!/bin/sh + +exec /usr/sbin/userdel "$@" diff --git a/tests/main/interfaces-account-control/account-control-consumer-core22/meta/snap.yaml b/tests/main/interfaces-account-control/account-control-consumer-core22/meta/snap.yaml index eae2fc44d35..41613ff4e83 100644 --- a/tests/main/interfaces-account-control/account-control-consumer-core22/meta/snap.yaml +++ b/tests/main/interfaces-account-control/account-control-consumer-core22/meta/snap.yaml @@ -8,8 +8,8 @@ apps: useradd: command: bin/useradd plugs: [account-control] - deluser: - command: bin/deluser + userdel: + command: bin/userdel plugs: [account-control] chpasswd: command: bin/chpasswd diff --git a/tests/main/interfaces-account-control/account-control-consumer-core24/bin/deluser b/tests/main/interfaces-account-control/account-control-consumer-core24/bin/deluser deleted file mode 100755 index 10797bca0ad..00000000000 --- a/tests/main/interfaces-account-control/account-control-consumer-core24/bin/deluser +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec /usr/sbin/deluser "$@" diff --git a/tests/main/interfaces-account-control/account-control-consumer-core24/bin/userdel b/tests/main/interfaces-account-control/account-control-consumer-core24/bin/userdel new file mode 100755 index 00000000000..7142de65a58 --- /dev/null +++ b/tests/main/interfaces-account-control/account-control-consumer-core24/bin/userdel @@ -0,0 +1,3 @@ +#!/bin/sh + +exec /usr/sbin/userdel "$@" diff --git a/tests/main/interfaces-account-control/account-control-consumer-core24/meta/snap.yaml b/tests/main/interfaces-account-control/account-control-consumer-core24/meta/snap.yaml index 360fc9dd30d..1cbd7c9eca3 100644 --- a/tests/main/interfaces-account-control/account-control-consumer-core24/meta/snap.yaml +++ b/tests/main/interfaces-account-control/account-control-consumer-core24/meta/snap.yaml @@ -8,8 +8,8 @@ apps: useradd: command: bin/useradd plugs: [account-control] - deluser: - command: bin/deluser + userdel: + command: bin/userdel plugs: [account-control] chpasswd: command: bin/chpasswd diff --git a/tests/main/interfaces-account-control/account-control-consumer-core26/bin/deluser b/tests/main/interfaces-account-control/account-control-consumer-core26/bin/deluser deleted file mode 100755 index 10797bca0ad..00000000000 --- a/tests/main/interfaces-account-control/account-control-consumer-core26/bin/deluser +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec /usr/sbin/deluser "$@" diff --git a/tests/main/interfaces-account-control/account-control-consumer-core26/bin/userdel b/tests/main/interfaces-account-control/account-control-consumer-core26/bin/userdel new file mode 100755 index 00000000000..7142de65a58 --- /dev/null +++ b/tests/main/interfaces-account-control/account-control-consumer-core26/bin/userdel @@ -0,0 +1,3 @@ +#!/bin/sh + +exec /usr/sbin/userdel "$@" diff --git a/tests/main/interfaces-account-control/account-control-consumer-core26/meta/snap.yaml b/tests/main/interfaces-account-control/account-control-consumer-core26/meta/snap.yaml index 029da578821..5f0943e842b 100644 --- a/tests/main/interfaces-account-control/account-control-consumer-core26/meta/snap.yaml +++ b/tests/main/interfaces-account-control/account-control-consumer-core26/meta/snap.yaml @@ -8,8 +8,8 @@ apps: useradd: command: bin/useradd plugs: [account-control] - deluser: - command: bin/deluser + userdel: + command: bin/userdel plugs: [account-control] chpasswd: command: bin/chpasswd diff --git a/tests/main/interfaces-account-control/account-control-consumer/bin/deluser b/tests/main/interfaces-account-control/account-control-consumer/bin/deluser deleted file mode 100755 index 10797bca0ad..00000000000 --- a/tests/main/interfaces-account-control/account-control-consumer/bin/deluser +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec /usr/sbin/deluser "$@" diff --git a/tests/main/interfaces-account-control/account-control-consumer/bin/userdel b/tests/main/interfaces-account-control/account-control-consumer/bin/userdel new file mode 100755 index 00000000000..7142de65a58 --- /dev/null +++ b/tests/main/interfaces-account-control/account-control-consumer/bin/userdel @@ -0,0 +1,3 @@ +#!/bin/sh + +exec /usr/sbin/userdel "$@" diff --git a/tests/main/interfaces-account-control/account-control-consumer/meta/snap.yaml b/tests/main/interfaces-account-control/account-control-consumer/meta/snap.yaml index 190cfc772e9..44b6c59a075 100644 --- a/tests/main/interfaces-account-control/account-control-consumer/meta/snap.yaml +++ b/tests/main/interfaces-account-control/account-control-consumer/meta/snap.yaml @@ -7,8 +7,8 @@ apps: useradd: command: bin/useradd plugs: [account-control] - deluser: - command: bin/deluser + userdel: + command: bin/userdel plugs: [account-control] chpasswd: command: bin/chpasswd diff --git a/tests/main/interfaces-account-control/task.yaml b/tests/main/interfaces-account-control/task.yaml index 24fc29526e1..1f8659fe0c2 100644 --- a/tests/main/interfaces-account-control/task.yaml +++ b/tests/main/interfaces-account-control/task.yaml @@ -42,4 +42,4 @@ execute: | snap run "${TSNAP}${SUFFIX}".useradd --extrausers alice echo alice:password | snap run "${TSNAP}${SUFFIX}".chpasswd - snap run "${TSNAP}${SUFFIX}".deluser --extrausers alice + snap run "${TSNAP}${SUFFIX}".userdel --extrausers alice