daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
6136c1
From 2d0b828715e67f7accda6f73481deb74febebcb6 Mon Sep 17 00:00:00 2001
6136c1
From: Martin Wilck <mwilck@suse.com>
6136c1
Date: Tue, 24 Apr 2018 18:08:18 +0200
6136c1
Subject: [PATCH] test/udev-test.pl: last_rule is unsupported
6136c1
6136c1
the "last_rule" option hasn't been supported for some time.
6136c1
Therefore this test fails if a "not_exp_links" attribute is added,
6136c1
as it should be. Mark it appropriately.
6136c1
6136c1
(cherry picked from commit 17cce031531a5d3f38a27374c99d1bdba5959dbd)
6136c1
6136c1
Related: #1642728
6136c1
---
6136c1
 test/udev-test.pl | 3 +++
6136c1
 1 file changed, 3 insertions(+)
6136c1
6136c1
diff --git a/test/udev-test.pl b/test/udev-test.pl
6136c1
index d5d0e130e3..a9c2dd95f1 100755
6136c1
--- a/test/udev-test.pl
6136c1
+++ b/test/udev-test.pl
6136c1
@@ -1373,11 +1373,14 @@ SUBSYSTEMS=="scsi", KERNEL=="sda1", SYMLINK+="start-%r-end"
6136c1
 EOF
6136c1
         },
6136c1
         {
6136c1
+                # This is not supported any more
6136c1
                 desc            => "last_rule option",
6136c1
                 devices => [
6136c1
                         {
6136c1
                                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
6136c1
                                 exp_links       => ["last"],
6136c1
+                                not_exp_links   => ["very-last"],
6136c1
+                                exp_nodev_error => "yes",
6136c1
                         }],
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", KERNEL=="sda1", SYMLINK+="last", OPTIONS="last_rule"