]> git.koha-community.org Git - koha.git/commit
Bug 19335: Fix 00-merge-conflict-markers.t when dockerised
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Mon, 18 Sep 2017 17:23:54 +0000 (14:23 -0300)
committerFridolin Somers <fridolin.somers@biblibre.com>
Tue, 3 Oct 2017 07:00:59 +0000 (09:00 +0200)
commitbdfec37ab66f9c72f86adc7d6045bc83b5a92d88
tree666fc033a8359aba1ea3ba8352d2ee39b6a36899
parent7394fc99fccff9bc8414147fe7fe9b9b6f2f422c
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>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 0d03f143e25f498de780d2ddd1972c3be7947519)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
t/00-merge-conflict-markers.t