diff options
Diffstat (limited to 'test/git')
| -rw-r--r-- | test/git/test_refs.py | 4 | ||||
| -rw-r--r-- | test/git/test_remote.py | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/test/git/test_refs.py b/test/git/test_refs.py index 32a6de1c..8fa30aa1 100644 --- a/test/git/test_refs.py +++ b/test/git/test_refs.py @@ -223,10 +223,10 @@ class TestRefs(TestBase): assert active_branch != rw_repo.active_branch assert new_head == rw_repo.active_branch - # checkout with force has we have a change + # checkout with force as we have a changed a file # clear file open(new_head.commit.tree.blobs[-1].abspath,'w').close() - assert len(new_head.commit.diff(None)) == 1 + assert len(new_head.commit.diff(None)) # create a new branch that is likely to touch the file we changed far_away_head = rw_repo.create_head("far_head",'HEAD~100') diff --git a/test/git/test_remote.py b/test/git/test_remote.py index f049f6f7..0af9f0cf 100644 --- a/test/git/test_remote.py +++ b/test/git/test_remote.py @@ -316,10 +316,6 @@ class TestRemote(TestBase): res = remote.push(all=True) self._test_push_result(res, remote) - # pull is essentially a fetch + merge, hence we just do a light - # test here, leave the reset to the actual merge testing - # fails as we did not specify a branch and there is no configuration for it - self.failUnlessRaises(GitCommandError, remote.pull) remote.pull('master') # cleanup - delete created tags and branches as we are in an innerloop on |