From: Martin Wilck <mwilck@suse.com>
Date: Tue, 24 Apr 2018 16:27:25 +0000 (+0200)
Subject: test/udev-test.pl: merge "space and var with space" tests
X-Git-Tag: v247-rc2~12^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2084fe0d3290c525ecb9faa07d07c3abc2488e59;p=thirdparty%2Fsystemd.git

test/udev-test.pl: merge "space and var with space" tests

As we can check multiple links in a single test now, these 3
tests can be merged into one.
---

diff --git a/test/udev-test.pl b/test/udev-test.pl
index cd533a7cf5d..097b9e20b7a 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -1103,34 +1103,9 @@ EOF
                 devices => [
                         {
                                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
-                                exp_links        => ["first"],
-                                not_exp_links    => [" "],
-                        }],
-                rules           => <<EOF
-ENV{WITH_WS}="   one  two  three   "
-SYMLINK="  first  name-\$env{WITH_WS}-end another_symlink a b c "
-EOF
-        },
-        {
-                desc            => "symlink with space and var with space, part 2",
-                devices => [
-                        {
-                                devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
-                                exp_links        => ["name-one_two_three-end"],
-                                not_exp_links    => [" "],
-                        }],
-                rules           => <<EOF
-ENV{WITH_WS}="   one  two  three   "
-SYMLINK="  first  name-\$env{WITH_WS}-end another_symlink a b c "
-EOF
-        },
-        {
-                desc            => "symlink with space and var with space, part 3",
-                devices => [
-                        {
-                                devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
-                                exp_links        => ["another_symlink"],
-                                not_exp_links    => [" "],
+                                exp_links       => ["first", "name-one_two_three-end",
+                                                    "another_symlink", "a", "b", "c"],
+                                not_exp_links   => [" "],
                         }],
                 rules           => <<EOF
 ENV{WITH_WS}="   one  two  three   "