udev-test.pl: catch-up with recent changes

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 47cadc5db35768f64f6a3165d90cdf291ba4d414..896bb228c46e112c5cf003a88d2d3ae669f31235 100755 (executable)
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -39,7 +39,7 @@ my @tests = (
 EOF
        },
        {
 EOF
        },
        {

-               desc            => "label test of scsi disc (old key names)",
+               desc            => "label test of scsi disc",

                subsys          => "block",
                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "boot_disk" ,
                subsys          => "block",
                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "boot_disk" ,


@@ -49,7 +49,7 @@ KERNEL=="ttyACM0", NAME="modem"
 EOF
        },
        {
 EOF
        },
        {

-               desc            => "label test of scsi disc (old key names)",
+               desc            => "label test of scsi disc",

                subsys          => "block",
                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "boot_disk" ,
                subsys          => "block",
                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "boot_disk" ,


@@ -263,15 +263,6 @@ EOF
                exp_name        => "first_disk5" ,
                rules           => <<EOF
 SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", NAME="first_disk%n"
                exp_name        => "first_disk5" ,
                rules           => <<EOF
 SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", NAME="first_disk%n"

-EOF
-       },
-       {
-               desc            => "test substitution chars (old key names)",
-               subsys          => "block",
-               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
-               exp_name        => "Major:8:minor:5:kernelnumber:5:id:0:0:0:0" ,
-               rules           => <<EOF
-BUS=="scsi", ID=="0:0:0:0", NAME="Major:%M:minor:%m:kernelnumber:%n:id:%b"

 EOF
        },
        {
 EOF
        },
        {


@@ -1021,17 +1012,6 @@ EOF
                exp_target      => "node",
                rules           => <<EOF
 SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n node link1 link2 link3 link4", RESULT=="node *", NAME="%c{1}", SYMLINK+="%c{2+}"
                exp_target      => "node",
                rules           => <<EOF
 SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n node link1 link2 link3 link4", RESULT=="node *", NAME="%c{1}", SYMLINK+="%c{2+}"

-EOF
-       },
-       {
-               desc            => "ignore rule test",
-               subsys          => "block",
-               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
-               exp_name        => "nothing",
-               not_exp_name    => "node",
-               exp_add_error   => "yes",
-               rules           => <<EOF
-SUBSYSTEMS=="scsi", KERNEL=="sda", NAME="node", OPTIONS="ignore_device"

 EOF
        },
        {
 EOF
        },
        {


@@ -1112,7 +1092,7 @@ EOF
                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "sda",
                rules           => <<EOF
                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                exp_name        => "sda",
                rules           => <<EOF

-SUBSYSTEMS=="scsi", KERNEL=="sda", PROGRAM=="/bin/echo %p", RESULT=="/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda" NAME="%k"
+SUBSYSTEMS=="scsi", KERNEL=="sda", PROGRAM=="/bin/echo %p", RESULT=="/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda"

 EOF
        },
        {
 EOF
        },
        {