[Koha-bugs] [Bug 18292] Tests do not need to return 1;

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18292

Alex Buckley <alexbuckley at catalyst.net.nz> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |alexbuckley at catalyst.net.nz
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #12 from Alex Buckley <alexbuckley at catalyst.net.nz> ---
Hi Jonathan

Can you please merge your patches with master as they will not apply
successfully, with the below error message being thrown:

Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/www/search_utf8.t
Auto-merging t/db_dependent/www/history.t
Auto-merging t/db_dependent/www/batch.t
Auto-merging t/db_dependent/Utils/Datatables_Members.t
CONFLICT (content): Merge conflict in t/db_dependent/Utils/Datatables_Members.t
Auto-merging t/db_dependent/Serials/ReNewSubscription.t
Auto-merging t/db_dependent/Search.t
Auto-merging t/db_dependent/Reserves/MultiplePerRecord.t
Auto-merging t/db_dependent/Patron/Borrower_PrevCheckout.t
Auto-merging t/db_dependent/Patron/Borrower_Discharge.t
Auto-merging t/db_dependent/Members/IssueSlip.t
Auto-merging t/db_dependent/Members/GetPendingIssues.t
Auto-merging t/db_dependent/Members/GetAllIssues.t
Auto-merging t/db_dependent/Koha_Elasticsearch_Indexer.t
CONFLICT (content): Merge conflict in
t/db_dependent/Koha_Elasticsearch_Indexer.t
Auto-merging t/db_dependent/Koha/Patrons.t
Auto-merging t/db_dependent/Koha/Objects.t
Auto-merging t/db_dependent/Circulation/SwitchOnSiteCheckouts.t
Auto-merging t/db_dependent/Circulation/Returns.t
Auto-merging t/db_dependent/Circulation/IsItemIssued.t
Auto-merging t/db_dependent/Circulation/GetPendingOnSiteCheckouts.t
Auto-merging t/db_dependent/Circulation/CheckIfIssuedToPatron.t
Auto-merging t/db_dependent/Circulation/Branch.t
Auto-merging t/Charset.t
CONFLICT (content): Merge conflict in t/Charset.t
Failed to merge in the changes.
Patch failed at 0001 Bug 18292: Remove return 1 statements in tests
The copy of the patch that failed is found in:
   /home/vagrant/kohaclone/.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-18292-Remove-return-1-statements-in-tests-GqX5DD.patch

-- 
You are receiving this mail because:
You are watching all bug changes.