daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
6136c1
From 0e0b90ffcf0731865846bfa2754a809cc2b8c53e Mon Sep 17 00:00:00 2001
6136c1
From: Martin Wilck <mwilck@suse.com>
6136c1
Date: Tue, 24 Apr 2018 17:57:47 +0200
6136c1
Subject: [PATCH] test/udev-test.pl: fix wrong test descriptions
6136c1
6136c1
udev hasn't supported renaming device nodes for some time.
6136c1
6136c1
(cherry picked from commit 46bc71b2b73f8a1e27dc5e142730e9877dd05e3e)
6136c1
6136c1
Related: #1642728
6136c1
---
6136c1
 test/udev-test.pl | 15 ++++++++-------
6136c1
 1 file changed, 8 insertions(+), 7 deletions(-)
6136c1
6136c1
diff --git a/test/udev-test.pl b/test/udev-test.pl
6136c1
index f5edecefd0..d5d0e130e3 100755
6136c1
--- a/test/udev-test.pl
6136c1
+++ b/test/udev-test.pl
6136c1
@@ -212,7 +212,7 @@ KERNEL=="ttyACM[0-9]*", SYMLINK+="modem/%n"
6136c1
 EOF
6136c1
         },
6136c1
         {
6136c1
-                desc            => "replace kernel name",
6136c1
+                desc            => "don't replace kernel name",
6136c1
                 devices => [
6136c1
                         {
6136c1
                                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
6136c1
@@ -223,7 +223,7 @@ KERNEL=="ttyACM0", SYMLINK+="modem"
6136c1
 EOF
6136c1
         },
6136c1
         {
6136c1
-                desc            => "Handle comment lines in config file (and replace kernel name)",
6136c1
+                desc            => "Handle comment lines in config file (and don't replace kernel name)",
6136c1
                 devices => [
6136c1
                         {
6136c1
                                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
6136c1
@@ -236,7 +236,7 @@ KERNEL=="ttyACM0", SYMLINK+="modem"
6136c1
 EOF
6136c1
         },
6136c1
         {
6136c1
-                desc            => "Handle comment lines in config file with whitespace (and replace kernel name)",
6136c1
+                desc            => "Handle comment lines in config file with whitespace (and don't replace kernel name)",
6136c1
                 devices => [
6136c1
                         {
6136c1
                                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
6136c1
@@ -249,7 +249,7 @@ KERNEL=="ttyACM0", SYMLINK+="modem"
6136c1
 EOF
6136c1
         },
6136c1
         {
6136c1
-                desc            => "Handle whitespace only lines (and replace kernel name)",
6136c1
+                desc            => "Handle whitespace only lines (and don't replace kernel name)",
6136c1
                 devices => [
6136c1
                         {
6136c1
                                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
6136c1
@@ -267,7 +267,7 @@ KERNEL=="ttyACM0", SYMLINK+="whitespace"
6136c1
 EOF
6136c1
         },
6136c1
         {
6136c1
-                desc            => "Handle empty lines in config file (and replace kernel name)",
6136c1
+                desc            => "Handle empty lines in config file (and don't replace kernel name)",
6136c1
                 devices => [
6136c1
                         {
6136c1
                                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
6136c1
@@ -280,7 +280,7 @@ KERNEL=="ttyACM0", SYMLINK+="modem"
6136c1
 EOF
6136c1
         },
6136c1
         {
6136c1
-                desc            => "Handle backslashed multi lines in config file (and replace kernel name)",
6136c1
+                desc            => "Handle backslashed multi lines in config file (and don't replace kernel name)",
6136c1
                 devices => [
6136c1
                         {
6136c1
                                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
6136c1
@@ -303,8 +303,9 @@ EOF
6136c1
 KERNEL=="ttyACM0", PROGRAM=="/bin/echo -e \\101", RESULT=="A", SYMLINK+="aaa"
6136c1
 EOF
6136c1
         },
6136c1
+        # 20
6136c1
         {
6136c1
-                desc            => "Handle stupid backslashed multi lines in config file (and replace kernel name)",
6136c1
+                desc            => "Handle stupid backslashed multi lines in config file (and don't replace kernel name)",
6136c1
                 devices => [
6136c1
                         {
6136c1
                                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",