]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test/udev-test.pl: merge "space and var with space" tests
authorMartin Wilck <mwilck@suse.com>
Tue, 24 Apr 2018 16:27:25 +0000 (18:27 +0200)
committerMichal Sekletár <msekleta@redhat.com>
Mon, 2 Nov 2020 10:43:15 +0000 (11:43 +0100)
As we can check multiple links in a single test now, these 3
tests can be merged into one.

test/udev-test.pl

index cd533a7cf5de78df285bc2ff00b653341676adc8..097b9e20b7aaa4c4448b34d9b9b6b6a9a7ecf53c 100755 (executable)
@@ -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   "