diff options
| author | Marcin Kuzminski <marcin@python-works.com> | 2012-10-23 18:10:07 +0200 |
|---|---|---|
| committer | Marcin Kuzminski <marcin@python-works.com> | 2012-10-23 18:10:07 +0200 |
| commit | c248a9b73fbabd42c73056279233fff59719fc38 (patch) | |
| tree | 7bdcfbdd6629a12c237731073d44329596c1cc4a /rhodecode/tests/scripts | |
| parent | c49800d59b4242649633c89c5e220f480d68654e (diff) | |
latest git version fixes issue with handling locking
--HG--
branch : beta
Diffstat (limited to 'rhodecode/tests/scripts')
| -rwxr-xr-x | rhodecode/tests/scripts/test_vcs_operations.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/rhodecode/tests/scripts/test_vcs_operations.py b/rhodecode/tests/scripts/test_vcs_operations.py index 81ef6fa7..2e9ca726 100755 --- a/rhodecode/tests/scripts/test_vcs_operations.py +++ b/rhodecode/tests/scripts/test_vcs_operations.py @@ -322,11 +322,8 @@ class TestVCSOperations(unittest.TestCase): #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): |