Commit 27133caf3c912d81657d307577869571b70cc102
2015-06-20T17:20:07
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.
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 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212
diff --git a/tests/diff/racy.c b/tests/diff/racy.c
deleted file mode 100644
index a516e26..0000000
--- 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 0000000..089fe5d
--- /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);
+}