Imported Upstream version 3.3.1

[debian/amanda] / installcheck / amtape.pl

diff --git a/installcheck/amtape.pl b/installcheck/amtape.pl
index cc7efd6e5a5bfb8093e27a6ab947cbb28aae13ab..3220e70f0cf9a99dbeb8d54f9d70b98a3eb62b64 100644 (file)
--- a/installcheck/amtape.pl
+++ b/installcheck/amtape.pl
@@ -16,7 +16,7 @@
 # Contact information: Zmanda Inc, 465 S. Mathilda Ave., Suite 300
 # Sunnyvale, CA 94086, USA, or: http://www.zmanda.com
 
-use Test::More tests => 42;
+use Test::More tests => 46;
 use strict;
 use warnings;
 
@@ -148,13 +148,26 @@ ok(run('amtape', 'TESTCONF', 'show'),
     "'amtape TESTCONF show'");
 like($Installcheck::Run::stderr,
     qr/slot +2:.*label MyTape\nslot +3/,
-    "..result correct");
+    "'amtape TESTCONF show' ..result correct");
+
+ok(run('amtape', 'TESTCONF', 'show', '2'),
+    "'amtape TESTCONF show'");
+like($Installcheck::Run::stderr,
+    qr/^slot +2:.*label MyTape$/,
+    "'amtape TESTCONF show 2' ..result correct");
+
+ok(run('amtape', 'TESTCONF', 'show', '1,3'),
+    "'amtape TESTCONF show'");
+like($Installcheck::Run::stderr,
+    qr/^slot +1: unlabeled volume\nslot +3: date \d{14} label TESTCONF13$/,
+#    qr/slot +1: unlabeled volume\nslot +3: date 20111121133419 label TESTCONF13/,
+    "'amtape TESTCONF show 1,3' ..result correct");
 
 ok(run('amtape', 'TESTCONF', 'taper'),
     "'amtape TESTCONF taper'");
 like($Installcheck::Run::stderr,
-    qr/Will write to volume TESTCONF13 in slot 3/,
-    "..result correct");
+    qr/Will write to volume 'TESTCONF13' in slot 3/,
+    "'amtape TESTCONF taper' ..result correct");
 
 ###
 ## shift to using the new Amanda::Changer::disk
@@ -221,7 +234,7 @@ like($Installcheck::Run::stdout,
 ok(run('amtape', 'TESTCONF', 'taper'),
     "'amtape TESTCONF taper'");
 like($Installcheck::Run::stderr,
-    qr/Will write to volume TESTCONF13 in slot 3/,
-    "..result correct");
+    qr/Will write to volume 'TESTCONF13' in slot 3/,
+    "'amtape TESTCONF taper' ..result correct");
 
 Installcheck::Run::cleanup();