X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=test%2Fudev-test.pl;h=5f9c0cb9c503a46f56660e4d1082d61e0daf9a4f;hp=992fc0019a9398a22da5b24107cf40195c099313;hb=fd9efc00a2e477423185c993b8ec4570ef3ee07d;hpb=f22e9686fd4f8e602e8dc11a4b06765206f26edf

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 992fc0019..5f9c0cb9c 100644
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -1018,6 +1018,37 @@ EOF
 		exp_name	=> "cdrom",
 		conf		=> <<EOF
 KERNEL="sda", NAME="cdrom%e"
+EOF
+	},
+	{
+		desc		=> "ignore rule test",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "node",
+		exp_error	=> "yes",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", NAME="node", OPTIONS="ignore"
+EOF
+	},
+	{
+		desc		=> "all_partitions, option-only rule",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "node6",
+		conf		=> <<EOF
+SUBSYSTEM="block", OPTIONS="all_partitions"
+BUS="scsi", KERNEL="sda", NAME="node"
+EOF
+	},
+	{
+		desc		=> "all_partitions, option-only rule (fail on partition)",
+		subsys		=> "block",
+		devpath		=> "/block/sda/sda1",
+		exp_name	=> "node6",
+		exp_error	=> "yes",
+		conf		=> <<EOF
+SUBSYSTEM="block", OPTIONS="all_partitions"
+BUS="scsi", KERNEL="sda", NAME="node"
 EOF
 	},
 	{
@@ -1027,7 +1058,7 @@ EOF
 		exp_name	=> "node",
 		exp_error	=> "yes",
 		conf		=> <<EOF
-BUS="scsi", KERNEL="sda", NAME{ignore_remove}="node"
+BUS="scsi", KERNEL="sda", NAME="node", OPTIONS="ignore_remove"
 EOF
 	},
 	{
@@ -1038,7 +1069,7 @@ EOF
 		exp_error	=> "yes",
 		option		=> "clear",
 		conf		=> <<EOF
-BUS="scsi", KERNEL="sda", NAME{ignore_remove, all_partitions}="node"
+BUS="scsi", KERNEL="sda", NAME="node", OPTIONS="ignore_remove, all_partitions"
 EOF
 	},
 	{
@@ -1066,9 +1097,9 @@ EOF
 		desc		=> "temporary node creation test",
 		subsys		=> "block",
 		devpath		=> "/block/sda",
-		exp_name	=> "sda",
+		exp_name	=> "node",
 		conf		=> <<EOF
-BUS="scsi", KERNEL="sda", PROGRAM="/usr/bin/test -b %N" NAME="%N"
+BUS="scsi", KERNEL="sda", PROGRAM="/usr/bin/test -b %N" NAME="node"
 EOF
 	},
 	{