richardphibel / rpms / systemd

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