summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Sekletar <msekleta@redhat.com>2021-03-02 12:57:59 -0500
committerThe Plumber <50238977+systemd-rhel-bot@users.noreply.github.com>2021-03-04 13:26:05 +0100
commitb05c8d2e10c773b9bcae17055be48a2291ca6fa6 (patch)
tree6ce2cae2f88b422f5b925578d6ae0744d834e627
parent2e50a00f6930f1c65ca804b78f4a853e2ae2d2c0 (diff)
downloadsystemd-b05c8d2e10c773b9bcae17055be48a2291ca6fa6.tar.gz
Revert "test: add test cases for empty string match" and "test: add test case for multi matches when use ||"
This effectively reverts commits 03bc565e6e3249385c4e1ca0ae27670ca2ad9a41 and 03b766cc937ffa4dcb7cfb25b2ac20d8a00cb6db. Resolves: #1931947
-rwxr-xr-xtest/udev-test.pl98
1 files changed, 0 insertions, 98 deletions
diff --git a/test/udev-test.pl b/test/udev-test.pl
index 5b1e33504e..0612859cda 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -1735,104 +1735,6 @@ KERNEL=="ttyACM0a|nothing", SYMLINK+="wrong3"
EOF
},
{
- desc => "test multi matches 5",
- devices => [
- {
- devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
- exp_links => ["found"],
- not_exp_name => "bad",
- }],
- rules => <<EOF
-KERNEL=="sda", TAG="foo"
-TAGS=="|foo", SYMLINK+="found"
-TAGS=="|aaa", SYMLINK+="bad"
-EOF
- },
- {
- desc => "test multi matches 6",
- devices => [
- {
- devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
- exp_links => ["found"],
- not_exp_name => "bad",
- }],
- rules => <<EOF
-KERNEL=="sda", TAG=""
-TAGS=="|foo", SYMLINK+="found"
-TAGS=="aaa|bbb", SYMLINK+="bad"
-EOF
- },
- {
- desc => "test multi matches 7",
- devices => [
- {
- devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
- exp_links => ["found"],
- not_exp_name => "bad",
- }],
- rules => <<EOF
-KERNEL=="sda", TAG="foo"
-TAGS=="foo||bar", SYMLINK+="found"
-TAGS=="aaa||bbb", SYMLINK+="bad"
-EOF
- },
- {
- desc => "test multi matches 8",
- devices => [
- {
- devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
- exp_links => ["found"],
- not_exp_name => "bad",
- }],
- rules => <<EOF
-KERNEL=="sda", TAG=""
-TAGS=="foo||bar", SYMLINK+="found"
-TAGS=="aaa|bbb", SYMLINK+="bad"
-EOF
- },
- {
- desc => "test multi matches 9",
- devices => [
- {
- devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
- exp_links => ["found"],
- not_exp_name => "bad",
- }],
- rules => <<EOF
-KERNEL=="sda", TAG="foo"
-TAGS=="foo|", SYMLINK+="found"
-TAGS=="aaa|", SYMLINK+="bad"
-EOF
- },
- {
- desc => "test multi matches 10",
- devices => [
- {
- devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
- exp_links => ["found"],
- not_exp_name => "bad",
- }],
- rules => <<EOF
-KERNEL=="sda", TAG=""
-TAGS=="foo|", SYMLINK+="found"
-TAGS=="aaa|bbb", SYMLINK+="bad"
-EOF
- },
- {
- desc => "test multi matches 11",
- devices => [
- {
- devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
- exp_links => ["found"],
- not_exp_name => "bad",
- }],
- rules => <<EOF
-KERNEL=="sda", TAG="c"
-TAGS=="foo||bar||c", SYMLINK+="found"
-TAGS=="aaa||bbb||ccc", SYMLINK+="bad"
-EOF
- },
- {
desc => "IMPORT parent test",
devices => [
{