[koha-commits] main Koha release repository branch master updated. v16.05.00-124-g63fbb33

[Git repo owner]

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 "main Koha release repository".

The branch, master has been updated
       via  63fbb336bd90991a8b86ca6fe54d5a069c129373 (commit)
       via  395ac8835a582a2bb38aaa3259c4196b81142dd4 (commit)
      from  b8c950a4c1b1ead8a58686b27c95f9891cdccbae (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 63fbb336bd90991a8b86ca6fe54d5a069c129373
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu May 26 21:56:50 2016 +0200

    Bug 16500: [QA Follow-up] Catch warning if branch MPL already exists
    
    The current test had no warnings, when you have no MPL branch, and only
    catches the warn from the second build on line 57. If you do have MPL,
    a warning comes from line 56.
    
    This patch fixes it by removing MPL from the test. A new branch is created
    first and then we try to create it again.
    
    Test plan:
    Run the test.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 395ac8835a582a2bb38aaa3259c4196b81142dd4
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed May 11 14:49:07 2016 +0200

    Bug 16500: Catch two warns in TestBuilder.t with warning_like
    
    When testing a wrong case in TestBuilder.t, two warns show up.
    We can catch them with warning_like.
    
    Test plan:
    Run t/db_dependent/TestBuilder.t
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

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

Summary of changes:
 t/db_dependent/TestBuilder.t |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository