https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19227 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19227 Jonathan Druart <jonathan.druart@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |tomascohen@gmail.com -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19227 Magnus Enger <magnus@libriotech.no> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #66673|0 |1 is obsolete| | --- Comment #2 from Magnus Enger <magnus@libriotech.no> --- Created attachment 66834 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=66834&action=edit 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/tes... 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@libriotech.no> Works as advertised. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19227 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #66834|0 |1 is obsolete| | --- Comment #3 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Created attachment 67045 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=67045&action=edit 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/tes... 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@libriotech.no> Works as advertised. Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19227 Fridolin SOMERS <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |19335 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19335 [Bug 19335] 00-merge-markers.t fails -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19227 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |katrin.fischer@bsz-bw.de --- Comment #6 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- This patch has been pushed to 16.11.x and will be in 16.11.13. -- You are receiving this mail because: You are watching all bug changes.