[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-18-g3cdea3a

[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, 17.05.x has been updated
       via  3cdea3aaf6194cc9e448a424e2646867e9c3ddd1 (commit)
       via  9f8b896d707905043f75a3a86ab29c3ed2eaffa6 (commit)
      from  000ace2df42f01f14c1b39489ec79b5d8cbca550 (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 3cdea3aaf6194cc9e448a424e2646867e9c3ddd1
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Aug 10 09:24:08 2017 +0200

    Bug 19071: Fix Members/IssueSlip.t
    
    Resolve:
    DBD::mysql::db do failed: Cannot delete or update a parent row: a foreign key constraint fails (`koha_master`.`clubs`, CONSTRAINT `clubs_ibfk_2` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`)) [for Statement "DELETE FROM branches"] at t/db_dependent/Members/IssueSlip.t line 44.
    
    We do not need to delete all branches here.
    
    Note: The test still needs attention for noisy userenv warns, but it should
    pass now.
    
    Test plan:
    Run t/db_dependent/Members/IssueSlip.t
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 8651016ce8e959b5b6ca19ccddbb3f5342b5d456)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 9f8b896d707905043f75a3a86ab29c3ed2eaffa6
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Aug 10 09:13:44 2017 +0200

    Bug 19071: Fix Circulation/issue.t
    
    Resolve:
    DBD::mysql::db do failed: Cannot delete or update a parent row: a foreign key constraint fails (`koha_master`.`clubs`, CONSTRAINT `clubs_ibfk_2` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`)) [for Statement "DELETE FROM branches"] at t/db_dependent/Circulation/issue.t line 65.
    
    Cause:
    See also bug 19070.
    We do not need to delete all branches here.
    
    Test plan:
    Run t/db_dependent/Circulation/issue.t
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit b80704aa1b763c7a29c3b95c162dfb12ded8faa2)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 t/db_dependent/Circulation/issue.t |    1 -
 t/db_dependent/Members/IssueSlip.t |    1 -
 2 files changed, 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository