[PATCH] correct enum device_type

[elogind.git] / test / udev-test.pl

diff --git a/test/udev-test.pl b/test/udev-test.pl
index f442b162ec31cf5ff314480b269284ec5ff30e13..c7e1a9d47e7f4d3898f9a070e1e4b7d2853888a1 100644 (file)
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -237,7 +237,7 @@ EOF
                devpath         => "/block/sda/sda3",
                exp_name        => "first_disk3" ,
                conf            => <<EOF
-BUS="scsi", PLACE="0:0:0:0", NAME="first_disk%n"
+BUS="scsi", ID="0:0:0:0", NAME="first_disk%n"
 EOF
        },
        {
@@ -246,7 +246,7 @@ EOF
                devpath         => "/block/sda/sda3",
                exp_name        => "Major:8:minor:3:kernelnumber:3:bus:0:0:0:0" ,
                conf            => <<EOF
-BUS="scsi", PLACE="0:0:0:0", NAME="Major:%M:minor:%m:kernelnumber:%n:bus:%b"
+BUS="scsi", ID="0:0:0:0", NAME="Major:%M:minor:%m:kernelnumber:%n:bus:%b"
 EOF
        },
        {
@@ -255,7 +255,7 @@ EOF
                devpath         => "/block/sda/sda3",
                exp_name        => "M8-m3-n3-b0:0-sIBM" ,
                conf            => <<EOF
-BUS="scsi", PLACE="0:0:0:0", NAME="M%M-m%m-n%n-b%3b-s%3s{vendor}"
+BUS="scsi", ID="0:0:0:0", NAME="M%M-m%m-n%n-b%3b-s%3s{vendor}"
 EOF
        },
        {
@@ -776,29 +776,6 @@ EOF
                exp_rem_error   => "yes",
                conf            => <<EOF
 BUS="scsi", KERNEL="sda", NAME="link", SYMLINK="."
-EOF
-       },
-       {
-               desc            => "symlink to empty name",
-               subsys          => "block",
-               devpath         => "/block/sda",
-               exp_name        => "symlink",
-               exp_target      => "",
-               exp_add_error   => "yes",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", NAME="", SYMLINK="symlink"
-EOF
-       },
-       {
-               desc            => "symlink and name empty",
-               subsys          => "block",
-               devpath         => "/block/sda",
-               exp_name        => "",
-               exp_target      => "",
-               exp_add_error   => "yes",
-               exp_rem_error   => "yes",
-               conf            => <<EOF
-BUS="scsi", KERNEL="sda", NAME="", SYMLINK=""
 EOF
        },
        {