51beaf
From bc21daeb780911d586de7ff0004ed2bc515b8826 Mon Sep 17 00:00:00 2001
51beaf
From: Michal Sekletar <msekleta@redhat.com>
51beaf
Date: Mon, 17 May 2021 15:54:10 +0200
51beaf
Subject: [PATCH] test/udev-test.pl: drop test cases that add mutliple devices
51beaf
51beaf
[msekleta: It is easier to delete test-cases that would make
51beaf
udev test fail. Once we reintroduce the fix for link_update()
51beaf
we will revert this commit.]
51beaf
51beaf
Related: #1963980
51beaf
---
51beaf
 test/udev-test.pl | 179 ----------------------------------------------
51beaf
 1 file changed, 179 deletions(-)
51beaf
51beaf
diff --git a/test/udev-test.pl b/test/udev-test.pl
51beaf
index 0612859cda..343d9c01ae 100755
51beaf
--- a/test/udev-test.pl
51beaf
+++ b/test/udev-test.pl
51beaf
@@ -2041,185 +2041,6 @@ TAGS=="foo", SYMLINK+="found"
51beaf
 TAGS=="aaa", SYMLINK+="bad"
51beaf
 EOF
51beaf
         },
51beaf
-        {
51beaf
-                desc            => "multiple devices",
51beaf
-                devices => [
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
51beaf
-                                exp_links       => ["part-1"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
51beaf
-                                exp_links       => ["part-5"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda6",
51beaf
-                                exp_links       => ["part-6"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda7",
51beaf
-                                exp_links       => ["part-7"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda8",
51beaf
-                                exp_links       => ["part-8"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda9",
51beaf
-                                exp_links       => ["part-9"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda10",
51beaf
-                                exp_links       => ["part-10"],
51beaf
-                        },
51beaf
-                    ],
51beaf
-                rules          => <
51beaf
-SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNEL=="sda?*", ENV{DEVTYPE}=="partition", SYMLINK+="part-%n"
51beaf
-EOF
51beaf
-        },
51beaf
-        {
51beaf
-                desc            => "multiple devices, same link name, positive prio",
51beaf
-                repeat          => 100,
51beaf
-                devices => [
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
51beaf
-                                exp_links       => ["part-1"],
51beaf
-                                not_exp_links   => ["partition"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
51beaf
-                                exp_links       => ["part-5"],
51beaf
-                                not_exp_links   => ["partition"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda6",
51beaf
-                                not_exp_links   => ["partition"],
51beaf
-                                exp_links       => ["part-6"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda7",
51beaf
-                                exp_links       => ["part-7", "partition"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda8",
51beaf
-                                not_exp_links   => ["partition"],
51beaf
-                                exp_links       => ["part-8"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda9",
51beaf
-                                not_exp_links   => ["partition"],
51beaf
-                                exp_links       => ["part-9"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda10",
51beaf
-                                not_exp_links   => ["partition"],
51beaf
-                                exp_links       => ["part-10"],
51beaf
-                        },
51beaf
-                    ],
51beaf
-                rules          => <
51beaf
-SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNEL=="sda?*", ENV{DEVTYPE}=="partition", SYMLINK+="part-%n"
51beaf
-SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNEL=="sda?*", ENV{DEVTYPE}=="partition", SYMLINK+="partition"
51beaf
-KERNEL=="*7", OPTIONS+="link_priority=10"
51beaf
-EOF
51beaf
-        },
51beaf
-        {
51beaf
-                desc            => "multiple devices, same link name, negative prio",
51beaf
-                devices => [
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
51beaf
-                                exp_links       => ["part-1"],
51beaf
-                                not_exp_links   => ["partition"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
51beaf
-                                exp_links       => ["part-5"],
51beaf
-                                not_exp_links   => ["partition"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda6",
51beaf
-                                not_exp_links   => ["partition"],
51beaf
-                                exp_links       => ["part-6"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda7",
51beaf
-                                exp_links       => ["part-7", "partition"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda8",
51beaf
-                                not_exp_links   => ["partition"],
51beaf
-                                exp_links       => ["part-8"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda9",
51beaf
-                                not_exp_links   => ["partition"],
51beaf
-                                exp_links       => ["part-9"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda10",
51beaf
-                                not_exp_links   => ["partition"],
51beaf
-                                exp_links       => ["part-10"],
51beaf
-                        },
51beaf
-                    ],
51beaf
-                rules          => <
51beaf
-SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNEL=="sda?*", ENV{DEVTYPE}=="partition", SYMLINK+="part-%n"
51beaf
-SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNEL=="sda?*", ENV{DEVTYPE}=="partition", SYMLINK+="partition"
51beaf
-KERNEL!="*7", OPTIONS+="link_priority=-10"
51beaf
-EOF
51beaf
-        },
51beaf
-        {
51beaf
-                desc            => "multiple devices, same link name, positive prio, sleep",
51beaf
-                devices => [
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
51beaf
-                                exp_links       => ["part-1"],
51beaf
-                                not_exp_links   => ["partition"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
51beaf
-                                exp_links       => ["part-5"],
51beaf
-                                not_exp_links   => ["partition"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda6",
51beaf
-                                not_exp_links   => ["partition"],
51beaf
-                                exp_links       => ["part-6"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda7",
51beaf
-                                exp_links       => ["part-7", "partition"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda8",
51beaf
-                                not_exp_links   => ["partition"],
51beaf
-                                exp_links       => ["part-8"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda9",
51beaf
-                                not_exp_links   => ["partition"],
51beaf
-                                exp_links       => ["part-9"],
51beaf
-                        },
51beaf
-                        {
51beaf
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda10",
51beaf
-                                not_exp_links   => ["partition"],
51beaf
-                                exp_links       => ["part-10"],
51beaf
-                        },
51beaf
-                    ],
51beaf
-                sleep_us       => 10000,
51beaf
-                rules          => <
51beaf
-SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNEL=="sda?*", ENV{DEVTYPE}=="partition", SYMLINK+="part-%n"
51beaf
-SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNEL=="sda?*", ENV{DEVTYPE}=="partition", SYMLINK+="partition"
51beaf
-KERNEL=="*7", OPTIONS+="link_priority=10"
51beaf
-EOF
51beaf
-        },
51beaf
-        {
51beaf
-                desc           => 'all_block_devs',
51beaf
-                generator      => expect_for_some("\\/sda6\$", ["blockdev"]),
51beaf
-                repeat         => 10,
51beaf
-                rules          => <
51beaf
-SUBSYSTEM=="block", SUBSYSTEMS=="scsi", KERNEL=="sd*", SYMLINK+="blockdev"
51beaf
-KERNEL=="sda6", OPTIONS+="link_priority=10"
51beaf
-EOF
51beaf
-        }
51beaf
 );
51beaf
 
51beaf
 sub create_rules {