kallithea Changeset - efe23d6c178c

Changeset - efe23d6c178c

Parent rev.

Child rev.

[Not reviewed]

Merge rhodecode-0.0.1.5.2 default

0 2 0

Marcin Kuzminski - 13 years ago 2013-01-21 00:49:59
marcin@python-works.com

merged with beta

2 files changed with 34 insertions and 25 deletions:

rhodecode/tests/scripts/test_vcs_operations.py

test.ini

0 comments (0 inline, 0 general)

rhodecode/tests/scripts/test_vcs_operations.py

➞

Show inline comments

@@ @@ -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.TestCas @@
     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.TestCas @@
     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 == ''

test.ini

➞

Show inline comments

@@ @@ -30,16 +30,16 @@ pdebug = false @@
 [server:main]
 ##nr of threads to spawn
-#threadpool_workers = 5
 threadpool_workers = 5
 ##max request before thread respawn
-#threadpool_max_requests = 2
 threadpool_max_requests = 2
 ##option to use threads of process
-#use_threadpool = true
 use_threadpool = true
 #use = egg:Paste#http
 use = egg:waitress#main
 use = egg:Paste#http
 #use = egg:waitress#main
 host = 127.0.0.1
 port = 5000
@@ @@ -295,4 +295,4 @@ datefmt = %Y-%m-%d %H:%M:%S @@
 [formatter_color_formatter]
 class=rhodecode.lib.colored_formatter.ColorFormatter
 format= %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %Y-%m-%d %H:%M:%S
@@ \ No newline at end of file @@
 datefmt = %Y-%m-%d %H:%M:%S

0 comments (0 inline, 0 general)