Commit 0d12b8dd77010f53cac936947c2b1b51452c5ac9
2019-07-19T09:43:34
tests: repo: refactor setup of templates and repos All tests in repo::template have a common pattern of first setting up templates, then settung up the repository that makes use of those templates via several init options. Refactor this pattern into two functions `setup_templates` and `setup_repo` that handle most of that logic to make it easier to spot what a test actually wants to check. Furthermore, this also refactors how we clean up after the tests. Previously, it was a combination of manually calling `cl_fixture_cleanup` and `cl_set_cleanup`, which really is kind of hard to read. This commit refactors this to instead provide the cleaning parameters in the setup functions. All cleanups are then performed in the suite's cleanup function.
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
diff --git a/tests/repo/template.c b/tests/repo/template.c
index c54c0c1..e86582a 100644
--- a/tests/repo/template.c
+++ b/tests/repo/template.c
@@ -9,6 +9,9 @@ static git_repository *_repo = NULL;
static mode_t g_umask = 0;
static git_buf _global_path = GIT_BUF_INIT;
+static const char *fixture_repo;
+static const char *fixture_templates;
+
void test_repo_template__initialize(void)
{
_repo = NULL;
@@ -27,14 +30,19 @@ void test_repo_template__cleanup(void)
git_buf_dispose(&_global_path);
cl_fixture_cleanup("tmp_global_path");
-}
-static void cleanup_repository(void *path)
-{
+ if (fixture_repo) {
+ cl_fixture_cleanup(fixture_repo);
+ fixture_repo = NULL;
+ }
+
+ if (fixture_templates) {
+ cl_fixture_cleanup(fixture_templates);
+ fixture_templates = NULL;
+ }
+
git_repository_free(_repo);
_repo = NULL;
-
- cl_fixture_cleanup((const char *)path);
}
static void assert_hooks_match(
@@ -99,11 +107,21 @@ 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)
+static void setup_repo(const char *name, git_repository_init_options *opts)
+{
+ cl_git_pass(git_repository_init_ext(&_repo, name, opts));
+ fixture_repo = name;
+}
+
+static void setup_templates(const char *name, bool setup_globally)
{
git_buf path = GIT_BUF_INIT;
- cl_fixture_sandbox(name);
+ cl_fixture_sandbox("template");
+ if (strcmp(name, "template"))
+ cl_must_pass(p_rename("template", name));
+
+ fixture_templates = name;
/*
* Create a symlink from link.sample to update.sample if the filesystem
@@ -122,13 +140,14 @@ static const char *template_sandbox(const char *name)
cl_git_pass(git_buf_join3(&path, '/', name, "hooks", ".dotfile"));
cl_git_mkfile(path.ptr, "something\n");
- git_buf_dispose(&path);
- return cl_fixture(name);
-}
+ git_buf_clear(&path);
-static void configure_templatedir(const char *template_path)
-{
- create_tmp_global_config("tmp_global_path", "init.templatedir", template_path);
+ if (setup_globally) {
+ cl_git_pass(git_buf_joinpath(&path, clar_sandbox_path(), name));
+ create_tmp_global_config("tmp_global_path", "init.templatedir", path.ptr);
+ }
+
+ git_buf_dispose(&path);
}
static void validate_templates(git_repository *repo, const char *template_path)
@@ -167,93 +186,55 @@ void test_repo_template__external_templates_specified_in_options(void)
{
git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT;
- 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 = "template";
- cl_git_pass(git_repository_init_ext(&_repo, "templated.git", &opts));
-
- cl_assert(git_repository_is_bare(_repo));
-
- cl_assert(!git__suffixcmp(git_repository_path(_repo), "/templated.git/"));
+ setup_templates("template", false);
+ setup_repo("templated.git", &opts);
validate_templates(_repo, "template");
- cl_fixture_cleanup("template");
}
void test_repo_template__external_templates_specified_in_config(void)
{
- git_buf template_path = GIT_BUF_INIT;
-
git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT;
- cl_set_cleanup(&cleanup_repository, "templated.git");
- template_sandbox("template");
-
- cl_git_pass(git_buf_joinpath(&template_path, clar_sandbox_path(),
- "template"));
-
- configure_templatedir(template_path.ptr);
-
opts.flags = GIT_REPOSITORY_INIT_MKPATH | GIT_REPOSITORY_INIT_BARE |
GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE;
- cl_git_pass(git_repository_init_ext(&_repo, "templated.git", &opts));
+ setup_templates("template", true);
+ setup_repo("templated.git", &opts);
validate_templates(_repo, "template");
- cl_fixture_cleanup("template");
-
- git_buf_dispose(&template_path);
}
void test_repo_template__external_templates_with_leading_dot(void)
{
- git_buf template_path = GIT_BUF_INIT;
-
git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT;
- cl_set_cleanup(&cleanup_repository, "templated.git");
- template_sandbox("template");
-
- cl_must_pass(p_rename("template", ".template_with_leading_dot"));
-
- cl_git_pass(git_buf_joinpath(&template_path, clar_sandbox_path(),
- ".template_with_leading_dot"));
-
- configure_templatedir(template_path.ptr);
-
opts.flags = GIT_REPOSITORY_INIT_MKPATH | GIT_REPOSITORY_INIT_BARE |
GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE;
- cl_git_pass(git_repository_init_ext(&_repo, "templated.git", &opts));
+ setup_templates(".template_with_leading_dot", true);
+ setup_repo("templated.git", &opts);
validate_templates(_repo, ".template_with_leading_dot");
- cl_fixture_cleanup(".template_with_leading_dot");
-
- git_buf_dispose(&template_path);
}
void test_repo_template__extended_with_template_and_shared_mode(void)
{
git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT;
- int filemode = true;
- const char *repo_path = NULL;
-
- cl_set_cleanup(&cleanup_repository, "init_shared_from_tpl");
- template_sandbox("template");
+ const char *repo_path;
+ int filemode;
opts.flags = GIT_REPOSITORY_INIT_MKPATH |
GIT_REPOSITORY_INIT_EXTERNAL_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));
-
- cl_assert(!git_repository_is_bare(_repo));
- cl_assert(!git__suffixcmp(git_repository_path(_repo), "/init_shared_from_tpl/.git/"));
+ setup_templates("template", false);
+ setup_repo("init_shared_from_tpl", &opts);
filemode = cl_repo_get_bool(_repo, "core.filemode");
@@ -266,17 +247,14 @@ void test_repo_template__extended_with_template_and_shared_mode(void)
GIT_FILEMODE_BLOB, false, filemode);
validate_templates(_repo, "template");
-
- cl_fixture_cleanup("template");
}
void test_repo_template__empty_template_path(void)
{
git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT;
- opts.template_path = "";
- cl_git_pass(git_futils_mkdir("foo", 0755, 0));
- cl_git_pass(git_repository_init_ext(&_repo, "foo", &opts));
+ opts.flags = GIT_REPOSITORY_INIT_MKPATH | GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE;
+ opts.template_path = "";
- cleanup_repository("foo");
+ setup_repo("foo", &opts);
}