diff options
author | Sascha Cunz <sascha@babbelbox.org> | 2013-01-12 03:07:44 +0400 |
---|---|---|
committer | Sascha Cunz <sascha@babbelbox.org> | 2013-01-12 03:07:44 +0400 |
commit | b5b281209749b70fb5e023fce02abb1447de6cfa (patch) | |
tree | b12e4d6f5b0d22b25282dcb54d118abfa2e20723 /tests-clar/clone | |
parent | 1265b51f5be724d42e8c99326f0e5623d28fc67d (diff) |
Test: Cleanup some cleaning code
Diffstat (limited to 'tests-clar/clone')
-rw-r--r-- | tests-clar/clone/nonetwork.c | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/tests-clar/clone/nonetwork.c b/tests-clar/clone/nonetwork.c index 9d22b7356..a451fe313 100644 --- a/tests-clar/clone/nonetwork.c +++ b/tests-clar/clone/nonetwork.c @@ -7,6 +7,8 @@ static git_clone_options g_options; static git_repository *g_repo; +static git_reference* g_ref; +static git_remote* g_remote; void test_clone_nonetwork__initialize(void) { @@ -27,6 +29,16 @@ void test_clone_nonetwork__cleanup(void) g_repo = NULL; } + if (g_ref) { + git_reference_free(g_ref); + g_ref = NULL; + } + + if (g_remote) { + git_remote_free(g_remote); + g_remote = NULL; + } + cl_fixture_cleanup("./foo"); } @@ -73,66 +85,51 @@ void test_clone_nonetwork__fail_with_already_existing_but_non_empty_directory(vo void test_clone_nonetwork__custom_origin_name(void) { - git_remote *remote; - g_options.remote_name = "my_origin"; cl_git_pass(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options)); - cl_git_pass(git_remote_load(&remote, g_repo, "my_origin")); - - git_remote_free(remote); + cl_git_pass(git_remote_load(&g_remote, g_repo, "my_origin")); } void test_clone_nonetwork__custom_push_url(void) { - git_remote *remote; const char *url = "http://example.com"; g_options.pushurl = url; cl_git_pass(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options)); - cl_git_pass(git_remote_load(&remote, g_repo, "origin")); - cl_assert_equal_s(url, git_remote_pushurl(remote)); - - git_remote_free(remote); + cl_git_pass(git_remote_load(&g_remote, g_repo, "origin")); + cl_assert_equal_s(url, git_remote_pushurl(g_remote)); } void test_clone_nonetwork__custom_fetch_spec(void) { - git_remote *remote; - git_reference *master; const git_refspec *actual_fs; const char *spec = "+refs/heads/master:refs/heads/foo"; g_options.fetch_spec = spec; cl_git_pass(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options)); - cl_git_pass(git_remote_load(&remote, g_repo, "origin")); - actual_fs = git_remote_fetchspec(remote); + cl_git_pass(git_remote_load(&g_remote, g_repo, "origin")); + actual_fs = git_remote_fetchspec(g_remote); cl_assert_equal_s("refs/heads/master", git_refspec_src(actual_fs)); cl_assert_equal_s("refs/heads/foo", git_refspec_dst(actual_fs)); - cl_git_pass(git_reference_lookup(&master, g_repo, "refs/heads/foo")); - git_reference_free(master); - - git_remote_free(remote); + cl_git_pass(git_reference_lookup(&g_ref, g_repo, "refs/heads/foo")); } void test_clone_nonetwork__custom_push_spec(void) { - git_remote *remote; const git_refspec *actual_fs; const char *spec = "+refs/heads/master:refs/heads/foo"; g_options.push_spec = spec; cl_git_pass(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options)); - cl_git_pass(git_remote_load(&remote, g_repo, "origin")); - actual_fs = git_remote_pushspec(remote); + cl_git_pass(git_remote_load(&g_remote, g_repo, "origin")); + actual_fs = git_remote_pushspec(g_remote); cl_assert_equal_s("refs/heads/master", git_refspec_src(actual_fs)); cl_assert_equal_s("refs/heads/foo", git_refspec_dst(actual_fs)); - - git_remote_free(remote); } void test_clone_nonetwork__custom_autotag(void) |