X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=test%2Fudev-test.pl;h=9a88d062715cc823f6c62956bdeb58af5f3a151e;hp=33da68a386fc0aa4ba3316a142ef6913ea880635;hb=c8ff4b3db440f1c3124b0e4e4efc68f1177c5964;hpb=d59c84effdc50961bdbe01dcc41d71c8609e6700

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 33da68a38..9a88d0627 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -862,6 +862,7 @@ EOF
 		devpath		=> "/class/tty/tty0",
 		exp_name	=> "link",
 		exp_target	=> "link",
+		exp_add_error	=> "yes",
 		exp_rem_error	=> "yes",
 		option		=> "clean",
 		rules		=> <<EOF
@@ -1007,74 +1008,6 @@ EOF
 		exp_target	=> "node",
 		rules		=> <<EOF
 BUS=="scsi", PROGRAM=="/bin/echo -n node link1 link2 link3 link4", RESULT=="node *", NAME="%c{1}", SYMLINK+="%c{2+}"
-EOF
-	},
-	{
-		desc		=> "enumeration char test (single test)",
-		subsys		=> "block",
-		devpath		=> "/block/sda",
-		exp_name	=> "cdrom",
-		rules		=> <<EOF
-KERNEL=="sda", NAME="cdrom%e"
-EOF
-	},
-	{
-		desc		=> "enumeration char test sequence 1/5 (keep)",
-		subsys		=> "block",
-		devpath		=> "/block/sda",
-		exp_name	=> "cdrom",
-		option		=> "keep",
-		rules		=> <<EOF
-KERNEL=="sda", NAME="cdrom%e"
-EOF
-	},
-	{
-		desc		=> "enumeration char test sequence 2/5 (keep)",
-		subsys		=> "block",
-		devpath		=> "/block/sda/sda1",
-		exp_name	=> "enum",
-		option		=> "keep",
-		rules		=> <<EOF
-KERNEL=="sda1", NAME="enum%e"
-EOF
-	},
-	{
-		desc		=> "enumeration char test sequence 3/5 (keep)",
-		subsys		=> "block",
-		devpath		=> "/block/sda/sda2",
-		exp_name	=> "cdrom1",
-		option		=> "keep",
-		rules		=> <<EOF
-KERNEL=="sda2", NAME="cdrom%e"
-EOF
-	},
-	{
-		desc		=> "enumeration char test sequence 4/5 (keep)",
-		subsys		=> "block",
-		devpath		=> "/block/sda/sda3",
-		exp_name	=> "enum1",
-		option		=> "keep",
-		rules		=> <<EOF
-KERNEL=="sda3", NAME="enum%e"
-EOF
-	},
-	{
-		desc		=> "enumeration char test sequence 5/5 (clean)",
-		subsys		=> "block",
-		devpath		=> "/block/sda/sda4",
-		exp_name	=> "cdrom2",
-		option		=> "clean",
-		rules		=> <<EOF
-KERNEL=="sda4", NAME="cdrom%e"
-EOF
-	},
-	{
-		desc		=> "enumeration char test after cleanup (single test)",
-		subsys		=> "block",
-		devpath		=> "/block/sda",
-		exp_name	=> "cdrom",
-		rules		=> <<EOF
-KERNEL=="sda", NAME="cdrom%e"
 EOF
 	},
 	{