Summary: | References to Koha::Branches remain in unit tests | ||
---|---|---|---|
Product: | Koha | Reporter: | Kyle M Hall (khall) <kyle> |
Component: | Test Suite | Assignee: | Kyle M Hall (khall) <kyle> |
Status: | CLOSED FIXED | QA Contact: | Galen Charlton <gmcharlt> |
Severity: | minor | ||
Priority: | P5 - low | CC: | chris, hector.hecaxmmx, jonathan.druart, julian.maurice |
Version: | unspecified | ||
Hardware: | All | ||
OS: | All | ||
GIT URL: | Change sponsored?: | --- | |
Patch complexity: | Trivial patch | Documentation contact: | |
Documentation submission: | Text to go in the release notes: | ||
Version(s) released in: | Circulation function: | ||
Bug Depends on: | 15294 | ||
Bug Blocks: | |||
Attachments: |
Bug 15586 - References to Koha::Branches remain in unit tests
Bug 15586 - References to Koha::Branches remain in unit tests Bug 15586 - References to Koha::Branches remain in unit tests [PASSED QA] Bug 15586 - References to Koha::Branches remain in unit tests |
Description
Kyle M Hall (khall)
2016-01-15 18:48:03 UTC
Created attachment 46730 [details] [review] 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 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 Created attachment 46738 [details] [review] 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 Created attachment 46740 [details] [review] 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> Created attachment 46763 [details] [review] [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> I have added a new test in the QA tools to avoid that: commit 6cae93f77e8b3b909e290a967c8171aac913bd5f Koha::Branches has been removed by bug 15294 Pushed to master! (In reply to Jonathan Druart from comment #6) > I have added a new test in the QA tools to avoid that: > > commit 6cae93f77e8b3b909e290a967c8171aac913bd5f > Koha::Branches has been removed by bug 15294 Thanks Jonathan! This bug does not concern stable versions, changing status to RESOLVED |