From: Martin Wilck <mwilck@suse.com>
Date: Tue, 24 Apr 2018 16:30:09 +0000 (+0200)
Subject: test/udev-test.pl: merge import parent tests into one
X-Git-Tag: v247-rc2~12^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a96cd21d31cb7af211862768e133b50b085634e7;p=thirdparty%2Fsystemd.git

test/udev-test.pl: merge import parent tests into one

As we can test multiple devices and multiple links per device
in one test now, these two tests can be merged into one.
---

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 097b9e20b7a..3228614ebef 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -1781,28 +1781,21 @@ TAGS=="aaa||bbb||ccc", SYMLINK+="bad"
 EOF
         },
         {
-                desc            => "IMPORT parent test sequence 1/2 (keep)",
+                desc            => "IMPORT parent test",
                 devices => [
                         {
                                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
                                 exp_links       => ["parent"],
-                        }],
-                option          => "keep",
-                rules           => <<EOF
-KERNEL=="sda", IMPORT{program}="/bin/echo -e \'PARENT_KEY=parent_right\\nWRONG_PARENT_KEY=parent_wrong'"
-KERNEL=="sda", SYMLINK+="parent"
-EOF
-        },
-        {
-                desc            => "IMPORT parent test sequence 2/2 (keep)",
-                devices => [
+                        },
                         {
                                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
                                 exp_links       => ["parentenv-parent_right"],
                         }],
-                option          => "clean",
+                sleep_us        => 500000,  # Serialized! We need to sleep here after adding sda
                 rules           => <<EOF
 KERNEL=="sda1", IMPORT{parent}="PARENT*", SYMLINK+="parentenv-\$env{PARENT_KEY}\$env{WRONG_PARENT_KEY}"
+KERNEL=="sda", IMPORT{program}="/bin/echo -e \'PARENT_KEY=parent_right\\nWRONG_PARENT_KEY=parent_wrong'"
+KERNEL=="sda", SYMLINK+="parent"
 EOF
         },
         {