http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15586 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15586 Héctor Eduardo Castro Avalos <hector.hecaxmmx@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |hector.hecaxmmx@gmail.com Status|Needs Signoff |In Discussion --- Comment #2 from Héctor Eduardo Castro Avalos <hector.hecaxmmx@gmail.com> --- Hi Kyle the patch fails in merging process Applying: Bug 15586 - References to Koha::Branches remain in unit tests Using index info to reconstruct a base tree... M t/db_dependent/BiblioObject.t M t/db_dependent/Hold.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Hold.t CONFLICT (content): Merge conflict in t/db_dependent/Hold.t Auto-merging t/db_dependent/BiblioObject.t CONFLICT (content): Merge conflict in t/db_dependent/BiblioObject.t Failed to merge in the changes. Patch failed at 0001 Bug 15586 - References to Koha::Branches remain in unit tests The copy of the patch that failed is found in: /var/koha/koha/.git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-15586---References-to-KohaBranches-remain-in-u-Ltdaou.patch -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15586 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #46730|0 |1 is obsolete| | --- Comment #3 from Kyle M Hall <kyle@bywatersolutions.com> --- Created attachment 46738 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=46738&action=edit Bug 15586 - References to Koha::Branches remain in unit tests The unit tests BiblioObject.t and Hold.t still have references to Koha::Branches that need to be changed to Koha::Libraries. These tests currently fail because of this. Test Plan: 1) prove t/db_dependent/BiblioObject.t should fail 2) prove t/db_dependent/Hold.t should fail 3) Apply this patch 1) prove t/db_dependent/BiblioObject.t should pass 2) prove t/db_dependent/Hold.t should pass -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15586 Chris Cormack <chris@bigballofwax.co.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #46738|0 |1 is obsolete| | --- Comment #4 from Chris Cormack <chris@bigballofwax.co.nz> --- Created attachment 46740 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=46740&action=edit Bug 15586 - References to Koha::Branches remain in unit tests The unit tests BiblioObject.t and Hold.t still have references to Koha::Branches that need to be changed to Koha::Libraries. These tests currently fail because of this. Test Plan: 1) prove t/db_dependent/BiblioObject.t should fail 2) prove t/db_dependent/Hold.t should fail 3) Apply this patch 1) prove t/db_dependent/BiblioObject.t should pass 2) prove t/db_dependent/Hold.t should pass Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15586 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- QA Contact|testopia@bugs.koha-communit |gmcharlt@gmail.com |y.org | Component|Architecture, internals, |Test Suite |and plumbing | CC| |katrin.fischer@bsz-bw.de -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15586 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #46740|0 |1 is obsolete| | --- Comment #5 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 46763 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=46763&action=edit [PASSED QA] Bug 15586 - References to Koha::Branches remain in unit tests The unit tests BiblioObject.t and Hold.t still have references to Koha::Branches that need to be changed to Koha::Libraries. These tests currently fail because of this. Test Plan: 1) prove t/db_dependent/BiblioObject.t should fail 2) prove t/db_dependent/Hold.t should fail 3) Apply this patch 1) prove t/db_dependent/BiblioObject.t should pass 2) prove t/db_dependent/Hold.t should pass Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15586 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master --- Comment #7 from Kyle M Hall <kyle@bywatersolutions.com> --- Pushed to master! -- You are receiving this mail because: You are watching all bug changes.