summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Wilck <mwilck@suse.com>2018-04-24 18:09:50 +0200
committerThe Plumber <50238977+systemd-rhel-bot@users.noreply.github.com>2021-01-25 15:05:18 +0100
commit134a415c2d690e57d0f1add23e900e60bcef4627 (patch)
tree151017ac89e374911e38fd38faaf500c5370b2ef
parent2d0b828715e67f7accda6f73481deb74febebcb6 (diff)
downloadsystemd-134a415c2d690e57d0f1add23e900e60bcef4627.tar.gz
test/udev-test.pl: Make some tests a little harder
Add some rules that make it a bit harder to pass, mainly the non-existence checks. (cherry picked from commit 06d4d4e24e7d0b51120b165e540d278842e8b1a3) Related: #1642728
-rwxr-xr-xtest/udev-test.pl13
1 files changed, 9 insertions, 4 deletions
diff --git a/test/udev-test.pl b/test/udev-test.pl
index a9c2dd95f1..7465b5859e 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -1358,7 +1358,7 @@ EOF
exp_links => ["sda-part-1"],
}],
rules => <<EOF
-SUBSYSTEMS=="scsi", KERNEL=="sda1", SYMLINK+="%P-part-1"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", SYMLINK+="%P-part-%n"
EOF
},
{
@@ -1486,6 +1486,7 @@ SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}="true"
SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}="absolutely-\$env{ASSIGN}"
SUBSYSTEMS=="scsi", KERNEL=="sda1", SYMLINK+="before"
SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}=="yes", SYMLINK+="no"
+SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}=="true", SYMLINK+="bad"
SUBSYSTEMS=="scsi", KERNEL=="sda1", ENV{ASSIGN}=="absolutely-true", SYMLINK+="true"
EOF
},
@@ -1497,6 +1498,11 @@ EOF
exp_links => ["part"],
not_exp_links => ["disk"],
},
+ {
+ devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
+ exp_links => ["disk"],
+ not_exp_links => ["part"],
+ },
],
rules => <<EOF
SUBSYSTEM=="block", KERNEL=="*[0-9]", ENV{PARTITION}="true", ENV{MAINDEVICE}="false"
@@ -1588,7 +1594,7 @@ EOF
}],
rules => <<EOF
KERNEL=="sda", GROUP:="tty"
-KERNEL=="sda", GROUP="not-ok", MODE="0640", SYMLINK+="ok"
+KERNEL=="sda", GROUP="root", MODE="0640", SYMLINK+="ok"
EOF
},
{
@@ -1602,7 +1608,7 @@ EOF
rules => <<EOF
KERNEL=="sda", GROUP:="tty"
SUBSYSTEM=="block", MODE:="640"
-KERNEL=="sda", GROUP="not-ok", MODE="0666", SYMLINK+="ok"
+KERNEL=="sda", GROUP="root", MODE="0666", SYMLINK+="ok"
EOF
},
{
@@ -1983,7 +1989,6 @@ EOF
{
devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
exp_perms => "1:1:0400",
- exp_rem_error => "yes",
}],
rules => <<EOF
KERNEL=="sda", MODE="666"