diff options
Diffstat (limited to 'tests-clar/network/remotes.c')
-rw-r--r-- | tests-clar/network/remotes.c | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/tests-clar/network/remotes.c b/tests-clar/network/remotes.c index 15e3b03f4..b776353a2 100644 --- a/tests-clar/network/remotes.c +++ b/tests-clar/network/remotes.c @@ -108,7 +108,7 @@ void test_network_remotes__save(void) _remote = NULL; /* Set up the remote and save it to config */ - cl_git_pass(git_remote_create_inmemory(&_remote, _repo, "upstream", "git://github.com/libgit2/libgit2", NULL)); + cl_git_pass(git_remote_create(&_remote, _repo, "upstream", "git://github.com/libgit2/libgit2")); cl_git_pass(git_remote_set_fetchspec(_remote, "refs/heads/*:refs/remotes/upstream/*")); cl_git_pass(git_remote_set_pushspec(_remote, "refs/heads/*:refs/heads/*")); cl_git_pass(git_remote_set_pushurl(_remote, "git://github.com/libgit2/libgit2_push")); @@ -123,7 +123,7 @@ void test_network_remotes__save(void) cl_assert(_refspec != NULL); cl_assert_equal_s(git_refspec_src(_refspec), "refs/heads/*"); cl_assert_equal_s(git_refspec_dst(_refspec), "refs/remotes/upstream/*"); - cl_assert(git_refspec_force(_refspec) == 0); + cl_assert_equal_i(0, git_refspec_force(_refspec)); _refspec = git_remote_pushspec(_remote); cl_assert(_refspec != NULL); @@ -251,13 +251,13 @@ void test_network_remotes__cannot_add_a_nameless_remote(void) git_remote_create(&remote, _repo, NULL, "git://github.com/libgit2/libgit2")); } -void test_network_remotes__cannot_save_a_nameless_remote(void) +void test_network_remotes__cant_save_inmem_remote(void) { git_remote *remote; cl_git_pass(git_remote_create_inmemory(&remote, _repo, NULL, "git://github.com/libgit2/libgit2", NULL)); - cl_assert_equal_i(GIT_EINVALIDSPEC, git_remote_save(remote)); + cl_git_fail(git_remote_save(remote)); git_remote_free(remote); } @@ -344,20 +344,3 @@ void test_network_remotes__check_structure_version(void) err = giterr_last(); cl_assert_equal_i(GITERR_INVALID, err->klass); } - -void test_network_remotes__dangling(void) -{ - git_remote_free(_remote); - _remote = NULL; - - cl_git_pass(git_remote_create_inmemory(&_remote, NULL, "upstream", "git://github.com/libgit2/libgit2", NULL)); - - cl_git_pass(git_remote_rename(_remote, "newname", NULL, NULL)); - cl_assert_equal_s(git_remote_name(_remote), "newname"); - - cl_git_fail(git_remote_save(_remote)); - cl_git_fail(git_remote_update_tips(_remote)); - - cl_git_pass(git_remote_set_repository(_remote, _repo)); - cl_git_pass(git_remote_save(_remote)); -} |