Bug 15586

Summary: References to Koha::Branches remain in unit tests
Product: Koha Reporter: Kyle M Hall (khall) <kyle>
Component: Test SuiteAssignee: 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
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.
Comment 1 Kyle M Hall (khall) 2016-01-15 18:49:21 UTC Comment hidden (obsolete)
Comment 2 Héctor Eduardo Castro Avalos 2016-01-16 00:03:58 UTC
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
Comment 3 Kyle M Hall (khall) 2016-01-16 01:28:54 UTC Comment hidden (obsolete)
Comment 4 Chris Cormack 2016-01-16 02:10:41 UTC Comment hidden (obsolete)
Comment 5 Katrin Fischer 2016-01-18 07:09:12 UTC
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>
Comment 6 Jonathan Druart 2016-01-19 11:58:02 UTC
I have added a new test in the QA tools to avoid that:

commit 6cae93f77e8b3b909e290a967c8171aac913bd5f
    Koha::Branches has been removed by bug 15294
Comment 7 Kyle M Hall (khall) 2016-01-19 12:33:12 UTC
Pushed to master!
Comment 8 Kyle M Hall (khall) 2016-01-19 12:39:03 UTC
(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!
Comment 9 Julian Maurice 2016-02-01 16:57:20 UTC
This bug does not concern stable versions, changing status to RESOLVED