From 016743b4aa596ec0a7736283ce6099cbc004941e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 27 Sep 2021 02:38:29 +0200 Subject: [PATCH] Revert "tests/udev-test.pl: add multiple device test" This reverts commit 4a0ec82daf32446519e1d86329bb802325b82104. Gbp-Pq: Topic debian Gbp-Pq: Name Revert-tests-udev-test.pl-add-multiple-device-test.patch --- test/udev-test.pl | 179 ---------------------------------------------- 1 file changed, 179 deletions(-) diff --git a/test/udev-test.pl b/test/udev-test.pl index 5b1e3350..22c338cf 100755 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -2139,185 +2139,6 @@ TAGS=="foo", SYMLINK+="found" TAGS=="aaa", SYMLINK+="bad" EOF }, - { - desc => "multiple devices", - devices => [ - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_links => ["part-1"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_links => ["part-5"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda6", - exp_links => ["part-6"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda7", - exp_links => ["part-7"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda8", - exp_links => ["part-8"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda9", - exp_links => ["part-9"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda10", - exp_links => ["part-10"], - }, - ], - rules => < "multiple devices, same link name, positive prio", - repeat => 100, - devices => [ - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_links => ["part-1"], - not_exp_links => ["partition"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_links => ["part-5"], - not_exp_links => ["partition"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda6", - not_exp_links => ["partition"], - exp_links => ["part-6"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda7", - exp_links => ["part-7", "partition"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda8", - not_exp_links => ["partition"], - exp_links => ["part-8"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda9", - not_exp_links => ["partition"], - exp_links => ["part-9"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda10", - not_exp_links => ["partition"], - exp_links => ["part-10"], - }, - ], - rules => < "multiple devices, same link name, negative prio", - devices => [ - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_links => ["part-1"], - not_exp_links => ["partition"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_links => ["part-5"], - not_exp_links => ["partition"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda6", - not_exp_links => ["partition"], - exp_links => ["part-6"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda7", - exp_links => ["part-7", "partition"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda8", - not_exp_links => ["partition"], - exp_links => ["part-8"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda9", - not_exp_links => ["partition"], - exp_links => ["part-9"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda10", - not_exp_links => ["partition"], - exp_links => ["part-10"], - }, - ], - rules => < "multiple devices, same link name, positive prio, sleep", - devices => [ - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", - exp_links => ["part-1"], - not_exp_links => ["partition"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5", - exp_links => ["part-5"], - not_exp_links => ["partition"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda6", - not_exp_links => ["partition"], - exp_links => ["part-6"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda7", - exp_links => ["part-7", "partition"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda8", - not_exp_links => ["partition"], - exp_links => ["part-8"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda9", - not_exp_links => ["partition"], - exp_links => ["part-9"], - }, - { - devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda10", - not_exp_links => ["partition"], - exp_links => ["part-10"], - }, - ], - sleep_us => 10000, - rules => < 'all_block_devs', - generator => expect_for_some("\\/sda6\$", ["blockdev"]), - repeat => 10, - rules => <