Imported Upstream version 3.3.3

[debian/amanda] / installcheck / amtapetype.pl

diff --git a/installcheck/amtapetype.pl b/installcheck/amtapetype.pl
index c1b2040b703a11fe532fc72782c733f646d4e34a..27ce98142990b4f643bae83c1a7201889ea691a7 100644 (file)
--- a/installcheck/amtapetype.pl
+++ b/installcheck/amtapetype.pl
@@ -1,8 +1,9 @@
-# Copyright (c) 2008, 2009, 2010 Zmanda, Inc.  All Rights Reserved.
+# Copyright (c) 2008-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
-# by the Free Software Foundation.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -17,6 +18,8 @@
 # Sunnyvale, CA 94086, USA, or: http://www.zmanda.com
 
 use Test::More tests => 5;
+use strict;
+use warnings;
 
 use lib "@amperldir@";
 use Installcheck::Run qw(run run_get run_err vtape_dir);
@@ -48,5 +51,5 @@ ok(run_err('amtapetype', 'TESTCONF', 'smallvtape'),
     "a second run on the same device fails because -f isn't used") or die;
 
 like(run_get('amtapetype', 'TESTCONF', '-f', '-b', '33000', 'smallvtape'),
-    qr/add device_property/,
+    qr/add device-property/,
     "with a non-kilobyte block size, directs user to add a device_property");