summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2012-02-20 00:41:58 +0100
committerKay Sievers <kay.sievers@vrfy.org>2012-02-20 00:41:58 +0100
commit0f52fdee378796df26021208dc684f77be1f877f (patch)
tree569a222c217875d25a0b6715849445fa3e2844fb
parenta82034ba58f0bce6289fd6e550f1433f97aa74ab (diff)
test: remove outdated key attributes
-rwxr-xr-xtest/rule-syntax-check.py2
-rwxr-xr-xtest/udev-test.pl4
2 files changed, 3 insertions, 3 deletions
diff --git a/test/rule-syntax-check.py b/test/rule-syntax-check.py
index a94a965a48..ff1b63d075 100755
--- a/test/rule-syntax-check.py
+++ b/test/rule-syntax-check.py
@@ -27,7 +27,7 @@ if len(sys.argv) < 2:
no_args_tests = re.compile('(ACTION|DEVPATH|KERNELS?|NAME|SYMLINK|SUBSYSTEMS?|DRIVERS?|TAG|RESULT|TEST)\s*(?:=|!)=\s*"([^"]*)"$')
args_tests = re.compile('(ATTRS?|ENV|TEST){([a-zA-Z0-9/_.*%-]+)}\s*(?:=|!)=\s*"([^"]*)"$')
-no_args_assign = re.compile('(NAME|SYMLINK|SYMLINK{unique}|OWNER|GROUP|MODE|TAG|PROGRAM|RUN|RUN{ignore_error}|LABEL|GOTO|WAIT_FOR|OPTIONS|IMPORT)\s*(?:\+=|:=|=)\s*"([^"]*)"$')
+no_args_assign = re.compile('(NAME|SYMLINK|OWNER|GROUP|MODE|TAG|PROGRAM|RUN|LABEL|GOTO|WAIT_FOR|OPTIONS|IMPORT)\s*(?:\+=|:=|=)\s*"([^"]*)"$')
args_assign = re.compile('(ATTR|ENV|IMPORT){([a-zA-Z0-9/_.*%-]+)}\s*=\s*"([^"]*)"$')
result = 0
diff --git a/test/udev-test.pl b/test/udev-test.pl
index 8afd3e4f77..0706c7ad5f 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -44,7 +44,7 @@ EOF
devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
exp_name => "boot_disk" ,
rules => <<EOF
-SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", SYMLINK+="boot_disk%n", RUN+="socket:@/org/kernel/udev/monitor"
+SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", SYMLINK+="boot_disk%n"
KERNEL=="ttyACM0", SYMLINK+="modem"
EOF
},
@@ -1319,7 +1319,7 @@ EOF
rules => <<EOF
KERNEL=="sda", PROGRAM="/bin/true create-envp"
KERNEL=="sda", ENV{TESTENV}="change-envp"
-KERNEL=="sda", SYMLINK+="%k-%s{[dmi/id]product_name}-end", RUN+="socket:@/org/kernel/udev/monitor"
+KERNEL=="sda", SYMLINK+="%k-%s{[dmi/id]product_name}-end"
EOF
},
{