[koha-commits] main Koha release repository branch 3.14.x updated. v3.14.07-72-g6c21a4b
Git repo owner
gitmaster at git.koha-community.org
Thu Jun 12 11:31:27 CEST 2014
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, 3.14.x has been updated
via 6c21a4b0ccbf5ee2c1c246bfd2eee1b856a25375 (commit)
via 8e3c4c75c4312b7632545fd3f140c8de99656931 (commit)
via a9377e9a64718a383aec7ee4ad32bc260381160b (commit)
from 0e6a85ad7c09eccc99fbce9af47d4ae9ddae4350 (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 6c21a4b0ccbf5ee2c1c246bfd2eee1b856a25375
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Wed Nov 13 14:21:40 2013 +0100
Bug 11701: Fix C4::Context::Zconn
When calling C4::Context::Zconn twice with different parameters,
the same ZOOM::Connection object is returned twice (parameters
of 2nd call are not used) This patch fixes that.
This is in part because the connection cache is keyed on server
name only. This patch corrects this by keying on all parameters.
TEST PLAN
---------
1) apply patch
2) run koha qa test tools
3) prove -v t/Context.t
The unit tests properly triggers the modified routine for
testing. Additionally, in hunting for ways it could break,
no nested synchronous or asynchronous Zconn's were found.
And even if they were, the keying on all parameters should allow
it to function properly without messing up the other connection.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 9b63f0d018ecaa6377124175142826658cb4dd05)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Conflicts:
C4/Context.pm
commit 8e3c4c75c4312b7632545fd3f140c8de99656931
Author: Galen Charlton <gmc at esilibrary.com>
Date: Tue Mar 25 14:41:07 2014 +0000
Bug 11701: (follow-up) move unit tests to t/db_dependent
The new tests will not function if there isn't a valid
configuration (or mocking of preference()) so this patch
moves them to t/db_dependent/Context.t.
To test:
[1] After applying the main patch for this bug, verify that
prove -v t/db_dependent/Context.t passes.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 8205529683da0f934f4bdb26ccd54f05b8246d0a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Conflicts:
t/Context.t
commit a9377e9a64718a383aec7ee4ad32bc260381160b
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Thu Feb 6 17:09:50 2014 +0100
Bug 11701: Unit tests for C4::Context::Zconn
TEST PLAN
---------
1) apply patch
2) run koha qa test tool
3) prove -v t/Context.t
Unit tests ran as expected.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit fed353edbc375ae9813fe251ea103e18aacb0587)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Conflicts:
t/Context.t
-----------------------------------------------------------------------
Summary of changes:
C4/Context.pm | 21 +++++++++------------
t/db_dependent/Context.t | 5 +++++
2 files changed, 14 insertions(+), 12 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list