Commit 3b40ed897fdc36b958455b14673ab15cda7e0599
2015-01-08T19:23:37
repo::init test: create hook symlink Remove the hook symlink from the test resources, so that we can have a source tree that is easy to zip up and copy around on systems that don't support symlinks. Create it dynamically at test execution instead.
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
diff --git a/tests/repo/init.c b/tests/repo/init.c
index 56fd6b8..ed86f6e 100644
--- a/tests/repo/init.c
+++ b/tests/repo/init.c
@@ -510,6 +510,32 @@ static void assert_mode_seems_okay(
GIT_MODE_TYPE(expect_mode), GIT_MODE_TYPE(st.st_mode), "%07o");
}
+static const char *template_sandbox(const char *name)
+{
+ git_buf hooks_path = GIT_BUF_INIT, link_path = GIT_BUF_INIT;
+ const char *path = cl_fixture(name);
+
+ cl_fixture_sandbox(name);
+
+ /* create a symlink from link.sample to update.sample if the filesystem
+ * supports it.
+ */
+
+ cl_git_pass(git_buf_joinpath(&hooks_path, name, "hooks"));
+ cl_git_pass(git_buf_joinpath(&link_path, hooks_path.ptr, "link.sample"));
+
+#ifdef GIT_WIN32
+ cl_git_mkfile(link_path.ptr, "#!/bin/sh\necho hello, world\n");
+#else
+ cl_must_pass(symlink("update.sample", link_path.ptr));
+#endif
+
+ git_buf_free(&link_path);
+ git_buf_free(&hooks_path);
+
+ return path;
+}
+
void test_repo_init__extended_with_template(void)
{
git_buf expected = GIT_BUF_INIT;
@@ -518,10 +544,11 @@ void test_repo_init__extended_with_template(void)
int filemode;
cl_set_cleanup(&cleanup_repository, "templated.git");
+ template_sandbox("template");
opts.flags = GIT_REPOSITORY_INIT_MKPATH | GIT_REPOSITORY_INIT_BARE |
GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE;
- opts.template_path = cl_fixture("template");
+ opts.template_path = "template";
cl_git_pass(git_repository_init_ext(&_repo, "templated.git", &opts));
@@ -529,8 +556,7 @@ void test_repo_init__extended_with_template(void)
cl_assert(!git__suffixcmp(git_repository_path(_repo), "/templated.git/"));
- cl_git_pass(git_futils_readbuffer(
- &expected, cl_fixture("template/description")));
+ cl_git_pass(git_futils_readbuffer(&expected, "template/description"));
cl_git_pass(git_futils_readbuffer(
&actual, "templated.git/description"));
@@ -542,12 +568,14 @@ void test_repo_init__extended_with_template(void)
filemode = cl_repo_get_bool(_repo, "core.filemode");
assert_hooks_match(
- cl_fixture("template"), git_repository_path(_repo),
+ "template", git_repository_path(_repo),
"hooks/update.sample", filemode);
assert_hooks_match(
- cl_fixture("template"), git_repository_path(_repo),
+ "template", git_repository_path(_repo),
"hooks/link.sample", filemode);
+
+ cl_fixture_cleanup("template");
}
void test_repo_init__extended_with_template_and_shared_mode(void)
@@ -559,10 +587,11 @@ void test_repo_init__extended_with_template_and_shared_mode(void)
const char *repo_path = NULL;
cl_set_cleanup(&cleanup_repository, "init_shared_from_tpl");
+ template_sandbox("template");
opts.flags = GIT_REPOSITORY_INIT_MKPATH |
GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE;
- opts.template_path = cl_fixture("template");
+ opts.template_path = "template";
opts.mode = GIT_REPOSITORY_INIT_SHARED_GROUP;
cl_git_pass(git_repository_init_ext(&_repo, "init_shared_from_tpl", &opts));
@@ -573,7 +602,7 @@ void test_repo_init__extended_with_template_and_shared_mode(void)
filemode = cl_repo_get_bool(_repo, "core.filemode");
cl_git_pass(git_futils_readbuffer(
- &expected, cl_fixture("template/description")));
+ &expected, "template/description"));
cl_git_pass(git_futils_readbuffer(
&actual, "init_shared_from_tpl/.git/description"));
@@ -592,15 +621,17 @@ void test_repo_init__extended_with_template_and_shared_mode(void)
/* for a non-symlinked hook, it should have shared permissions now */
assert_hooks_match(
- cl_fixture("template"), git_repository_path(_repo),
+ "template", git_repository_path(_repo),
"hooks/update.sample", filemode);
/* for a symlinked hook, the permissions still should match the
* source link, not the GIT_REPOSITORY_INIT_SHARED_GROUP value
*/
assert_hooks_match(
- cl_fixture("template"), git_repository_path(_repo),
+ "template", git_repository_path(_repo),
"hooks/link.sample", filemode);
+
+ cl_fixture_cleanup("template");
}
void test_repo_init__can_reinit_an_initialized_repository(void)
diff --git a/tests/resources/template/hooks/link.sample b/tests/resources/template/hooks/link.sample
deleted file mode 120000
index 771acc4..0000000
--- a/tests/resources/template/hooks/link.sample
+++ /dev/null
@@ -1 +0,0 @@
-update.sample
\ No newline at end of file