X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=installcheck%2FAmanda_Tapelist.pl;fp=installcheck%2FAmanda_Tapelist.pl;h=f22d5554975b1fa0ea682103992b9cde42528ed4;hb=d28952249e392eb31bc8eecc53f6c477f30c617b;hp=37dac019fdd2cba52806d4942f66ced3b52f74c2;hpb=949b8910a5e23c4285d0b1aedacfc82a14dc97a5;p=debian%2Famanda

diff --git a/installcheck/Amanda_Tapelist.pl b/installcheck/Amanda_Tapelist.pl
index 37dac01..f22d555 100644
--- a/installcheck/Amanda_Tapelist.pl
+++ b/installcheck/Amanda_Tapelist.pl
@@ -1,8 +1,9 @@
 # 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
@@ -67,6 +68,9 @@ sub readtapelist {
     "20071110010002 TESTCONF003 reuse BARCODE:BAR-003 BLOCKSIZE:32\n",
     "20071109010002 TESTCONF002 reuse BARCODE:BAR-002 META:META2 BLOCKSIZE:64 #comment 2\n",
     "20071108010001 TESTCONF001 no-reuse #comment 1\n",
+    "20071107110002 TESTCONF015\n",
+    "20071107010002 TESTCONF006 no-reuse\n",
+    "20071106010002 TESTCONF005 reuse\n",
 );
 mktapelist($tapelist, @lines);
 
@@ -87,6 +91,15 @@ $tl_ok = is_deeply($tl,	{
   { 'datestamp' => '20071108010001', 'label' => 'TESTCONF001',
     'reuse' => '', 'position' => 4, 'blocksize' => undef,
     'barcode' => undef, 'meta' => undef, 'comment' => 'comment 1' },
+  { 'datestamp' => '20071107110002', 'label' => 'TESTCONF015',
+    'reuse' => 1, 'position' => 5, 'blocksize' => undef,
+    'barcode' => undef, 'meta' => undef, 'comment' => undef },
+  { 'datestamp' => '20071107010002', 'label' => 'TESTCONF006',
+    'reuse' => '', 'position' => 6, 'blocksize' => undef,
+    'barcode' => undef, 'meta' => undef, 'comment' => undef },
+  { 'datestamp' => '20071106010002', 'label' => 'TESTCONF005',
+    'reuse' => 1, 'position' => 7, 'blocksize' => undef,
+    'barcode' => undef, 'meta' => undef, 'comment' => undef },
 ] }, "A simple tapelist is parsed correctly");
 
 SKIP: {
@@ -96,6 +109,8 @@ SKIP: {
     # now try writing it out and check that the results are the same
     $tl->write("$tapelist-new");
     my @reread_lines = readtapelist("$tapelist-new");
+    chomp($lines[4]);
+    $lines[4] .= " reuse\n"; #'reuse' is automatically written
     is_deeply(\@reread_lines, \@lines, "Lines of freshly written tapelist match the original");
 
     is_deeply($tl->lookup_tapelabel('TESTCONF002'),
@@ -127,7 +142,7 @@ SKIP: {
 
     # try some edits
     $tl->add_tapelabel("20080112010203", "TESTCONF007", "seven", 1, 'META3', 'BAR-007');
-    is(scalar @{$tl->{'tles'}}, 5, "add_tapelabel adds a new element to the tapelist");
+    is(scalar @{$tl->{'tles'}}, 8, "add_tapelabel adds a new element to the tapelist");
 
     is_deeply($tl->lookup_tapepos(1),
 	{ 'datestamp' => '20080112010203', 'label' => 'TESTCONF007',
@@ -149,7 +164,7 @@ SKIP: {
 
     # try some edits
     $tl->add_tapelabel("20080112010204", "TESTCONF008", "eight", 0, undef, undef, 128);
-    is(scalar @{$tl->{'tles'}}, 6, "add_tapelabel adds a new element to the tapelist no-reuse");
+    is(scalar @{$tl->{'tles'}}, 9, "add_tapelabel adds a new element to the tapelist no-reuse");
 
     is_deeply($tl->lookup_tapelabel("TESTCONF008"),
 	{ 'datestamp' => '20080112010204', 'label' => 'TESTCONF008',
@@ -158,10 +173,10 @@ SKIP: {
 	".. lookup_tapelabel finds it no-reuse");
 
     $tl->remove_tapelabel("TESTCONF008");
-    is(scalar @{$tl->{'tles'}}, 5, "remove_tapelabel removes an element from the tapelist, no-reuse");
+    is(scalar @{$tl->{'tles'}}, 8, "remove_tapelabel removes an element from the tapelist, no-reuse");
 
     $tl->remove_tapelabel("TESTCONF002");
-    is(scalar @{$tl->{'tles'}}, 4, "remove_tapelabel removes an element from the tapelist");
+    is(scalar @{$tl->{'tles'}}, 7, "remove_tapelabel removes an element from the tapelist");
 
     is_deeply($tl->lookup_tapepos(4), # used to be in position 5
 	{ 'datestamp' => '20071108010001', 'label' => 'TESTCONF001',
@@ -199,20 +214,20 @@ SKIP: {
 	or die("config_init failed");
 
     is( Amanda::Tapelist::get_last_reusable_tape_label(0),
-        'TESTCONF002', ".. get_last_reusable_tape_labe for skip=0" );
+        'TESTCONF005', ".. get_last_reusable_tape_labe for skip=0" );
 
     is( Amanda::Tapelist::get_last_reusable_tape_label(2),
-        'TESTCONF004', ".. get_last_reusable_tape_labe for skip=2" );
+        'TESTCONF002', ".. get_last_reusable_tape_labe for skip=2" );
 }
 
 # try parsing various invalid lines
 @lines = (
     "2006123456 FOO reuse\n", # valid
-    "TESTCONF003 290385098 reuse\n", # invalid
-    "20071109010002 TESTCONF002 re-use\n", # invalid
-    "20071108010001 TESTCONF001\n", # invalid
-    "20071108010001 TESTCONF001 #comment\n", # invalid
-    "#comment\n", # invalid
+#    "TESTCONF003 290385098 reuse\n", # invalid
+#    "20071109010002 TESTCONF002 re-use\n", # invalid
+#    "20071108010001 TESTCONF001\n", # invalid
+#    "20071108010001 TESTCONF001 #comment\n", # invalid
+#    "#comment\n", # invalid
 );
 mktapelist($tapelist, @lines);