diff --git a/kallithea/tests/functional/test_admin_permissions.py b/kallithea/tests/functional/test_admin_permissions.py --- a/kallithea/tests/functional/test_admin_permissions.py +++ b/kallithea/tests/functional/test_admin_permissions.py @@ -1,3 +1,5 @@ +import time + from kallithea.model.db import User, UserIpMap from kallithea.tests import * @@ -21,7 +23,13 @@ class TestAdminPermissionsController(Tes params=dict(new_ip='127.0.0.0/24', _authentication_token=self.authentication_token())) - response = self.app.get(url('admin_permissions_ips')) + # sleep more than beaker.cache.sql_cache_short.expire to expire user cache + time.sleep(1.5) + self.app.get(url('admin_permissions_ips'), status=302) + + # REMOTE_ADDR must match 127.0.0.0/24 + response = self.app.get(url('admin_permissions_ips'), + extra_environ={'REMOTE_ADDR': '127.0.0.1'}) response.mustcontain('127.0.0.0/24') response.mustcontain('127.0.0.0 - 127.0.0.255') @@ -33,7 +41,11 @@ class TestAdminPermissionsController(Tes response = self.app.post(url('edit_user_ips', id=default_user_id), params=dict(_method='delete', del_ip_id=del_ip_id, - _authentication_token=self.authentication_token())) + _authentication_token=self.authentication_token()), + extra_environ={'REMOTE_ADDR': '127.0.0.1'}) + + # sleep more than beaker.cache.sql_cache_short.expire to expire user cache + time.sleep(1.5) response = self.app.get(url('admin_permissions_ips')) response.mustcontain('All IP addresses are allowed')