diff options
author | Marcin Kuzminski <marcin@python-works.com> | 2013-01-21 00:49:59 +0100 |
---|---|---|
committer | Marcin Kuzminski <marcin@python-works.com> | 2013-01-21 00:49:59 +0100 |
commit | 930b8584a141c38a85ef984e910ad8284285d9df (patch) | |
tree | fff56592706fa27623186ffece8f7948796195ef /rhodecode | |
parent | 0c68954bf8dca3c6225368dc593c239aee49ef30 (diff) | |
parent | 799dfa3a01b19e37131000c1a726bdac8449d52f (diff) |
merged with betav1.5.2
Diffstat (limited to 'rhodecode')
-rwxr-xr-x | rhodecode/tests/scripts/test_vcs_operations.py | 47 |
1 files changed, 28 insertions, 19 deletions
diff --git a/rhodecode/tests/scripts/test_vcs_operations.py b/rhodecode/tests/scripts/test_vcs_operations.py index c46ee3ba..1ff86130 100755 --- a/rhodecode/tests/scripts/test_vcs_operations.py +++ b/rhodecode/tests/scripts/test_vcs_operations.py @@ -29,6 +29,7 @@ import os import tempfile import unittest +import time from os.path import join as jn from os.path import dirname as dn @@ -36,7 +37,7 @@ from tempfile import _RandomNameSequence from subprocess import Popen, PIPE from rhodecode.tests import * -from rhodecode.model.db import User, Repository, UserLog +from rhodecode.model.db import User, Repository, UserLog, UserIpMap from rhodecode.model.meta import Session from rhodecode.model.repo import RepoModel from rhodecode.model.user import UserModel @@ -424,17 +425,21 @@ class TestVCSOperations(unittest.TestCase): def test_ip_restriction_hg(self): user_model = UserModel() - new_ip = user_model.add_extra_ip(TEST_USER_ADMIN_LOGIN, '10.10.10.10/32') - Session().commit() + try: + user_model.add_extra_ip(TEST_USER_ADMIN_LOGIN, '10.10.10.10/32') + Session().commit() + clone_url = _construct_url(HG_REPO) + stdout, stderr = Command('/tmp').execute('hg clone', clone_url) + assert 'abort: HTTP Error 403: Forbidden' in stderr + finally: + #release IP restrictions + for ip in UserIpMap.getAll(): + UserIpMap.delete(ip.ip_id) + Session().commit() + + time.sleep(2) clone_url = _construct_url(HG_REPO) stdout, stderr = Command('/tmp').execute('hg clone', clone_url) - assert 'abort: HTTP Error 403: Forbidden' in stderr - - #release IP restrictions - clone_url = _construct_url(HG_REPO) - user_model.delete_extra_ip(TEST_USER_ADMIN_LOGIN, new_ip.ip_id) - Session().commit() - stdout, stderr = Command('/tmp').execute('hg clone', clone_url) assert 'requesting all changes' in stdout assert 'adding changesets' in stdout @@ -445,17 +450,21 @@ class TestVCSOperations(unittest.TestCase): def test_ip_restriction_git(self): user_model = UserModel() - new_ip = user_model.add_extra_ip(TEST_USER_ADMIN_LOGIN, '10.10.10.10/32') - Session().commit() + try: + user_model.add_extra_ip(TEST_USER_ADMIN_LOGIN, '10.10.10.10/32') + Session().commit() + clone_url = _construct_url(GIT_REPO) + stdout, stderr = Command('/tmp').execute('git clone', clone_url) + assert 'error: The requested URL returned error: 403 Forbidden' in stderr + finally: + #release IP restrictions + for ip in UserIpMap.getAll(): + UserIpMap.delete(ip.ip_id) + Session().commit() + + time.sleep(2) clone_url = _construct_url(GIT_REPO) stdout, stderr = Command('/tmp').execute('git clone', clone_url) - assert 'error: The requested URL returned error: 403 Forbidden' in stderr - - #release IP restrictions - clone_url = _construct_url(GIT_REPO) - user_model.delete_extra_ip(TEST_USER_ADMIN_LOGIN, new_ip.ip_id) - Session().commit() - stdout, stderr = Command('/tmp').execute('git clone', clone_url) assert 'Cloning into' in stdout assert stderr == '' |