changeset 2957:15dc5b2ff672 beta

latest git version fixes issue with handling locking
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 23 Oct 2012 18:10:07 +0200
parents a2ecf8a530b9
children c0a6a2e6bb2e
files rhodecode/tests/scripts/test_vcs_operations.py
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/tests/scripts/test_vcs_operations.py	Tue Oct 23 17:09:28 2012 +0200
+++ b/rhodecode/tests/scripts/test_vcs_operations.py	Tue Oct 23 18:10:07 2012 +0200
@@ -322,11 +322,8 @@
         #pull fails since repo is locked
         clone_url = _construct_url(GIT_REPO)
         stdout, stderr = Command('/tmp').execute('git clone', clone_url)
-        msg = ("""abort: HTTP Error 423: Repository `%s` locked by user `%s`"""
+        msg = ("""423 Repository `%s` locked by user `%s`"""
                 % (GIT_REPO, TEST_USER_ADMIN_LOGIN))
-        #TODO: fix this somehow later on GIT, GIT is stupid and even if we throw
-        # back 423 to it, it makes ANOTHER request and we fail there with 405 :/
-        msg = "405 Method Not Allowed"
         assert msg in stderr
 
     def test_push_on_locked_repo_by_other_user_hg(self):