Commit 12212258ec0e1ac663122654868d75ba97d32c7f
2013-06-24T12:02:43
Merge pull request #1674 from arrbee/fix-checkout-target-dir-win32 Fix checkout tests on Windows
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
diff --git a/tests-clar/checkout/index.c b/tests-clar/checkout/index.c
index c7500db..9d8b321 100644
--- a/tests-clar/checkout/index.c
+++ b/tests-clar/checkout/index.c
@@ -26,6 +26,10 @@ void test_checkout_index__initialize(void)
void test_checkout_index__cleanup(void)
{
cl_git_sandbox_cleanup();
+
+ /* try to remove alternative dir */
+ if (git_path_isdir("alternative"))
+ git_futils_rmdir_r("alternative", NULL, GIT_RMDIR_REMOVE_FILES);
}
void test_checkout_index__cannot_checkout_a_bare_repository(void)
@@ -576,9 +580,10 @@ void test_checkout_index__target_directory_from_bare(void)
cl_assert_equal_i(0, cts.n_ignored);
cl_assert_equal_i(3, cts.n_updates);
- check_file_contents("./alternative/README", "hey there\n");
- check_file_contents("./alternative/branch_file.txt", "hi\nbye!\n");
- check_file_contents("./alternative/new.txt", "my new file\n");
+ /* files will have been filtered if needed, so strip CR */
+ check_file_contents_nocr("./alternative/README", "hey there\n");
+ check_file_contents_nocr("./alternative/branch_file.txt", "hi\nbye!\n");
+ check_file_contents_nocr("./alternative/new.txt", "my new file\n");
cl_git_pass(git_futils_rmdir_r(
"alternative", NULL, GIT_RMDIR_REMOVE_FILES));
diff --git a/tests-clar/checkout/tree.c b/tests-clar/checkout/tree.c
index 0e65f28..e4bfbce 100644
--- a/tests-clar/checkout/tree.c
+++ b/tests-clar/checkout/tree.c
@@ -24,6 +24,9 @@ void test_checkout_tree__cleanup(void)
g_object = NULL;
cl_git_sandbox_cleanup();
+
+ if (git_path_isdir("alternative"))
+ git_futils_rmdir_r("alternative", NULL, GIT_RMDIR_REMOVE_FILES);
}
void test_checkout_tree__cannot_checkout_a_non_treeish(void)
@@ -667,9 +670,9 @@ void test_checkout_tree__target_directory_from_bare(void)
cl_assert_equal_i(0, cts.n_ignored);
cl_assert_equal_i(3, cts.n_updates);
- check_file_contents("./alternative/README", "hey there\n");
- check_file_contents("./alternative/branch_file.txt", "hi\nbye!\n");
- check_file_contents("./alternative/new.txt", "my new file\n");
+ check_file_contents_nocr("./alternative/README", "hey there\n");
+ check_file_contents_nocr("./alternative/branch_file.txt", "hi\nbye!\n");
+ check_file_contents_nocr("./alternative/new.txt", "my new file\n");
cl_git_pass(git_futils_rmdir_r(
"alternative", NULL, GIT_RMDIR_REMOVE_FILES));