X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=installcheck%2Famcheck-device.pl;h=27fe499e513b6fdf4d3440dc8a50a3e4eece0386;hb=691567b16c13087b31ee4c2b6d038e57872fae82;hp=552790d9c7d9e45d0d9a03dd54d84835526cbb8e;hpb=b116e9366c7b2ea2c2eb53b0a13df4090e176235;p=debian%2Famanda

diff --git a/installcheck/amcheck-device.pl b/installcheck/amcheck-device.pl
index 552790d..27fe499 100644
--- a/installcheck/amcheck-device.pl
+++ b/installcheck/amcheck-device.pl
@@ -1,8 +1,9 @@
-# Copyright (c) 2009, 2010 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
-# 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
@@ -16,12 +17,12 @@
 # Contact information: Zmanda Inc, 465 S. Mathilda Ave., Suite 300
 # Sunnyvale, CA 94086, USA, or: http://www.zmanda.com
 
-use Test::More tests => 3;
+use Test::More tests => 4;
 use strict;
 use warnings;
 
 use lib "@amperldir@";
-use Installcheck::Run qw(run run_get);
+use Installcheck::Run qw(run run_get run_err);
 use Amanda::Config qw( :init :getconf );
 use Amanda::Paths;
 use Amanda::Debug;
@@ -45,3 +46,12 @@ ok(!run("$amlibexecdir/amcheck-device", "TESTCONF", "-o", "autolabel="),
 like(run_get("$amlibexecdir/amcheck-device", "TESTCONF", "-w"),
     qr/Volume 'TESTCONF01' is writeable/,
     "tests for writeability with -w");
+
+$testconf = Installcheck::Run::setup();
+$testconf->add_param("autolabel", "\"TESTCONF-\$4s\" empty volume_error");
+$testconf->write();
+
+like(run_err("$amlibexecdir/amcheck-device", "TESTCONF"),
+    qr/ERROR: Newly-generated label 'TESTCONF-0001' does not match labelstr 'TESTCONF\[0-9\]\[0-9\]'/m,
+    "a run with incompatible autolabel and labelstr");
+