diff options
| author | Martin Wilck <mwilck@suse.com> | 2018-04-24 18:30:09 +0200 |
|---|---|---|
| committer | Michal Sekletár <msekleta@redhat.com> | 2020-11-02 11:43:15 +0100 |
| commit | a96cd21d31cb7af211862768e133b50b085634e7 (patch) | |
| tree | c4558d942f5825008a80b8a02c4f9e913406be90 /test/udev-test.pl | |
| parent | 2084fe0d3290c525ecb9faa07d07c3abc2488e59 (diff) | |
| download | systemd-a96cd21d31cb7af211862768e133b50b085634e7.tar.gz | |
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.
Diffstat (limited to 'test/udev-test.pl')
| -rwxr-xr-x | test/udev-test.pl | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/test/udev-test.pl b/test/udev-test.pl index 097b9e20b7..3228614ebe 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 }, { |