X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test%2Fudev-test.pl;h=593e34e885600b26f84e8d4251492928f205dc36;hb=55b0508969652acc71114b0b1205226ad3d27f39;hp=5f6f864df2f137aff9cf6321dd53154e60b7b7bf;hpb=6818c51d7abeab9914eb7193968b1efa9459a853;p=elogind.git

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 5f6f864df..593e34e88 100644
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -1105,7 +1105,28 @@ KERNEL="sda", NAME="cdrom%e"
 EOF
 	},
 	{
-		desc		=> "SUBSYSTEM test",
+		desc		=> "ignore remove event test",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "node",
+		exp_error	=> "yes",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", NAME{ignore_remove}="node"
+EOF
+	},
+	{
+		desc		=> "ignore remove event test (with all partitions)",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "node14",
+		exp_error	=> "yes",
+		option		=> "clear",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", NAME{ignore_remove, all_partitions}="node"
+EOF
+	},
+	{
+		desc		=> "SUBSYSTEM match test",
 		subsys		=> "block",
 		devpath		=> "/block/sda",
 		exp_name	=> "node",
@@ -1113,6 +1134,16 @@ EOF
 BUS="scsi", KERNEL="sda", NAME="should_not_match", SUBSYSTEM="vc"
 BUS="scsi", KERNEL="sda", NAME="node", SUBSYSTEM="block"
 BUS="scsi", KERNEL="sda", NAME="should_not_match2", SUBSYSTEM="vc"
+EOF
+	},
+	{
+		desc		=> "DRIVER match test",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "node",
+		conf		=> <<EOF
+BUS="scsi", KERNEL="sda", NAME="should_not_match", DRIVER="sd-wrong"
+BUS="scsi", KERNEL="sda", NAME="node", DRIVER="sd"
 EOF
 	},
 );
@@ -1122,6 +1153,7 @@ $ENV{UDEV_TEST} = "yes";
 $ENV{SYSFS_PATH} = $sysfs;
 $ENV{UDEV_CONFIG_FILE} = $main_conf;
 $ENV{UDEV_NO_DEVD} = "yes";
+$ENV{UDEV_NO_HOTPLUGD} = "yes";
 
 
 sub udev {