X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=installcheck%2Famcheck-device.pl;h=02f1acbb1094575d790c4353c43982484a745ae1;hb=refs%2Ftags%2Fupstream%2F3.3.1;hp=3c9f8b1f5997c090bace32a227b4f35633689700;hpb=fd48f3e498442f0cbff5f3606c7c403d0566150e;p=debian%2Famanda

diff --git a/installcheck/amcheck-device.pl b/installcheck/amcheck-device.pl
index 3c9f8b1..02f1acb 100644
--- a/installcheck/amcheck-device.pl
+++ b/installcheck/amcheck-device.pl
@@ -1,4 +1,4 @@
-# Copyright (c) 2009 Zmanda, Inc.  All Rights Reserved.
+# Copyright (c) 2009, 2010 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,10 +16,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;
@@ -37,9 +39,18 @@ like(run_get("$amlibexecdir/amcheck-device", "TESTCONF"),
     qr/Will write label 'TESTCONF01' to new volume/,
     "a run of amcheck-device on a new config succeeds");
 
-ok(!run("$amlibexecdir/amcheck-device", "TESTCONF", "-o", "label_new_tapes="),
+ok(!run("$amlibexecdir/amcheck-device", "TESTCONF", "-o", "autolabel="),
     "accepts config_overrides, returns exit status on failure");
 
 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");
+