File 0001-testsuite-adapt-tests-for-openQA.patch of Package systemd
From d1ce5e4257fd14d27544d095891d919d8c816403 Mon Sep 17 00:00:00 2001
From: Thomas Blume <Thomas.Blume@suse.com>
Date: Tue, 23 Sep 2025 15:49:12 +0200
Subject: [PATCH] testsuite: adapt tests for openQA
---
test/integration-tests/TEST-24-CRYPTSETUP/meson.build | 2 +-
test/integration-tests/TEST-70-TPM2/meson.build | 1 +
test/units/TEST-64-UDEV-STORAGE.sh | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/test/integration-tests/TEST-24-CRYPTSETUP/meson.build b/test/integration-tests/TEST-24-CRYPTSETUP/meson.build
index bb2b2a15f5..b1b7a37a69 100644
--- a/test/integration-tests/TEST-24-CRYPTSETUP/meson.build
+++ b/test/integration-tests/TEST-24-CRYPTSETUP/meson.build
@@ -14,7 +14,7 @@ integration_tests += [
'luks.options=0d318174-56b0-4d6e-a324-ac1e7e7d235d=x-initrd.attach',
],
'qemu-args' : [
- '-drive', 'id=keydev,if=none,format=raw,cache=unsafe,file=@0@'.format(meson.project_build_root() / 'mkosi.output/keydev.raw'),
+ '-drive', 'id=keydev,if=none,format=raw,cache=unsafe,file=@0@'.format('/var/tmp/systemd-testsuite/output/keydev.raw'),
'-device', 'scsi-hd,drive=keydev,serial=keydev',
],
'mkosi-args' : integration_test_template['mkosi-args'] + [
diff --git a/test/integration-tests/TEST-70-TPM2/meson.build b/test/integration-tests/TEST-70-TPM2/meson.build
index 88368646b4..0f8a4cd9a6 100644
--- a/test/integration-tests/TEST-70-TPM2/meson.build
+++ b/test/integration-tests/TEST-70-TPM2/meson.build
@@ -3,6 +3,7 @@
integration_tests += [
integration_test_template + {
'name' : fs.name(meson.current_source_dir()),
+ 'timeout' : 3600,
'configuration' : integration_test_template['configuration'] + {
'wants' : '@0@ tpm2.target'.format(integration_test_template['configuration']['wants']),
'after' : '@0@ tpm2.target'.format(integration_test_template['configuration']['after']),
diff --git a/test/units/TEST-64-UDEV-STORAGE.sh b/test/units/TEST-64-UDEV-STORAGE.sh
index 7ee606e697..33866921f9 100755
--- a/test/units/TEST-64-UDEV-STORAGE.sh
+++ b/test/units/TEST-64-UDEV-STORAGE.sh
@@ -391,7 +391,7 @@ testcase_simultaneous_events_1() {
else
num_part=10
iterations=100
- timeout=60
+ timeout=120
fi
for disk in {0..9}; do
@@ -573,7 +573,7 @@ testcase_simultaneous_events_3() {
if [[ -v ASAN_OPTIONS || "$(systemd-detect-virt -v)" == "qemu" ]]; then
timeout=120
else
- timeout=60
+ timeout=120
fi
link="/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_deadbeeftest0"
--
2.51.0