Commit 8eac252b90e100faf4066b589250cfa50dab2fbd
2018-03-11T11:49:50
introduce a helper function for use by work tree init test
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
diff --git a/regress/worktree/worktree_test.c b/regress/worktree/worktree_test.c
index b6bb45f..049c003 100644
--- a/regress/worktree/worktree_test.c
+++ b/regress/worktree/worktree_test.c
@@ -177,11 +177,37 @@ obstruct_meta_file(char **path, const char *worktree_path, const char *name)
}
static int
+obstruct_meta_file_and_init(int *ok, struct got_repository *repo,
+ const char *worktree_path, char *name)
+{
+ const struct got_error *err;
+ char *path;
+ int ret = 0;
+ struct got_reference *head_ref = NULL;
+
+ if (!obstruct_meta_file(&path, worktree_path, GOT_WORKTREE_FILE_INDEX))
+ return 0;
+
+ err = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
+ if (err != NULL || head_ref == NULL)
+ return 0;
+
+ err = got_worktree_init(worktree_path, head_ref, "/", repo);
+ if (err != NULL && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
+ (*ok)++;
+ ret = 1;
+ }
+ unlink(path);
+ free(path);
+ got_ref_close(head_ref);
+ return ret;
+}
+
+static int
worktree_init_exists(const char *repo_path)
{
const struct got_error *err;
struct got_repository *repo = NULL;
- struct got_reference *head_ref = NULL;
char worktree_path[PATH_MAX];
char *gotpath = NULL;
char *path;
@@ -191,10 +217,6 @@ worktree_init_exists(const char *repo_path)
err = got_repo_open(&repo, repo_path);
if (err != NULL || repo == NULL)
goto done;
- err = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
- if (err != NULL || head_ref == NULL)
- goto done;
-
strlcpy(worktree_path, "worktree-XXXXXX", sizeof(worktree_path));
if (mkdtemp(worktree_path) == NULL)
goto done;
@@ -208,58 +230,26 @@ worktree_init_exists(const char *repo_path)
goto done;
/* Create files which got_worktree_init() will try to create as well. */
-
- if (!obstruct_meta_file(&path, worktree_path, GOT_REF_HEAD))
+ if (!obstruct_meta_file_and_init(&ok, repo, worktree_path,
+ GOT_REF_HEAD))
goto done;
- err = got_worktree_init(worktree_path, head_ref, "/", repo);
- if (err != NULL && err->code == GOT_ERR_ERRNO && errno == EEXIST)
- ok++;
- unlink(path);
- free(path);
-
- if (!obstruct_meta_file(&path, worktree_path, GOT_WORKTREE_LOCK))
+ if (!obstruct_meta_file_and_init(&ok, repo, worktree_path,
+ GOT_WORKTREE_LOCK))
goto done;
- err = got_worktree_init(worktree_path, head_ref, "/", repo);
- if (err != NULL && err->code == GOT_ERR_ERRNO && errno == EEXIST)
- ok++;
- unlink(path);
- free(path);
-
- if (!obstruct_meta_file(&path, worktree_path, GOT_WORKTREE_FILE_INDEX))
+ if (!obstruct_meta_file_and_init(&ok, repo, worktree_path,
+ GOT_WORKTREE_FILE_INDEX))
goto done;
- err = got_worktree_init(worktree_path, head_ref, "/", repo);
- if (err != NULL && err->code == GOT_ERR_ERRNO && errno == EEXIST)
- ok++;
- unlink(path);
- free(path);
-
- if (!obstruct_meta_file(&path, worktree_path, GOT_WORKTREE_REPOSITORY))
+ if (!obstruct_meta_file_and_init(&ok, repo, worktree_path,
+ GOT_WORKTREE_REPOSITORY))
goto done;
- err = got_worktree_init(worktree_path, head_ref, "/", repo);
- if (err != NULL && err->code == GOT_ERR_ERRNO && errno == EEXIST)
- ok++;
- unlink(path);
- free(path);
-
- if (!obstruct_meta_file(&path, worktree_path, GOT_WORKTREE_PATH_PREFIX))
+ if (!obstruct_meta_file_and_init(&ok, repo, worktree_path,
+ GOT_WORKTREE_PATH_PREFIX))
goto done;
- err = got_worktree_init(worktree_path, head_ref, "/", repo);
- if (err != NULL && err->code == GOT_ERR_ERRNO && errno == EEXIST)
- ok++;
- unlink(path);
- free(path);
-
- if (!obstruct_meta_file(&path, worktree_path, GOT_WORKTREE_FORMAT))
+ if (!obstruct_meta_file_and_init(&ok, repo, worktree_path,
+ GOT_WORKTREE_FORMAT))
goto done;
- err = got_worktree_init(worktree_path, head_ref, "/", repo);
- if (err != NULL && err->code == GOT_ERR_ERRNO && errno == EEXIST)
- ok++;
- unlink(path);
- free(path);
done:
- if (head_ref)
- got_ref_close(head_ref);
if (repo)
got_repo_close(repo);
free(gotpath);