From 27133caf3c912d81657d307577869571b70cc102 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Sat, 20 Jun 2015 17:20:07 +0200 Subject: tests: move racy tests to the index They fit there much better, even though we often check by diffing, it's about the behaviour of the index. --- tests/diff/racy.c | 100 ----------------------------------------------------- tests/index/racy.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 100 deletions(-) delete mode 100644 tests/diff/racy.c create mode 100644 tests/index/racy.c diff --git a/tests/diff/racy.c b/tests/diff/racy.c deleted file mode 100644 index a516e26c0..000000000 --- a/tests/diff/racy.c +++ /dev/null @@ -1,100 +0,0 @@ -#include "clar_libgit2.h" -#include "../checkout/checkout_helpers.h" - -#include "buffer.h" -#include "index.h" - -static git_repository *g_repo; - -void test_diff_racy__initialize(void) -{ - cl_git_pass(git_repository_init(&g_repo, "diff_racy", false)); -} - -void test_diff_racy__cleanup(void) -{ - git_repository_free(g_repo); - g_repo = NULL; - - cl_fixture_cleanup("diff_racy"); -} - -void test_diff_racy__diff(void) -{ - git_index *index; - git_diff *diff; - git_buf path = GIT_BUF_INIT; - - cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_repo), "A")); - cl_git_mkfile(path.ptr, "A"); - - /* Put 'A' into the index */ - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_add_bypath(index, "A")); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, NULL)); - cl_assert_equal_i(0, git_diff_num_deltas(diff)); - git_diff_free(diff); - - /* Change its contents quickly, so we get the same timestamp */ - cl_git_mkfile(path.ptr, "B"); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, NULL)); - cl_assert_equal_i(1, git_diff_num_deltas(diff)); - - git_index_free(index); - git_diff_free(diff); - git_buf_free(&path); -} - -void test_diff_racy__write_index_just_after_file(void) -{ - git_index *index; - git_diff *diff; - git_buf path = GIT_BUF_INIT; - struct timeval times[2]; - - /* Make sure we do have a timestamp */ - cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_pass(git_index_write(index)); - - cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_repo), "A")); - cl_git_mkfile(path.ptr, "A"); - /* Force the file's timestamp to be a second after we wrote the index */ - times[0].tv_sec = index->stamp.mtime + 1; - times[0].tv_usec = 0; - times[1].tv_sec = index->stamp.mtime + 1; - times[1].tv_usec = 0; - cl_git_pass(p_utimes(path.ptr, times)); - - /* - * Put 'A' into the index, the size field will be filled, - * because the index' on-disk timestamp does not match the - * file's timestamp. - */ - cl_git_pass(git_index_add_bypath(index, "A")); - cl_git_pass(git_index_write(index)); - - cl_git_mkfile(path.ptr, "B"); - /* - * Pretend this index' modification happend a second after the - * file update, and rewrite the file in that same second. - */ - times[0].tv_sec = index->stamp.mtime + 2; - times[0].tv_usec = 0; - times[1].tv_sec = index->stamp.mtime + 2; - times[0].tv_usec = 0; - - cl_git_pass(p_utimes(git_index_path(index), times)); - cl_git_pass(p_utimes(path.ptr, times)); - - cl_git_pass(git_index_read(index, true)); - - cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, NULL)); - cl_assert_equal_i(1, git_diff_num_deltas(diff)); - - git_buf_free(&path); - git_diff_free(diff); - git_index_free(index); -} diff --git a/tests/index/racy.c b/tests/index/racy.c new file mode 100644 index 000000000..089fe5d7d --- /dev/null +++ b/tests/index/racy.c @@ -0,0 +1,100 @@ +#include "clar_libgit2.h" +#include "../checkout/checkout_helpers.h" + +#include "buffer.h" +#include "index.h" + +static git_repository *g_repo; + +void test_index_racy__initialize(void) +{ + cl_git_pass(git_repository_init(&g_repo, "diff_racy", false)); +} + +void test_index_racy__cleanup(void) +{ + git_repository_free(g_repo); + g_repo = NULL; + + cl_fixture_cleanup("diff_racy"); +} + +void test_index_racy__diff(void) +{ + git_index *index; + git_diff *diff; + git_buf path = GIT_BUF_INIT; + + cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_repo), "A")); + cl_git_mkfile(path.ptr, "A"); + + /* Put 'A' into the index */ + cl_git_pass(git_repository_index(&index, g_repo)); + cl_git_pass(git_index_add_bypath(index, "A")); + cl_git_pass(git_index_write(index)); + + cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, NULL)); + cl_assert_equal_i(0, git_diff_num_deltas(diff)); + git_diff_free(diff); + + /* Change its contents quickly, so we get the same timestamp */ + cl_git_mkfile(path.ptr, "B"); + + cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, NULL)); + cl_assert_equal_i(1, git_diff_num_deltas(diff)); + + git_index_free(index); + git_diff_free(diff); + git_buf_free(&path); +} + +void test_index_racy__write_index_just_after_file(void) +{ + git_index *index; + git_diff *diff; + git_buf path = GIT_BUF_INIT; + struct timeval times[2]; + + /* Make sure we do have a timestamp */ + cl_git_pass(git_repository_index(&index, g_repo)); + cl_git_pass(git_index_write(index)); + + cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_repo), "A")); + cl_git_mkfile(path.ptr, "A"); + /* Force the file's timestamp to be a second after we wrote the index */ + times[0].tv_sec = index->stamp.mtime + 1; + times[0].tv_usec = 0; + times[1].tv_sec = index->stamp.mtime + 1; + times[1].tv_usec = 0; + cl_git_pass(p_utimes(path.ptr, times)); + + /* + * Put 'A' into the index, the size field will be filled, + * because the index' on-disk timestamp does not match the + * file's timestamp. + */ + cl_git_pass(git_index_add_bypath(index, "A")); + cl_git_pass(git_index_write(index)); + + cl_git_mkfile(path.ptr, "B"); + /* + * Pretend this index' modification happend a second after the + * file update, and rewrite the file in that same second. + */ + times[0].tv_sec = index->stamp.mtime + 2; + times[0].tv_usec = 0; + times[1].tv_sec = index->stamp.mtime + 2; + times[0].tv_usec = 0; + + cl_git_pass(p_utimes(git_index_path(index), times)); + cl_git_pass(p_utimes(path.ptr, times)); + + cl_git_pass(git_index_read(index, true)); + + cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, NULL)); + cl_assert_equal_i(1, git_diff_num_deltas(diff)); + + git_buf_free(&path); + git_diff_free(diff); + git_index_free(index); +} -- cgit v1.2.1