X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=test%2Fudev-test.pl;h=0700e535767ef79d9115bede4e9d0a9405b8d1c5;hp=ab27c74c6a5d5d103d4c6c76efe6c909972d11e2;hb=724257d97b452dd563ea1a3a5cdc53b18e8dcb34;hpb=ac28b86d631f23b5df74dbeb33e76a2b3f5d88bb

diff --git a/test/udev-test.pl b/test/udev-test.pl
index ab27c74c6..0700e5357 100644
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -203,6 +203,15 @@ EOF
 		expected => "test-0:0:0:0" ,
 		conf     => <<EOF
 BUS="scsi", PROGRAM="/bin/echo -n test-%b", RESULT="test-0:0*", NAME="%c"
+EOF
+	},
+	{
+		desc     => "program with escaped format char (tricky: callout returns format char!)",
+		subsys   => "block",
+		devpath  => "block/sda/sda3",
+		expected => "escape-3" ,
+		conf     => <<EOF
+BUS="scsi", PROGRAM="/bin/echo -n escape-%%n", KERNEL="sda3", NAME="%c"
 EOF
 	},
 	{
@@ -252,24 +261,6 @@ EOF
 		conf     => <<EOF
 SYSFS_dev="5:1", NAME="foo"
 KERNEL="console", NAME="TTY"
-EOF
-	},
-	{
-		desc     => "devfs disk naming substitution",
-		subsys   => "block",
-		devpath  => "block/sda",
-		expected => "lun0/disc" ,
-		conf     => <<EOF
-BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="lun0/%D"
-EOF
-	},
-	{
-		desc     => "devfs disk naming substitution",
-		subsys   => "block",
-		devpath  => "block/sda/sda2",
-		expected => "lun0/part2" ,
-		conf     => <<EOF
-BUS="scsi", SYSFS_vendor="IBM-ESXS", NAME="lun0/%D"
 EOF
 	},
 	{
@@ -326,6 +317,15 @@ EOF
 		expected => "second-0" ,
 		conf     => <<EOF
 KERNEL="ttyUSB0", NAME="visor", SYMLINK="first-%n second-%n third-%n"
+EOF
+	},
+	{
+		desc     => "sysfs parent heirachy",
+		subsys   => "tty",
+		devpath  => "class/tty/ttyUSB0",
+		expected => "visor" ,
+		conf     => <<EOF
+SYSFS_idProduct="2008", NAME="visor"
 EOF
 	},
 );