From f01fa26690d28efe9f73daf81d0ba11b2b77ccbc Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Thu, 23 Feb 2012 11:17:48 -0800 Subject: [PATCH] Fix workdir iterator unit tests This test is fragile if you leave extra files in the test data directory, such as a foo.c~ file from editing with Emacs. Who would do such a thing? --- tests-clar/diff/iterator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests-clar/diff/iterator.c b/tests-clar/diff/iterator.c index 46f8f59fb..d6b548ed0 100644 --- a/tests-clar/diff/iterator.c +++ b/tests-clar/diff/iterator.c @@ -312,7 +312,7 @@ static void workdir_iterator_test( while (entry != NULL) { int ignored = git_iterator_current_is_ignored(i); - if (!ignored && S_ISDIR(entry->mode)) { + if (S_ISDIR(entry->mode)) { cl_git_pass(git_iterator_advance_into_directory(i, &entry)); continue; } @@ -338,7 +338,7 @@ static void workdir_iterator_test( void test_diff_iterator__workdir_0(void) { - workdir_iterator_test("attr", 15, 4, NULL, "ign"); + workdir_iterator_test("attr", 24, 2, NULL, "ign"); } static const char *status_paths[] = {