Merge pull request #32812 from DaanDeMeyer/test

test: Only add tpm2.target dependency to TEST-70-TPM2.service

Author: DaanDeMeyer

test/TEST-64-UDEV-STORAGE/virtio_scsi_identically_named_partitions.configure

@@ -20,7 +20,7 @@ num_disk = 16
 config["QemuArgs"] += ["-device", "virtio-scsi-pci,id=scsi0,num_queues=4"]
 
 for i in range(0, num_disk):
-    id = f"drivenamedpart{i}"
+    id = f"drive{i}"
     config["QemuDrives"] += [
         {
             "Id": id,

test/TEST-70-TPM2/meson.build

@@ -3,5 +3,9 @@
 integration_tests += [
         integration_test_template + {
                 'name' : fs.name(meson.current_source_dir()),
+                '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']),
+                },
         },
 ]

test/meson.build

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

test/test.service.in

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

test/units/TEST-64-UDEV-STORAGE.sh

@@ -250,7 +250,7 @@ testcase_virtio_scsi_identically_named_partitions() {
     fi
 
     for ((i = 0; i < num_disk; i++)); do
-        sfdisk "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drivenamedpart$i" <<EOF
+        sfdisk "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive$i" <<EOF
 label: gpt
 
 $(for ((j = 1; j <= num_part; j++)); do echo 'name="Hello world", size=2M'; done)