daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
6136c1
From 7898cd7e75f40627651cec134e3ac3a80176759a Mon Sep 17 00:00:00 2001
6136c1
From: Yu Watanabe <watanabe.yu+github@gmail.com>
6136c1
Date: Thu, 21 Feb 2019 18:04:12 +0900
6136c1
Subject: [PATCH] test-udev: fix alignment and drop unnecessary white spaces
6136c1
6136c1
(cherry picked from commit 3dd2d524141d09d57443ae339e1a77d7ce40f847)
6136c1
6136c1
Related: #1642728
6136c1
---
6136c1
 test/udev-test.pl | 114 +++++++++++++++++++++++-----------------------
6136c1
 1 file changed, 57 insertions(+), 57 deletions(-)
6136c1
6136c1
diff --git a/test/udev-test.pl b/test/udev-test.pl
6136c1
index 002fabd9fd..122359e377 100755
6136c1
--- a/test/udev-test.pl
6136c1
+++ b/test/udev-test.pl
6136c1
@@ -49,7 +49,7 @@ my @tests = (
6136c1
         {
6136c1
                 desc            => "no rules",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
6136c1
-                exp_name        => "sda" ,
6136c1
+                exp_name        => "sda",
6136c1
                 exp_rem_error   => "yes",
6136c1
                 rules           => <
6136c1
 #
6136c1
@@ -58,7 +58,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "label test of scsi disc",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
6136c1
-                exp_name        => "boot_disk" ,
6136c1
+                exp_name        => "boot_disk",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", SYMLINK+="boot_disk%n"
6136c1
 KERNEL=="ttyACM0", SYMLINK+="modem"
6136c1
@@ -67,7 +67,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "label test of scsi disc",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
6136c1
-                exp_name        => "boot_disk" ,
6136c1
+                exp_name        => "boot_disk",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", SYMLINK+="boot_disk%n"
6136c1
 KERNEL=="ttyACM0", SYMLINK+="modem"
6136c1
@@ -76,7 +76,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "label test of scsi disc",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
6136c1
-                exp_name        => "boot_disk" ,
6136c1
+                exp_name        => "boot_disk",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", SYMLINK+="boot_disk%n"
6136c1
 KERNEL=="ttyACM0", SYMLINK+="modem"
6136c1
@@ -85,7 +85,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "label test of scsi partition",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
6136c1
-                exp_name        => "boot_disk1" ,
6136c1
+                exp_name        => "boot_disk1",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", SYMLINK+="boot_disk%n"
6136c1
 EOF
6136c1
@@ -93,7 +93,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "label test of pattern match",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
6136c1
-                exp_name        => "boot_disk1" ,
6136c1
+                exp_name        => "boot_disk1",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", ATTRS{vendor}=="?ATA", SYMLINK+="boot_disk%n-1"
6136c1
 SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA?", SYMLINK+="boot_disk%n-2"
6136c1
@@ -104,7 +104,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "label test of multiple sysfs files",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
6136c1
-                exp_name        => "boot_disk1" ,
6136c1
+                exp_name        => "boot_disk1",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS X ", SYMLINK+="boot_diskX%n"
6136c1
 SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS", SYMLINK+="boot_disk%n"
6136c1
@@ -113,7 +113,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "label test of max sysfs files (skip invalid rule)",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1",
6136c1
-                exp_name        => "boot_disk1" ,
6136c1
+                exp_name        => "boot_disk1",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS", ATTRS{scsi_level}=="6", ATTRS{rev}=="4.06", ATTRS{type}=="0", ATTRS{queue_depth}=="32", SYMLINK+="boot_diskXX%n"
6136c1
 SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", ATTRS{model}=="ST910021AS", ATTRS{scsi_level}=="6", ATTRS{rev}=="4.06", ATTRS{type}=="0", SYMLINK+="boot_disk%n"
6136c1
@@ -122,7 +122,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "catch device by *",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
6136c1
-                exp_name        => "modem/0" ,
6136c1
+                exp_name        => "modem/0",
6136c1
                 rules           => <
6136c1
 KERNEL=="ttyACM*", SYMLINK+="modem/%n"
6136c1
 EOF
6136c1
@@ -130,7 +130,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "catch device by * - take 2",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
6136c1
-                exp_name        => "modem/0" ,
6136c1
+                exp_name        => "modem/0",
6136c1
                 rules           => <
6136c1
 KERNEL=="*ACM1", SYMLINK+="bad"
6136c1
 KERNEL=="*ACM0", SYMLINK+="modem/%n"
6136c1
@@ -139,7 +139,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "catch device by ?",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
6136c1
-                exp_name        => "modem/0" ,
6136c1
+                exp_name        => "modem/0",
6136c1
                 rules           => <
6136c1
 KERNEL=="ttyACM??*", SYMLINK+="modem/%n-1"
6136c1
 KERNEL=="ttyACM??", SYMLINK+="modem/%n-2"
6136c1
@@ -149,7 +149,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "catch device by character class",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
6136c1
-                exp_name        => "modem/0" ,
6136c1
+                exp_name        => "modem/0",
6136c1
                 rules           => <
6136c1
 KERNEL=="ttyACM[A-Z]*", SYMLINK+="modem/%n-1"
6136c1
 KERNEL=="ttyACM?[0-9]", SYMLINK+="modem/%n-2"
6136c1
@@ -159,7 +159,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "replace kernel name",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
6136c1
-                exp_name        => "modem" ,
6136c1
+                exp_name        => "modem",
6136c1
                 rules           => <
6136c1
 KERNEL=="ttyACM0", SYMLINK+="modem"
6136c1
 EOF
6136c1
@@ -167,7 +167,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "Handle comment lines in config file (and replace kernel name)",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
6136c1
-                exp_name        => "modem" ,
6136c1
+                exp_name        => "modem",
6136c1
                 rules           => <
6136c1
 # this is a comment
6136c1
 KERNEL=="ttyACM0", SYMLINK+="modem"
6136c1
@@ -177,7 +177,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "Handle comment lines in config file with whitespace (and replace kernel name)",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
6136c1
-                exp_name        => "modem" ,
6136c1
+                exp_name        => "modem",
6136c1
                 rules           => <
6136c1
  # this is a comment with whitespace before the comment
6136c1
 KERNEL=="ttyACM0", SYMLINK+="modem"
6136c1
@@ -187,7 +187,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "Handle whitespace only lines (and replace kernel name)",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
6136c1
-                exp_name        => "whitespace" ,
6136c1
+                exp_name        => "whitespace",
6136c1
                 rules           => <
6136c1
 
6136c1
 
6136c1
@@ -202,7 +202,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "Handle empty lines in config file (and replace kernel name)",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
6136c1
-                exp_name        => "modem" ,
6136c1
+                exp_name        => "modem",
6136c1
                 rules           => <
6136c1
 
6136c1
 KERNEL=="ttyACM0", SYMLINK+="modem"
6136c1
@@ -212,7 +212,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "Handle backslashed multi lines in config file (and replace kernel name)",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
6136c1
-                exp_name        => "modem" ,
6136c1
+                exp_name        => "modem",
6136c1
                 rules           => <
6136c1
 KERNEL=="ttyACM0", \\
6136c1
 SYMLINK+="modem"
6136c1
@@ -230,7 +230,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "Handle stupid backslashed multi lines in config file (and replace kernel name)",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
6136c1
-                exp_name        => "modem" ,
6136c1
+                exp_name        => "modem",
6136c1
                 rules           => <
6136c1
 
6136c1
 #
6136c1
@@ -248,7 +248,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "subdirectory handling",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
6136c1
-                exp_name        => "sub/direct/ory/modem" ,
6136c1
+                exp_name        => "sub/direct/ory/modem",
6136c1
                 rules           => <
6136c1
 KERNEL=="ttyACM0", SYMLINK+="sub/direct/ory/modem"
6136c1
 EOF
6136c1
@@ -256,7 +256,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "parent device name match of scsi partition",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
6136c1
-                exp_name        => "first_disk5" ,
6136c1
+                exp_name        => "first_disk5",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", SYMLINK+="first_disk%n"
6136c1
 EOF
6136c1
@@ -264,7 +264,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "test substitution chars",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
6136c1
-                exp_name        => "Major:8:minor:5:kernelnumber:5:id:0:0:0:0" ,
6136c1
+                exp_name        => "Major:8:minor:5:kernelnumber:5:id:0:0:0:0",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", SYMLINK+="Major:%M:minor:%m:kernelnumber:%n:id:%b"
6136c1
 EOF
6136c1
@@ -281,7 +281,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "sustitution of sysfs value (%s{file})",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
6136c1
-                exp_name        => "disk-ATA-sda" ,
6136c1
+                exp_name        => "disk-ATA-sda",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", SYMLINK+="disk-%s{vendor}-%k"
6136c1
 KERNEL=="ttyACM0", SYMLINK+="modem"
6136c1
@@ -290,8 +290,8 @@ EOF
6136c1
         {
6136c1
                 desc            => "program result substitution",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
6136c1
-                exp_name        => "special-device-5" ,
6136c1
-                not_exp_name    => "not" ,
6136c1
+                exp_name        => "special-device-5",
6136c1
+                not_exp_name    => "not",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="-special-*", SYMLINK+="not"
6136c1
 SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n special-device", RESULT=="special-*", SYMLINK+="%c-%n"
6136c1
@@ -300,7 +300,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "program result substitution (newline removal)",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
6136c1
-                exp_name        => "newline_removed" ,
6136c1
+                exp_name        => "newline_removed",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo test", RESULT=="test", SYMLINK+="newline_removed"
6136c1
 EOF
6136c1
@@ -308,7 +308,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "program result substitution",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
6136c1
-                exp_name        => "test-0:0:0:0" ,
6136c1
+                exp_name        => "test-0:0:0:0",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n test-%b", RESULT=="test-0:0*", SYMLINK+="%c"
6136c1
 EOF
6136c1
@@ -316,7 +316,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "program with lots of arguments",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
6136c1
-                exp_name        => "foo9" ,
6136c1
+                exp_name        => "foo9",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL=="sda5", SYMLINK+="%c{7}"
6136c1
 EOF
6136c1
@@ -324,7 +324,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "program with subshell",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
6136c1
-                exp_name        => "bar9" ,
6136c1
+                exp_name        => "bar9",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", PROGRAM=="/bin/sh -c 'echo foo3 foo4 foo5 foo6 foo7 foo8 foo9 | sed  s/foo9/bar9/'", KERNEL=="sda5", SYMLINK+="%c{7}"
6136c1
 EOF
6136c1
@@ -332,7 +332,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "program arguments combined with apostrophes",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
6136c1
-                exp_name        => "foo7" ,
6136c1
+                exp_name        => "foo7",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n 'foo3 foo4'   'foo5   foo6   foo7 foo8'", KERNEL=="sda5", SYMLINK+="%c{5}"
6136c1
 EOF
6136c1
@@ -340,7 +340,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "program arguments combined with escaped double quotes, part 1",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
6136c1
-                exp_name        => "foo2" ,
6136c1
+                exp_name        => "foo2",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", PROGRAM=="/bin/sh -c 'printf %%s \\\"foo1 foo2\\\" | grep \\\"foo1 foo2\\\"'", KERNEL=="sda5", SYMLINK+="%c{2}"
6136c1
 EOF
6136c1
@@ -348,7 +348,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "program arguments combined with escaped double quotes, part 2",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
6136c1
-                exp_name        => "foo2" ,
6136c1
+                exp_name        => "foo2",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", PROGRAM=="/bin/sh -c \\\"printf %%s 'foo1 foo2' | grep 'foo1 foo2'\\\"", KERNEL=="sda5", SYMLINK+="%c{2}"
6136c1
 EOF
6136c1
@@ -356,7 +356,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "program arguments combined with escaped double quotes, part 3",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
6136c1
-                exp_name        => "foo2" ,
6136c1
+                exp_name        => "foo2",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", PROGRAM=="/bin/sh -c 'printf \\\"%%s %%s\\\" \\\"foo1 foo2\\\" \\\"foo3\\\"| grep \\\"foo1 foo2\\\"'", KERNEL=="sda5", SYMLINK+="%c{2}"
6136c1
 EOF
6136c1
@@ -364,7 +364,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "characters before the %c{N} substitution",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
6136c1
-                exp_name        => "my-foo9" ,
6136c1
+                exp_name        => "my-foo9",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL=="sda5", SYMLINK+="my-%c{7}"
6136c1
 EOF
6136c1
@@ -372,7 +372,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "substitute the second to last argument",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
6136c1
-                exp_name        => "my-foo8" ,
6136c1
+                exp_name        => "my-foo8",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n foo3 foo4 foo5 foo6 foo7 foo8 foo9", KERNEL=="sda5", SYMLINK+="my-%c{6}"
6136c1
 EOF
6136c1
@@ -396,7 +396,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "test substitution by variable name 3",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
6136c1
-                exp_name        => "850:0:0:05" ,
6136c1
+                exp_name        => "850:0:0:05",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", DEVPATH=="*/sda/*", SYMLINK+="%M%m%b%n"
6136c1
 EOF
6136c1
@@ -404,7 +404,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "test substitution by variable name 4",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
6136c1
-                exp_name        => "855" ,
6136c1
+                exp_name        => "855",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", DEVPATH=="*/sda/*", SYMLINK+="\$major\$minor\$number"
6136c1
 EOF
6136c1
@@ -412,7 +412,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "test substitution by variable name 5",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda5",
6136c1
-                exp_name        => "8550:0:0:0" ,
6136c1
+                exp_name        => "8550:0:0:0",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", DEVPATH=="*/sda/*", SYMLINK+="\$major%m%n\$id"
6136c1
 EOF
6136c1
@@ -429,7 +429,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "non matching SUBSYSTEMS",
6136c1
                 devpath         => "/devices/virtual/tty/console",
6136c1
-                exp_name        => "TTY" ,
6136c1
+                exp_name        => "TTY",
6136c1
                 rules                => <
6136c1
 SUBSYSTEMS=="foo", ATTRS{dev}=="5:1", SYMLINK+="foo"
6136c1
 KERNEL=="console", SYMLINK+="TTY"
6136c1
@@ -438,7 +438,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "ATTRS match",
6136c1
                 devpath         => "/devices/virtual/tty/console",
6136c1
-                exp_name        => "foo" ,
6136c1
+                exp_name        => "foo",
6136c1
                 rules           => <
6136c1
 KERNEL=="console", SYMLINK+="TTY"
6136c1
 ATTRS{dev}=="5:1", SYMLINK+="foo"
6136c1
@@ -447,7 +447,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "ATTR (empty file)",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
6136c1
-                exp_name        => "empty" ,
6136c1
+                exp_name        => "empty",
6136c1
                 rules           => <
6136c1
 KERNEL=="sda", ATTR{test_empty_file}=="?*", SYMLINK+="something"
6136c1
 KERNEL=="sda", ATTR{test_empty_file}!="", SYMLINK+="not-empty"
6136c1
@@ -458,7 +458,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "ATTR (non-existent file)",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
6136c1
-                exp_name        => "non-existent" ,
6136c1
+                exp_name        => "non-existent",
6136c1
                 rules           => <
6136c1
 KERNEL=="sda", ATTR{nofile}=="?*", SYMLINK+="something"
6136c1
 KERNEL=="sda", ATTR{nofile}!="", SYMLINK+="not-empty"
6136c1
@@ -471,7 +471,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "program and bus type match",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
6136c1
-                exp_name        => "scsi-0:0:0:0" ,
6136c1
+                exp_name        => "scsi-0:0:0:0",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="usb", PROGRAM=="/bin/echo -n usb-%b", SYMLINK+="%c"
6136c1
 SUBSYSTEMS=="scsi", PROGRAM=="/bin/echo -n scsi-%b", SYMLINK+="%c"
6136c1
@@ -481,7 +481,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "sysfs parent hierarchy",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
6136c1
-                exp_name        => "modem" ,
6136c1
+                exp_name        => "modem",
6136c1
                 rules           => <
6136c1
 ATTRS{idProduct}=="007b", SYMLINK+="modem"
6136c1
 EOF
6136c1
@@ -489,7 +489,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "name test with ! in the name",
6136c1
                 devpath         => "/devices/virtual/block/fake!blockdev0",
6136c1
-                exp_name        => "is/a/fake/blockdev0" ,
6136c1
+                exp_name        => "is/a/fake/blockdev0",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", SYMLINK+="is/not/a/%k"
6136c1
 SUBSYSTEM=="block", SYMLINK+="is/a/%k"
6136c1
@@ -499,7 +499,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "name test with ! in the name, but no matching rule",
6136c1
                 devpath         => "/devices/virtual/block/fake!blockdev0",
6136c1
-                exp_name        => "fake/blockdev0" ,
6136c1
+                exp_name        => "fake/blockdev0",
6136c1
                 exp_rem_error   => "yes",
6136c1
                 rules           => <
6136c1
 KERNEL=="ttyACM0", SYMLINK+="modem"
6136c1
@@ -542,7 +542,7 @@ EOF
6136c1
                 desc            => "KERNELS wildcard partial 2",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
6136c1
                 exp_name        => "scsi-0:0:0:0",
6136c1
-                rules                => <
6136c1
+                rules           => <
6136c1
 SUBSYSTEMS=="scsi", KERNELS=="0:0:0:0", SYMLINK+="before"
6136c1
 SUBSYSTEMS=="scsi", KERNELS=="*:0:0:0", SYMLINK+="scsi-0:0:0:0"
6136c1
 EOF
6136c1
@@ -739,7 +739,7 @@ EOF
6136c1
                 devpath         => "/devices/virtual/misc/misc-fake1",
6136c1
                 exp_name        => "node",
6136c1
                 exp_majorminor  => "4095:1",
6136c1
-                rules                => <
6136c1
+                rules           => <
6136c1
 KERNEL=="misc-fake1", SYMLINK+="node"
6136c1
 EOF
6136c1
         },
6136c1
@@ -764,7 +764,7 @@ EOF
6136c1
                 desc            => "multiple symlinks with a lot of s p a c e s",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
6136c1
                 exp_name        => "one",
6136c1
-                not_exp_name        => " ",
6136c1
+                not_exp_name    => " ",
6136c1
                 rules           => <
6136c1
 KERNEL=="ttyACM[0-9]*", SYMLINK="  one     two        "
6136c1
 EOF
6136c1
@@ -860,7 +860,7 @@ EOF
6136c1
         {
6136c1
                 desc            => "multiple symlinks",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/tty/ttyACM0",
6136c1
-                exp_name        => "second-0" ,
6136c1
+                exp_name        => "second-0",
6136c1
                 rules           => <
6136c1
 KERNEL=="ttyACM0", SYMLINK="first-%n second-%n third-%n"
6136c1
 EOF
6136c1
@@ -869,8 +869,8 @@ EOF
6136c1
                 desc            => "symlink name '.'",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
6136c1
                 exp_name        => ".",
6136c1
-                exp_add_error        => "yes",
6136c1
-                exp_rem_error        => "yes",
6136c1
+                exp_add_error   => "yes",
6136c1
+                exp_rem_error   => "yes",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", KERNEL=="sda", SYMLINK+="."
6136c1
 EOF
6136c1
@@ -879,9 +879,9 @@ EOF
6136c1
                 desc            => "symlink node to itself",
6136c1
                 devpath         => "/devices/virtual/tty/tty0",
6136c1
                 exp_name        => "link",
6136c1
-                exp_add_error        => "yes",
6136c1
-                exp_rem_error        => "yes",
6136c1
-                option                => "clean",
6136c1
+                exp_add_error   => "yes",
6136c1
+                exp_rem_error   => "yes",
6136c1
+                option          => "clean",
6136c1
                 rules           => <
6136c1
 KERNEL=="tty0", SYMLINK+="tty0"
6136c1
 EOF
6136c1
@@ -1437,7 +1437,7 @@ EOF
6136c1
                 desc            => "add and match tag",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
6136c1
                 exp_name        => "found",
6136c1
-                not_exp_name    => "bad" ,
6136c1
+                not_exp_name    => "bad",
6136c1
                 rules           => <
6136c1
 SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", TAG+="green"
6136c1
 TAGS=="green", SYMLINK+="found"
6136c1
@@ -1456,7 +1456,7 @@ EOF
6136c1
                 desc            => "continuations",
6136c1
                 devpath         => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda",
6136c1
                 exp_name        => "found",
6136c1
-                not_exp_name    => "bad" ,
6136c1
+                not_exp_name    => "bad",
6136c1
                 rules           => $rules_10k_tags_continuation . <
6136c1
 TAGS=="test1", TAGS=="test500", TAGS=="test1234", TAGS=="test9999", TAGS=="test10000", SYMLINK+="bad"
6136c1
 KERNEL=="sda",\\