X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=installcheck%2Famtape.pl;h=9601b51fd8e3669f2bb7e44aba5b9f819aff0dba;hb=441dd72d27c13b97098a519388e6c194b16519f0;hp=3a2beadb5be8a804de72e40e26e8f468fc5244d6;hpb=fd48f3e498442f0cbff5f3606c7c403d0566150e;p=debian%2Famanda

diff --git a/installcheck/amtape.pl b/installcheck/amtape.pl
index 3a2bead..9601b51 100644
--- a/installcheck/amtape.pl
+++ b/installcheck/amtape.pl
@@ -1,4 +1,4 @@
-# Copyright (c) 2009 Zmanda, Inc.  All Rights Reserved.
+# Copyright (c) 2009-2012 Zmanda, Inc.  All Rights Reserved.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 as published
@@ -16,7 +16,9 @@
 # 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;
 
 use lib "@amperldir@";
 use Installcheck::Config;
@@ -69,7 +71,7 @@ sub setup_vtapes {
         or BAIL_OUT("device error");
 
     my $tlf = Amanda::Config::config_dir_relative(getconf($CNF_TAPELIST));
-    my $tl = Amanda::Tapelist::read_tapelist($tlf);
+    my $tl = Amanda::Tapelist->new($tlf, 1);
     $tl->add_tapelabel("0", "TESTCONF13", "test tape");
     $tl->write($tlf);
 }
@@ -146,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
@@ -213,13 +228,13 @@ like($Installcheck::Run::stderr,
 ok(run('amtape', 'TESTCONF', 'inventory'),
     "'amtape TESTCONF inventory'");
 like($Installcheck::Run::stdout,
-    qr/slot +1: blank\nslot +2: label MyTape\nslot +3/,
+    qr/slot +1: blank\nslot +2: label MyTape \(current\)\nslot +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");
 
 Installcheck::Run::cleanup();