Commit b91194e8426899980b9af5be42c48ba0d89eff96
2014-11-13T09:22:10
Cleanup repository after prune tests.
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
diff --git a/tests/network/fetchlocal.c b/tests/network/fetchlocal.c
index 67e1fac..1996a70 100644
--- a/tests/network/fetchlocal.c
+++ b/tests/network/fetchlocal.c
@@ -67,9 +67,7 @@ void test_network_fetchlocal__prune(void)
cl_git_pass(git_remote_create(&origin, repo, GIT_REMOTE_ORIGIN, url));
git_remote_set_callbacks(origin, &callbacks);
- cl_git_pass(git_remote_connect(origin, GIT_DIRECTION_FETCH));
- cl_git_pass(git_remote_download(origin, NULL));
- cl_git_pass(git_remote_update_tips(origin, NULL, NULL));
+ cl_git_pass(git_remote_fetch(origin, NULL, NULL, NULL));
cl_git_pass(git_reference_list(&refnames, repo));
cl_assert_equal_i(19, (int)refnames.count);
@@ -125,34 +123,27 @@ void test_network_fetchlocal__prune_overlapping(void)
git_repository *remote_repo = cl_git_sandbox_init("testrepo.git");
const char *url = cl_git_path_url(git_repository_path(remote_repo));
+
git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT;
+ callbacks.transfer_progress = transfer_cb;
+ callbacks.payload = &callcount;
cl_git_pass(git_revparse_single(&obj, remote_repo, "master"));
cl_git_pass(git_reference_create(&ref, remote_repo, "refs/pull/42/head", git_object_id(obj), 1, NULL, NULL));
- git_object_free(obj);
-
- callbacks.transfer_progress = transfer_cb;
- callbacks.payload = &callcount;
cl_set_cleanup(&cleanup_local_repo, "foo");
cl_git_pass(git_repository_init(&repo, "foo", true));
cl_git_pass(git_remote_create(&origin, repo, GIT_REMOTE_ORIGIN, url));
git_remote_set_callbacks(origin, &callbacks);
- cl_git_pass(git_remote_connect(origin, GIT_DIRECTION_FETCH));
- cl_git_pass(git_remote_download(origin, NULL));
- cl_git_pass(git_remote_update_tips(origin, NULL, NULL));
cl_git_pass(git_repository_config(&config, repo));
cl_git_pass(git_config_set_multivar(config, "remote.origin.fetch", "^$", "refs/pull/*/head:refs/remotes/origin/pr/*"));
- git_config_free(config);
cl_git_pass(git_remote_lookup(&origin, repo, GIT_REMOTE_ORIGIN));
+ git_remote_set_prune_refs(origin, 1);
git_remote_set_callbacks(origin, &callbacks);
- cl_git_pass(git_remote_connect(origin, GIT_DIRECTION_FETCH));
- cl_git_pass(git_remote_download(origin, NULL));
- cl_git_pass(git_remote_prune(origin));
- cl_git_pass(git_remote_update_tips(origin, NULL, NULL));
+ cl_git_pass(git_remote_fetch(origin, NULL, NULL, NULL));
cl_git_pass(git_revparse_single(&obj, repo, "origin/master"));
cl_git_pass(git_revparse_single(&obj, repo, "origin/pr/42"));
@@ -165,10 +156,7 @@ void test_network_fetchlocal__prune_overlapping(void)
cl_git_pass(git_remote_lookup(&origin, repo, GIT_REMOTE_ORIGIN));
git_remote_set_callbacks(origin, &callbacks);
- cl_git_pass(git_remote_connect(origin, GIT_DIRECTION_FETCH));
- cl_git_pass(git_remote_download(origin, NULL));
- cl_git_pass(git_remote_prune(origin));
- cl_git_pass(git_remote_update_tips(origin, NULL, NULL));
+ cl_git_pass(git_remote_fetch(origin, NULL, NULL, NULL));
cl_git_pass(git_revparse_single(&obj, repo, "origin/master"));
cl_git_pass(git_revparse_single(&obj, repo, "origin/pr/42"));
@@ -176,6 +164,13 @@ void test_network_fetchlocal__prune_overlapping(void)
cl_assert_equal_i(20, (int)refnames.count);
cl_git_pass(git_reference_delete(ref));
+ cl_git_pass(git_config_delete_multivar(config, "remote.origin.fetch", "refs"));
+ cl_git_pass(git_config_set_multivar(config, "remote.origin.fetch", "^$", "refs/heads/*:refs/remotes/origin/*"));
+
+ git_object_free(obj);
+ git_config_free(config);
+ git_strarray_free(&refnames);
+ git_remote_free(origin);
git_repository_free(remote_repo);
git_repository_free(repo);
}