]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test/udev-test.pl: Make some tests a little harder
authorMartin Wilck <mwilck@suse.com>
Tue, 24 Apr 2018 16:09:50 +0000 (18:09 +0200)
committerMichal Sekletár <msekleta@redhat.com>
Mon, 2 Nov 2020 10:43:14 +0000 (11:43 +0100)
Add some rules that make it a bit harder to pass, mainly the
non-existence checks.

test/udev-test.pl

index 58ce49c161774960bae7ba81681df99b7b3a8131..a2f9748d0ae603dff9df83d4f47fbc1a1446d0f5 100755 (executable)
@@ -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"