openstack/deb-python-pygit2
Code Issues Proposed changes

Comment the remote test that segfaults

Browse Source 
See libgit2/libgit2#1692

To uncomment whenever libgit2 0.20 is released
This commit is contained in:
J. David Ibáñez 2013-07-05 23:23:31 +02:00
parent e56e8600ac
commit 534d98b6b2
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/pygit2.c
View File

@ -137,21 +137,19 @@ clone_repository(PyObject *self, PyObject *args) {
const char *remote_name, *push_url, *fetch_spec; const char *remote_name, *push_url, *fetch_spec;
const char *push_spec, *checkout_branch; const char *push_spec, *checkout_branch;
int err; int err;
git_clone_options opts = GIT_CLONE_OPTIONS_INIT;
if (!PyArg_ParseTuple(args, "zzIzzzzz", if (!PyArg_ParseTuple(args, "zzIzzzzz",
&url, &path, &bare, &remote_name, &push_url, &url, &path, &bare, &remote_name, &push_url,
&fetch_spec, &push_spec, &checkout_branch)) &fetch_spec, &push_spec, &checkout_branch))
return NULL; return NULL;
git_clone_options opts = { opts.bare = bare;
.version=1, opts.remote_name = remote_name;
.bare=bare, opts.pushurl = push_url;
.remote_name=remote_name, opts.fetch_spec = fetch_spec;
.pushurl=push_url, opts.push_spec = push_spec;
.fetch_spec=fetch_spec, opts.checkout_branch = checkout_branch;
.push_spec=push_spec,
.checkout_branch=checkout_branch
};
err = git_clone(&repo, url, path, &opts); err = git_clone(&repo, url, path, &opts);
if (err < 0) if (err < 0)
@ -237,7 +235,7 @@ hash(PyObject *self, PyObject *args)
PyMethodDef module_methods[] = { PyMethodDef module_methods[] = {
{"init_repository", init_repository, METH_VARARGS, init_repository__doc__}, {"init_repository", init_repository, METH_VARARGS, init_repository__doc__},
{"clone_repository", clone_repository, METH_VARARGS, {"clone_repository", clone_repository, METH_VARARGS,
clone_repository__doc__}, clone_repository__doc__},
{"discover_repository", discover_repository, METH_VARARGS, {"discover_repository", discover_repository, METH_VARARGS,
discover_repository__doc__}, discover_repository__doc__},
{"hashfile", hashfile, METH_VARARGS, hashfile__doc__}, {"hashfile", hashfile, METH_VARARGS, hashfile__doc__},

6
test/test_remote.py
View File

@ -85,8 +85,9 @@ class RepositoryTest(utils.RepoTestCase):
# new_fetchspec = ('refs/foo/*', 'refs/remotes/foo/*') # new_fetchspec = ('refs/foo/*', 'refs/remotes/foo/*')
# remote.fetchspec = new_fetchspec # remote.fetchspec = new_fetchspec
# self.assertEqual(new_fetchspec[0], remote.fetchspec[0]) # refspec = remote.get_refspec(0)
# self.assertEqual(new_fetchspec[1], remote.fetchspec[1]) # self.assertEqual(new_fetchspec[0], refspec[0])
# self.assertEqual(new_fetchspec[1], refspec[1])
def test_remote_list(self): def test_remote_list(self):
@ -100,6 +101,7 @@ class RepositoryTest(utils.RepoTestCase):
remote = self.repo.create_remote(name, url) remote = self.repo.create_remote(name, url)
self.assertTrue(remote.name in [x.name for x in self.repo.remotes]) self.assertTrue(remote.name in [x.name for x in self.repo.remotes])
def test_remote_save(self): def test_remote_save(self):
remote = self.repo.remotes[0] remote = self.repo.remotes[0]

19
test/test_repository.py
View File

@ -331,10 +331,11 @@ class CloneRepositoryTest(utils.NoRepoTestCase):
def test_clone_fetch_spec(self): def test_clone_fetch_spec(self):
repo_path = "./test/data/testrepo.git/" repo_path = "./test/data/testrepo.git/"
repo = clone_repository( ## FIXME Uncomment these lines once libgit2 0.20 is released
repo_path, self._temp_dir, fetch_spec="refs/heads/test" ## repo = clone_repository(repo_path, self._temp_dir,
) ## fetch_spec="refs/heads/test")
self.assertFalse(repo.is_empty) ## self.assertFalse(repo.is_empty)
# FIXME: When pygit2 retrieve the fetchspec we passed to git clone. # FIXME: When pygit2 retrieve the fetchspec we passed to git clone.
# fetchspec seems to be going through, but the Repository class is # fetchspec seems to be going through, but the Repository class is
# not getting it. # not getting it.
@ -342,9 +343,8 @@ class CloneRepositoryTest(utils.NoRepoTestCase):
def test_clone_push_spec(self): def test_clone_push_spec(self):
repo_path = "./test/data/testrepo.git/" repo_path = "./test/data/testrepo.git/"
repo = clone_repository( repo = clone_repository(repo_path, self._temp_dir,
repo_path, self._temp_dir, push_spec="refs/heads/test" push_spec="refs/heads/test")
)
self.assertFalse(repo.is_empty) self.assertFalse(repo.is_empty)
# FIXME: When pygit2 supports retrieving the pushspec parameter, # FIXME: When pygit2 supports retrieving the pushspec parameter,
# enable this test # enable this test
@ -353,9 +353,8 @@ class CloneRepositoryTest(utils.NoRepoTestCase):
def test_clone_checkout_branch(self): def test_clone_checkout_branch(self):
repo_path = "./test/data/testrepo.git/" repo_path = "./test/data/testrepo.git/"
repo = clone_repository( repo = clone_repository(repo_path, self._temp_dir,
repo_path, self._temp_dir, checkout_branch="test" checkout_branch="test")
)
self.assertFalse(repo.is_empty) self.assertFalse(repo.is_empty)
# FIXME: When pygit2 supports retrieving the current branch, # FIXME: When pygit2 supports retrieving the current branch,
# enable this test # enable this test