21255d
From b05c8d2e10c773b9bcae17055be48a2291ca6fa6 Mon Sep 17 00:00:00 2001
21255d
From: Michal Sekletar <msekleta@redhat.com>
21255d
Date: Tue, 2 Mar 2021 12:57:59 -0500
21255d
Subject: [PATCH] Revert "test: add test cases for empty string match" and
21255d
 "test: add test case for multi matches when use ||"
21255d
21255d
This effectively reverts commits 03bc565e6e3249385c4e1ca0ae27670ca2ad9a41
21255d
and 03b766cc937ffa4dcb7cfb25b2ac20d8a00cb6db.
21255d
21255d
Resolves: #1931947
21255d
---
21255d
 test/udev-test.pl | 98 -----------------------------------------------
21255d
 1 file changed, 98 deletions(-)
21255d
21255d
diff --git a/test/udev-test.pl b/test/udev-test.pl
21255d
index 5b1e33504e..0612859cda 100755
21255d
--- a/test/udev-test.pl
21255d
+++ b/test/udev-test.pl
21255d
@@ -1732,104 +1732,6 @@ KERNEL=="dontknow|ttyACM0a|nothing|attyACM0", SYMLINK+="wrong1"
21255d
 KERNEL=="X|attyACM0|dontknow|ttyACM0a|nothing|attyACM0", SYMLINK+="wrong2"
21255d
 KERNEL=="all|dontknow|ttyACM0", SYMLINK+="right"
21255d
 KERNEL=="ttyACM0a|nothing", SYMLINK+="wrong3"
21255d
-EOF
21255d
-        },
21255d
-        {
21255d
-               desc            => "test multi matches 5",
21255d
-               devices => [
21255d
-                       {
21255d
-                               devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
21255d
-                               exp_links       => ["found"],
21255d
-                               not_exp_name    => "bad",
21255d
-                       }],
21255d
-                rules           => <
21255d
-KERNEL=="sda", TAG="foo"
21255d
-TAGS=="|foo", SYMLINK+="found"
21255d
-TAGS=="|aaa", SYMLINK+="bad"
21255d
-EOF
21255d
-        },
21255d
-        {
21255d
-                desc            => "test multi matches 6",
21255d
-                devices => [
21255d
-                        {
21255d
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
21255d
-                                exp_links       => ["found"],
21255d
-                                not_exp_name    => "bad",
21255d
-                       }],
21255d
-                rules           => <
21255d
-KERNEL=="sda", TAG=""
21255d
-TAGS=="|foo", SYMLINK+="found"
21255d
-TAGS=="aaa|bbb", SYMLINK+="bad"
21255d
-EOF
21255d
-        },
21255d
-        {
21255d
-                desc            => "test multi matches 7",
21255d
-                devices => [
21255d
-                        {
21255d
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
21255d
-                                exp_links       => ["found"],
21255d
-                                not_exp_name    => "bad",
21255d
-                        }],
21255d
-                rules           => <
21255d
-KERNEL=="sda", TAG="foo"
21255d
-TAGS=="foo||bar", SYMLINK+="found"
21255d
-TAGS=="aaa||bbb", SYMLINK+="bad"
21255d
-EOF
21255d
-        },
21255d
-        {
21255d
-                desc            => "test multi matches 8",
21255d
-                devices => [
21255d
-                        {
21255d
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
21255d
-                                exp_links       => ["found"],
21255d
-                                not_exp_name    => "bad",
21255d
-                        }],
21255d
-                rules           => <
21255d
-KERNEL=="sda", TAG=""
21255d
-TAGS=="foo||bar", SYMLINK+="found"
21255d
-TAGS=="aaa|bbb", SYMLINK+="bad"
21255d
-EOF
21255d
-        },
21255d
-        {
21255d
-                desc            => "test multi matches 9",
21255d
-                devices => [
21255d
-                        {
21255d
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
21255d
-                                exp_links       => ["found"],
21255d
-                                not_exp_name    => "bad",
21255d
-                        }],
21255d
-                rules           => <
21255d
-KERNEL=="sda", TAG="foo"
21255d
-TAGS=="foo|", SYMLINK+="found"
21255d
-TAGS=="aaa|", SYMLINK+="bad"
21255d
-EOF
21255d
-        },
21255d
-        {
21255d
-                desc            => "test multi matches 10",
21255d
-                devices => [
21255d
-                        {
21255d
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
21255d
-                                exp_links       => ["found"],
21255d
-                                not_exp_name    => "bad",
21255d
-                        }],
21255d
-                rules           => <
21255d
-KERNEL=="sda", TAG=""
21255d
-TAGS=="foo|", SYMLINK+="found"
21255d
-TAGS=="aaa|bbb", SYMLINK+="bad"
21255d
-EOF
21255d
-        },
21255d
-        {
21255d
-                desc            => "test multi matches 11",
21255d
-                devices => [
21255d
-                        {
21255d
-                                devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
21255d
-                                exp_links       => ["found"],
21255d
-                                not_exp_name    => "bad",
21255d
-                        }],
21255d
-                rules           => <
21255d
-KERNEL=="sda", TAG="c"
21255d
-TAGS=="foo||bar||c", SYMLINK+="found"
21255d
-TAGS=="aaa||bbb||ccc", SYMLINK+="bad"
21255d
 EOF
21255d
         },
21255d
         {