Commit b5b281209749b70fb5e023fce02abb1447de6cfa
2013-01-12T00:07:44
Test: Cleanup some cleaning code
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
diff --git a/tests-clar/clone/nonetwork.c b/tests-clar/clone/nonetwork.c
index 9d22b73..a451fe3 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)