From 27d90a356337d18b5693132626ddc602da064372 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Mon, 18 Feb 2019 00:34:48 +0000
Subject: [PATCH] scstadmin: Improve the consistency of test 07

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7949 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 .../scst-1.0.0/t/07-scstadmin-args.t          | 74 +++++++++++++------
 1 file changed, 52 insertions(+), 22 deletions(-)

diff --git a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-scstadmin-args.t b/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-scstadmin-args.t
index f0a536cc9..0c3227499 100644
--- a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-scstadmin-args.t
+++ b/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-scstadmin-args.t
@@ -198,14 +198,15 @@ All done.
 EOS
     ok(run("$scstadmin -list_dgrp"), $result);
 
-    $result = "
+    $result = <<'EOS';
+
 Collecting current configuration: done.
 
 	Targets
 	-------
 
 All done.
-";
+EOS
     ok(run("$scstadmin -list_tgrp tgrp -dev_group dgroup1"), $result);
 
     $result = <<'EOS';
@@ -222,6 +223,7 @@ Collecting current configuration: done.
 All done.
 EOS
     ok(run("$scstadmin -list_driver"), $result);
+
     $result = <<'EOS';
 
 Collecting current configuration: done.
@@ -281,7 +283,6 @@ All done.
 EOS
     ok(run("$scstadmin -list_group"), $result);
 
-
     $result = <<'EOS';
 
 Collecting current configuration: done.
@@ -293,6 +294,7 @@ Collecting current configuration: done.
 All done.
 EOS
     ok(run("$scstadmin -list_scst_attr"), $result);
+
     $result = <<'EOS';
 
 Collecting current configuration: done.
@@ -373,6 +375,7 @@ Collecting current configuration: done.
 All done.
 EOS
     ok(run("$scstadmin -list_hnd_attr vdisk_fileio"), $result);
+
     $result = <<'EOS';
 
 Collecting current configuration: done.
@@ -401,7 +404,8 @@ All done.
 EOS
     ok(run("$scstadmin -list_hnd_attr vdisk_nullio"), $result);
 
-    $result = "
+    $result = <<'EOS';
+
 Collecting current configuration: done.
 
 	Attribute     Value                                    Writable      KEY
@@ -411,9 +415,11 @@ Collecting current configuration: done.
 	size          1048576                                  No            Yes
 
 All done.
-";
+EOS
     ok(run("$scstadmin -list_dev_attr disk0"), $result);
-    $result = "
+
+    $result = <<'EOS';
+
 Collecting current configuration: done.
 
 	Attribute     Value                                    Writable      KEY
@@ -423,7 +429,7 @@ Collecting current configuration: done.
 	size          1048576                                  No            Yes
 
 All done.
-";
+EOS
     ok(run("$scstadmin -list_dev_attr disk1"), $result);
 
     $result = <<'EOS';
@@ -438,7 +444,8 @@ All done.
 EOS
     ok(run("$scstadmin -list_drv_attr ib_srpt"), $result);
 
-    $result = "
+    $result = <<'EOS';
+
 Collecting current configuration: done.
 
 	Attribute     Value      Writable      KEY
@@ -447,9 +454,11 @@ Collecting current configuration: done.
 	state         active     Yes           Yes
 
 All done.
-";
+EOS
     ok(run("$scstadmin -list_tgrp_attr tgroup1 -dev_group dgroup1"), $result);
-    $result = "
+
+    $result = <<'EOS';
+
 Collecting current configuration: done.
 
 	Attribute     Value     Writable      KEY
@@ -457,9 +466,11 @@ Collecting current configuration: done.
 	(none)
 
 All done.
-";
+EOS
     ok(run("$scstadmin -list_ttgt_attr local -tgt_group tgroup1 -dev_group dgroup1"), $result);
-    $result = "
+
+    $result = <<'EOS';
+
 Collecting current configuration: done.
 
 	Attribute     Value     Writable      KEY
@@ -471,9 +482,11 @@ Collecting current configuration: done.
 	read_only
 
 All done.
-";
+EOS
     ok(run("$scstadmin -list_tgt_attr local -driver scst_local"), $result);
-    $result = "
+
+    $result = <<'EOS';
+
 Collecting current configuration: done.
 
 	Attribute     Value     Writable      KEY
@@ -485,9 +498,11 @@ Collecting current configuration: done.
 	read_only
 
 All done.
-";
+EOS
     ok(run("$scstadmin -list_grp_attr ig -driver scst_local -target local -group ip"), $result);
-    $result = "
+
+    $result = <<'EOS';
+
 Collecting current configuration: done.
 
 	Attribute     Value     Writable      KEY
@@ -495,11 +510,23 @@ Collecting current configuration: done.
 	(none)
 
 All done.
-";
+EOS
     ok(run("$scstadmin -list_lun_attr 0 -driver scst_local -target local"), $result);
-    $result = "\nCollecting current configuration: done.\n\n\tAttribute     Value     Writable      KEY\n\t-----------------------------------------\n\t(none)\n\nAll done.\n";
+
+    $result = <<'EOS';
+
+Collecting current configuration: done.
+
+	Attribute     Value     Writable      KEY
+	-----------------------------------------
+	(none)
+
+All done.
+EOS
     ok(run("$scstadmin -list_lun_attr 1 -driver scst_local -target local -group ig"), $result);
-    $result = "
+
+    $result = <<'EOS';
+
 Collecting current configuration: done.
 
 
@@ -510,9 +537,11 @@ WARNING: Received the following error:
 
 
 All done.
-";
+EOS
     ok(run("$scstadmin -list_init_attr ini1 -driver scst_local -target local -group ig"), $result);
-    $result = "
+
+    $result = <<'EOS';
+
 Collecting current configuration: done.
 
 
@@ -523,8 +552,9 @@ WARNING: Received the following error:
 
 
 All done.
-";
+EOS
     ok(run("$scstadmin -list_init_attr ini2 -driver scst_local -target local -group ig"), $result);
+
     $result = <<'EOS';
 
 Collecting current configuration: done.