Commit f01fa26690d28efe9f73daf81d0ba11b2b77ccbc

Russell Belfer 2012-02-23T11:17:48

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?

diff --git a/tests-clar/diff/iterator.c b/tests-clar/diff/iterator.c
index 46f8f59..d6b548e 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[] = {