From ec1f9c9e9a6ce14ddc69b6be65188b3438f31f23 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Wed, 4 Nov 2009 20:09:19 +0100 Subject: helpers: fixed and improved test repo decorators to use the new head.checkout functions for greater ease of use - they work exactly as expected now. Fixed failing test in remote tests by actually removing the line --- test/git/test_remote.py | 4 ---- 1 file changed, 4 deletions(-) (limited to 'test/git/test_remote.py') 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 -- cgit v1.2.1