system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-04 15:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33121 from yuwata/test-integration-tests-mkosi

Browse source 
Test: several integration test improvements
This commit is contained in:
Daan De Meyer 2024-05-31 15:40:43 +02:00 committed by GitHub
parent 7ce0104da8 7ae191a5ea
commit 80a5f762bb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/TEST-64-UDEV-STORAGE/meson.build
View file

@ -4,7 +4,11 @@ name = fs.name(meson.current_source_dir())
unit = configure_file(
input : files('../test.service.in'),
output : '@0@.service'.format(name),
configuration : integration_test_template['configuration'],
# Disable user service manager by default for performance.
configuration : integration_test_template['configuration'] + {
'wants' : '',
'after' : '',
},
)
foreach testcase : [

4
test/meson.build
View file

@ -286,8 +286,8 @@ integration_test_template = {
'configuration' : {
'memory-accounting' : 'no',
'command' : testdata_dir / 'units/%N.sh',
'wants' : '',
'after' : '',
'wants' : 'multi-user.target user@4711.service',
'after' : 'user@4711.service',
},
'cmdline' : [],
'credentials' : [],

4
test/test.service.in
View file

@ -1,8 +1,8 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
[Unit]
Description=%N
Wants=basic.target network.target multi-user.target user@4711.service @wants@
After=basic.target network.target user@4711.service @after@
Wants=basic.target network.target @wants@
After=basic.target network.target @after@
Before=getty-pre.target
[Service]

12
test/units/TEST-24-CRYPTSETUP.sh
View file

@ -71,7 +71,7 @@ cryptsetup_start_and_check() {
if [[ "$umount_header_and_key" -ne 0 ]]; then
umount "$TMPFS_DETACHED_KEYFILE"
umount "$TMPFS_DETACHED_HEADER"
udevadm settle --timeout=30
udevadm settle --timeout=60
fi
systemctl status "$unit"
@ -143,18 +143,18 @@ cryptsetup luksAddKey --batch-mode \
STORE_IMAGE="$WORKDIR/store.img"
truncate -s 64M "$STORE_IMAGE"
STORE_LOOP="$(losetup --show --find --partscan "$STORE_IMAGE")"
sfdisk "$STORE_LOOP" <<EOF
udevadm lock --device "$STORE_LOOP" sfdisk "$STORE_LOOP" <<EOF
label: gpt
type=0FC63DAF-8483-4772-8E79-3D69D8477DE4 name=header_store size=32M
type=0FC63DAF-8483-4772-8E79-3D69D8477DE4 name=keyfile_store
EOF
udevadm settle --timeout=30
udevadm settle --timeout=60
mkdir -p /mnt
mkfs.ext4 -L header_store "/dev/disk/by-partlabel/header_store"
udevadm lock --device "/dev/disk/by-partlabel/header_store" mkfs.ext4 -L header_store "/dev/disk/by-partlabel/header_store"
mount "/dev/disk/by-partlabel/header_store" /mnt
cp "$IMAGE_DETACHED_HEADER" /mnt/header
umount /mnt
mkfs.ext4 -L keyfile_store "/dev/disk/by-partlabel/keyfile_store"
udevadm lock --device "/dev/disk/by-partlabel/keyfile_store" mkfs.ext4 -L keyfile_store "/dev/disk/by-partlabel/keyfile_store"
mount "/dev/disk/by-partlabel/keyfile_store" /mnt
cp "$IMAGE_DETACHED_KEYFILE2" /mnt/keyfile
umount /mnt
@ -167,7 +167,7 @@ mount -t tmpfs -o size=32M tmpfs "$TMPFS_DETACHED_HEADER"
cp "$IMAGE_DETACHED_KEYFILE" "$TMPFS_DETACHED_KEYFILE/keyfile"
cp "$IMAGE_DETACHED_HEADER" "$TMPFS_DETACHED_HEADER/header"
udevadm settle --timeout=30
udevadm settle --timeout=60
# Prepare our test crypttab
[[ -e /etc/crypttab ]] && cp -fv /etc/crypttab /tmp/crypttab.bak

1
test/units/TEST-50-DISSECT.sh
View file

@ -206,6 +206,7 @@ if [[ -n "${OPENSSL_CONFIG:-}" ]]; then
udevadm lock --device="${loop}p3" dd if="$MINIMAL_IMAGE.verity-sig" of="${loop}p3"
fi
losetup -d "$loop"
udevadm settle --timeout=60
: "Run subtests"