From 4cef5ec9611cc2fbbd245472b60e1580f6f8b4b5 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Sat, 13 Nov 2010 09:36:15 -0500 Subject: [PATCH] bug 5400: new test case to find files with merge conflict markers Signed-off-by: Galen Charlton Signed-off-by: Chris Cormack --- t/00-merge-conflict-markers.t | 59 +++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 t/00-merge-conflict-markers.t diff --git a/t/00-merge-conflict-markers.t b/t/00-merge-conflict-markers.t new file mode 100644 index 0000000000..24743aee11 --- /dev/null +++ b/t/00-merge-conflict-markers.t @@ -0,0 +1,59 @@ +# Copyright 2010 Galen Charlton +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +use strict; +use warnings; + +use Test::More; +use File::Spec; +use File::Find; +use IO::File; + +find({ + bydepth => 1, + no_chdir => 1, + wanted => sub { + my $file = $_; + + return if $file =~ /\.(ico|jpg|gif|ogg|pdf|png|psd|swf|zip)$/; + return unless -f $file; + + my @name_parts = File::Spec->splitpath($file); + my %dirs = map { $_ => 1 } File::Spec->splitdir($name_parts[1]); + return if exists $dirs{'.git'}; + + my $fh = IO::File->new($file, 'r'); + my $marker_found = 0; + my $line = 0; + while (<$fh>) { + $line++; + if (/^<<<<<>>>>>/) { + # could check for ^=====, but that's often used in text files + $marker_found = 1; + last; + } + } + close $fh; + if ($marker_found) { + fail("$file has no merge conflict markers"); + diag("marker found in line $line"); + } else { + pass("$file has no merge conflict markers"); + } + }, +}, File::Spec->curdir()); +done_testing(); -- 2.20.1