Commit 26b71d605ca6bbc926b58992e20d75e589d9c4f7
2020-02-07T14:36:10
tests: iterator: fix iterator expecting too few items The testcase iterator::workdir::filesystem_gunk sets up quite a lot of directories, which is why it only runs in case GITTEST_INVASIVE_SPEED is set in the environment. Because we do not run our default CI with this variable, we didn't notice commit 852c83ee4 (refs: refuse to delete HEAD, 2020-01-15) breaking the test as it introduced a new reference to the "testrepo" repository. Fix the oversight by increasing the number of expected iterator items.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47
diff --git a/tests/iterator/workdir.c b/tests/iterator/workdir.c
index 72f8bf4..547fb7d 100644
--- a/tests/iterator/workdir.c
+++ b/tests/iterator/workdir.c
@@ -637,13 +637,14 @@ void test_iterator_workdir__filesystem2(void)
git_iterator_free(i);
}
-/* Lots of empty dirs, or nearly empty ones, make the old workdir
- * iterator cry. Also, segfault.
+/*
+ * Lots of empty dirs, or nearly empty ones, make the old workdir
+ * iterator cry. Also, segfault.
*/
void test_iterator_workdir__filesystem_gunk(void)
{
- git_iterator *i;
git_buf parent = GIT_BUF_INIT;
+ git_iterator *i;
int n;
if (!cl_is_env_set("GITTEST_INVASIVE_SPEED"))
@@ -653,19 +654,18 @@ void test_iterator_workdir__filesystem_gunk(void)
for (n = 0; n < 100000; n++) {
git_buf_clear(&parent);
- git_buf_printf(&parent, "%s/refs/heads/foo/%d/subdir",
- git_repository_path(g_repo), n);
- cl_assert(!git_buf_oom(&parent));
-
+ cl_git_pass(git_buf_printf(&parent, "%s/refs/heads/foo/%d/subdir", git_repository_path(g_repo), n));
cl_git_pass(git_futils_mkdir(parent.ptr, 0775, GIT_MKDIR_PATH));
}
cl_git_pass(git_iterator_for_filesystem(&i, "testrepo/.git/refs", NULL));
- /* should only have 16 items, since we're not asking for trees to be
+ /*
+ * Should only have 17 items, since we're not asking for trees to be
* returned. the goal of this test is simply to not crash.
*/
- expect_iterator_items(i, 16, NULL, 15, NULL);
+ expect_iterator_items(i, 17, NULL, 16, NULL);
+
git_iterator_free(i);
git_buf_dispose(&parent);
}