summaryrefslogtreecommitdiff
path: root/git/test/test_remote.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2011-07-04 23:52:17 +0200
committerSebastian Thiel <byronimo@gmail.com>2011-07-04 23:52:17 +0200
commitda12df95faf27f2d69c9b69391c61b584e16614d (patch)
treeae4f8d724ac857288dec901e080ffb6126d968c9 /git/test/test_remote.py
parentb7ae99cd13839036a34aca06078d3431a11829ff (diff)
parent3379127de7642a80687487c41e459e0cee9ec44f (diff)
downloadgitpython-da12df95faf27f2d69c9b69391c61b584e16614d.tar.gz
Merge branch 'remote-fixes'
Diffstat (limited to 'git/test/test_remote.py')
-rw-r--r--git/test/test_remote.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/git/test/test_remote.py b/git/test/test_remote.py
index 8ae9fe43..cef8687b 100644
--- a/git/test/test_remote.py
+++ b/git/test/test_remote.py
@@ -256,7 +256,7 @@ class TestRemote(TestBase):
shutil.rmtree(other_repo_dir)
# END test and cleanup
- def _test_push_and_pull(self,remote, rw_repo, remote_repo):
+ def _verify_push_and_pull(self,remote, rw_repo, remote_repo):
# push our changes
lhead = rw_repo.head
lindex = rw_repo.index
@@ -407,7 +407,7 @@ class TestRemote(TestBase):
# END for each rename ( back to prev_name )
# PUSH/PULL TESTING
- self._test_push_and_pull(remote, rw_repo, remote_repo)
+ self._verify_push_and_pull(remote, rw_repo, remote_repo)
# FETCH TESTING
# Only for remotes - local cases are the same or less complicated