[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.04-58-gbdfec37

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 17.05.x has been updated
       via  bdfec37ab66f9c72f86adc7d6045bc83b5a92d88 (commit)
       via  7394fc99fccff9bc8414147fe7fe9b9b6f2f422c (commit)
      from  90dffe1c68b00244c010e95a00a002f913a3f02a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bdfec37ab66f9c72f86adc7d6045bc83b5a92d88
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Sep 18 14:23:54 2017 -0300

    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 at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0d03f143e25f498de780d2ddd1972c3be7947519)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 7394fc99fccff9bc8414147fe7fe9b9b6f2f422c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Aug 31 11:47:11 2017 -0300

    Bug 19227: Reduce the number of tests run by 00-merge-conflict-markers.t
    
    The number of tests on jenkins is sometimes confusing:
    
    https://jenkins.koha-community.org/job/Koha_Master_D8/lastCompletedBuild/testReport/(root)/t_00_merge_conflict_markers_t/
    
    shows that 00-merge-conflict-markers.t ran 10,751 tests, 124 less than
    the previous run. However 124 files have not been removed from the
    codebase!
    
    I suggest to count only 1 test for all files.
    
    Moreover files from blib and cover_db are counted, they should be
    excluded.
    
    Test plan:
      prove t/00-merge-conflict-markers.t
    must return green
    
    echo ">>>>>>>" >> mainpage.pl
    and run the test again
    It should now fail
    
    Signed-off-by: Magnus Enger <magnus at libriotech.no>
    Works as advertised.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit f8502b0d197bab4b4966e9e02253d30f7fcf29f8)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

-----------------------------------------------------------------------

Summary of changes:
 t/00-merge-conflict-markers.t |   30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
main Koha release repository