From 7394fc99fccff9bc8414147fe7fe9b9b6f2f422c Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 31 Aug 2017 11:47:11 -0300 Subject: [PATCH] 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 Works as advertised. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit f8502b0d197bab4b4966e9e02253d30f7fcf29f8) Signed-off-by: Fridolin Somers --- t/00-merge-conflict-markers.t | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/t/00-merge-conflict-markers.t b/t/00-merge-conflict-markers.t index 0269328d81..2cbe8cf344 100644 --- a/t/00-merge-conflict-markers.t +++ b/t/00-merge-conflict-markers.t @@ -15,14 +15,14 @@ # You should have received a copy of the GNU General Public License # along with Koha; if not, see . -use strict; -use warnings; +use Modern::Perl; -use Test::More; +use Test::More tests => 1; use File::Spec; use File::Find; use IO::File; +my @failures; find({ bydepth => 1, no_chdir => 1, @@ -48,11 +48,8 @@ find({ } } close $fh; - if ($marker_found) { - fail("$file contains merge conflict markers in line $line"); - } else { - pass("$file has no merge conflict markers"); - } - }, + push @failures, $file if $marker_found; +}, }, File::Spec->curdir()); -done_testing(); + +is( @failures, 0, 'Files should not contain merge markers' . ( @failures ? ( ' (' . join( ', ', @failures ) . ' )' ) : '' ) ); -- 2.39.5