[open-ils-commits] [GIT] Evergreen ILS branch master updated. 11f04eaa4a97e78d8c8c11a63fff221e4935a13d

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  11f04eaa4a97e78d8c8c11a63fff221e4935a13d (commit)
       via  e4559139d5dd6dcf311c32a8bc9f0a73d5f774ce (commit)
      from  dae5f2a1f1057ed4fdd83ca1b861ca2864fe6b45 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 11f04eaa4a97e78d8c8c11a63fff221e4935a13d
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Thu Jun 13 15:45:11 2013 -0400

    Test for an MFHD warning in 14-OpenILS-Utils.t
    
    Specifically "Cannot compress without pattern data, returning original holdings"
    
    I also added Test::Warn to Makefile.install for Debian and Fedora.
    
    --
    Bill moved the @comp_holdings variable declaration outside of the
    warning_like block to avoid a new warning:
    
    Name "main::comp_holdings" used only once: possible typo at
    t/14-OpenILS-Utils.t line 42.
    ---
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index c5aacd6..c94cf4b 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -82,6 +82,7 @@ DEBS =  \
 	libole-storage-lite-perl\
 	libspreadsheet-writeexcel-perl\
 	libssh2-1-dev\
+	libtest-warn-perl\
 	libtext-aspell-perl\
 	libtext-csv-perl\
 	libuniversal-require-perl\
@@ -153,6 +154,7 @@ FEDORA_RPMS = \
 	perl-OLE-Storage_Lite \
 	perl-RPC-XML \
 	perl-Spreadsheet-WriteExcel \
+	perl-Test-Warn \
 	perl-Text-Aspell \
 	perl-Text-CSV \
 	perl-Text-CSV_XS \
diff --git a/Open-ILS/src/perlmods/t/14-OpenILS-Utils.t b/Open-ILS/src/perlmods/t/14-OpenILS-Utils.t
index 209a48b..621c98f 100644
--- a/Open-ILS/src/perlmods/t/14-OpenILS-Utils.t
+++ b/Open-ILS/src/perlmods/t/14-OpenILS-Utils.t
@@ -1,6 +1,7 @@
 #!perl -T
 
-use Test::More tests => 29;
+use Test::More tests => 30;
+use Test::Warn;
 
 use_ok( 'OpenILS::Utils::Configure' );
 use_ok( 'OpenILS::Utils::Cronscript' );
@@ -33,7 +34,12 @@ $co_marc->append_fields(
 );
 my $co_mfhd = MFHD->new($co_marc);
 
-my @comp_holdings = $co_mfhd->get_compressed_holdings($co_mfhd->field('853'));
+my @comp_holdings;
+warning_like {
+    @comp_holdings = $co_mfhd->get_compressed_holdings($co_mfhd->field('853'));
+} [ qr/Cannot compress without pattern data, returning original holdings/ ],
+    "warning when attempting to compress holdings without a pattern";
+
 is(@comp_holdings, 0, "Compressed holdings for an MFHD record that only has a caption");
 
 my @decomp_holdings = $co_mfhd->get_decompressed_holdings($co_mfhd->field('853'));

commit e4559139d5dd6dcf311c32a8bc9f0a73d5f774ce
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Thu Jun 13 14:40:45 2013 -0400

    Eliminate a warning in Z3950.pm
    
    Noticed in 06-OpenILS-Application-Search.t:
    Odd number of elements in anonymous hash at /usr/local/share/perl/5.10.1/OpenILS/Application/Search/Z3950.pm line 532.
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Z3950.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Z3950.pm
index dba3706..c830844 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Z3950.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Z3950.pm
@@ -557,7 +557,7 @@ __PACKAGE__->register_method(
             }
         ],
         return => {
-            q/Object containing status information about the on-going search
+            desc => q/Object containing status information about the on-going search
             and queue operation. 
             {
                 bre_count    : $num, -- number of bibs to search against

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/extras/Makefile.install               |    2 ++
 .../lib/OpenILS/Application/Search/Z3950.pm        |    2 +-
 Open-ILS/src/perlmods/t/14-OpenILS-Utils.t         |   10 ++++++++--
 3 files changed, 11 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS