daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
21255d
From 7821ecc0b35c422bc8ed26e0e44c841d067f88d7 Mon Sep 17 00:00:00 2001
21255d
From: Martin Wilck <mwilck@suse.com>
21255d
Date: Tue, 24 Apr 2018 18:27:25 +0200
21255d
Subject: [PATCH] test/udev-test.pl: merge "space and var with space" tests
21255d
21255d
As we can check multiple links in a single test now, these 3
21255d
tests can be merged into one.
21255d
21255d
(cherry picked from commit 2084fe0d3290c525ecb9faa07d07c3abc2488e59)
21255d
21255d
Related: #1642728
21255d
---
21255d
 test/udev-test.pl | 31 +++----------------------------
21255d
 1 file changed, 3 insertions(+), 28 deletions(-)
21255d
21255d
diff --git a/test/udev-test.pl b/test/udev-test.pl
21255d
index 6928439d14..880a73b10b 100755
21255d
--- a/test/udev-test.pl
21255d
+++ b/test/udev-test.pl
21255d
@@ -1103,34 +1103,9 @@ EOF
21255d
                 devices => [
21255d
                         {
21255d
                                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
21255d
-                                exp_links        => ["first"],
21255d
-                                not_exp_links    => [" "],
21255d
-                        }],
21255d
-                rules           => <
21255d
-ENV{WITH_WS}="   one  two  three   "
21255d
-SYMLINK="  first  name-\$env{WITH_WS}-end another_symlink a b c "
21255d
-EOF
21255d
-        },
21255d
-        {
21255d
-                desc            => "symlink with space and var with space, part 2",
21255d
-                devices => [
21255d
-                        {
21255d
-                                devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
21255d
-                                exp_links        => ["name-one_two_three-end"],
21255d
-                                not_exp_links    => [" "],
21255d
-                        }],
21255d
-                rules           => <
21255d
-ENV{WITH_WS}="   one  two  three   "
21255d
-SYMLINK="  first  name-\$env{WITH_WS}-end another_symlink a b c "
21255d
-EOF
21255d
-        },
21255d
-        {
21255d
-                desc            => "symlink with space and var with space, part 3",
21255d
-                devices => [
21255d
-                        {
21255d
-                                devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
21255d
-                                exp_links        => ["another_symlink"],
21255d
-                                not_exp_links    => [" "],
21255d
+                                exp_links       => ["first", "name-one_two_three-end",
21255d
+                                                    "another_symlink", "a", "b", "c"],
21255d
+                                not_exp_links   => [" "],
21255d
                         }],
21255d
                 rules           => <
21255d
 ENV{WITH_WS}="   one  two  three   "