From: Kay Sievers <kay.sievers@vrfy.org>
Date: Fri, 17 Oct 2008 11:54:50 +0000 (+0200)
Subject: test: fix a few unintentially wrongly written rules which cause parse errors
X-Git-Tag: 174~1430
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d960ad1546548d4b7aaf35e8b8f2cef652449ee7;p=systemd

test: fix a few unintentially wrongly written rules which cause parse errors
---

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 4c6a70f1..243e9619 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -92,7 +92,7 @@ SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS", NAME="boot
 EOF
 	},
 	{
-		desc		=> "label test of max sysfs files",
+		desc		=> "label test of max sysfs files (skip invalid rule)",
 		subsys		=> "block",
 		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
 		exp_name	=> "boot_disk1" ,
@@ -230,7 +230,7 @@ EOF
 #
 \\
 
-\\\\
+\\
 
 #\\
 
@@ -1249,7 +1249,7 @@ SUBSYSTEM=="block", KERNEL=="*[0-9]", ENV{PARTITION}="true", ENV{MAINDEVICE}="fa
 SUBSYSTEM=="block", KERNEL=="*[!0-9]", ENV{PARTITION}="false", ENV{MAINDEVICE}="true"
 ENV{MAINDEVICE}=="true", NAME="disk"
 ENV{PARTITION}=="true", NAME="part"
-NAME="bad"
+SUBSYSTEM=="block", NAME="bad"
 EOF
 	},
 	{
@@ -1365,20 +1365,20 @@ EOF
 		subsys		=> "block",
 		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
 		exp_name	=> "ok",
-		exp_perms	=> "root:nobody:0640",
+		exp_perms	=> "root:tty:0640",
 		rules		=> <<EOF
-KERNEL=="sda", GROUP:="nobody"
+KERNEL=="sda", GROUP:="tty"
 KERNEL=="sda", GROUP="not-ok", MODE="0640", NAME="ok"
 EOF
 	},
 	{
-		desc		=> "final assignment",
+		desc		=> "final assignment 2",
 		subsys		=> "block",
 		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
 		exp_name	=> "ok",
-		exp_perms	=> "root:nobody:0640",
+		exp_perms	=> "root:tty:0640",
 		rules		=> <<EOF
-KERNEL=="sda", GROUP:="nobody"
+KERNEL=="sda", GROUP:="tty"
 SUBSYSTEM=="block", MODE:="640"
 KERNEL=="sda", GROUP="not-ok", MODE="0666", NAME="ok"
 EOF
@@ -1537,8 +1537,8 @@ EOF
 		exp_name	=> "yes",
 		rules		=> <<EOF
 # 012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
-   # 012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
-KERNEL="sda1", NAME=="no"
+   # 012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
+KERNEL=="sda1", NAME=="no"
 KERNEL=="sda1", NAME="yes"
 EOF
 	},
@@ -1558,7 +1558,17 @@ EOF
 		exp_name	=> "there",
 		rules		=> <<EOF
 TEST=="/etc/hosts", NAME="there"
-NAME="notthere"
+TEST!="/etc/hosts", NAME="notthere"
+EOF
+	},
+	{
+		desc		=> "TEST invalid NAME= only (skip invalid rule)",
+		subsys		=> "block",
+		devpath		=> "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+		exp_name	=> "yes",
+		rules		=> <<EOF
+SUBSYSTEM=="block", NAME="yes"
+NAME="no"
 EOF
 	},
 	{