Summary: | 00-merge-markers.t fails | ||
---|---|---|---|
Product: | Koha | Reporter: | Tomás Cohen Arazi (tcohen) <tomascohen> |
Component: | Test Suite | Assignee: | Jonathan Druart <jonathan.druart> |
Status: | CLOSED FIXED | QA Contact: | Tomás Cohen Arazi (tcohen) <tomascohen> |
Severity: | normal | ||
Priority: | P5 - low | CC: | fridolin.somers, jonathan.druart, mtj |
Version: | Main | ||
Hardware: | All | ||
OS: | All | ||
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: | 19227 | ||
Bug Blocks: | |||
Attachments: |
Bug 19335: Fix 00-merge-conflict-markers.t when dockerised
Bug 19335: Fix 00-merge-conflict-markers.t when dockerised |
Description
Tomás Cohen Arazi (tcohen)
2017-09-18 17:21:22 UTC
Created attachment 67189 [details] [review] Bug 19335: Fix 00-merge-conflict-markers.t when dockerised This does not make sense, but fix a bug (why?) Without this patch, the tests failed on po files: [17:14:26] t/00-merge-conflict-markers.t .. Failed 1/1 subtests Test Summary Report ------------------- t/00-merge-conflict-markers.t (Wstat: 9 Tests: 0 Failed: 0) Non-zero wait status: 9 Parse errors: Bad plan. You planned 1 tests but ran 0. Result: FAIL Note that this is not related to bug 19227. if the ^>>>>>> and ^<<<<<< matches are done on the same line, the test fail As saw it failed on *-pref.po files misc/translator/po/kn-Knda-pref.po misc/translator/po/ja-Jpan-JP-pref.po misc/translator/po/nl-BE-pref.po misc/translator/po/sr-Cyrl-pref.po Created attachment 67190 [details] [review] Bug 19335: Fix 00-merge-conflict-markers.t when dockerised This does not make sense, but fix a bug (why?) Without this patch, the tests failed on po files: [17:14:26] t/00-merge-conflict-markers.t .. Failed 1/1 subtests Test Summary Report ------------------- t/00-merge-conflict-markers.t (Wstat: 9 Tests: 0 Failed: 0) Non-zero wait status: 9 Parse errors: Bad plan. You planned 1 tests but ran 0. Result: FAIL Note that this is not related to bug 19227. if the ^>>>>>> and ^<<<<<< matches are done on the same line, the test fail As saw it failed on *-pref.po files misc/translator/po/kn-Knda-pref.po misc/translator/po/ja-Jpan-JP-pref.po misc/translator/po/nl-BE-pref.po misc/translator/po/sr-Cyrl-pref.po Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Skipping QA, we want Jenkins green. Pushed to master for 17.11, thanks to everybody involved! Depends on Bug 19227 that changes the use of $line Pushed to 17.05.x, will be in 17.05.05. This patch has been pushed to 16.11.x and will be in 16.11.13. Pushed to 16.05.x, for 16.05.18 release |