Skip to content

tests: iterator: fix iterator expecting too few items #5393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ethomson merged 1 commit into from
Feb 8, 2020
Merged

tests: iterator: fix iterator expecting too few items #5393

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions tests/iterator/workdir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand All @@ -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);
}
Expand Down