comparison rhodecode/tests/api/api_base.py @ 3803:e2ebd8808351 beta

fixed broken API tests after excluding default user from users listing
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 02 May 2013 00:08:03 +0200
parents 60335b702a00
children 2feb58495f34
comparison
equal deleted inserted replaced
3801:6bad83d27fc1 3803:e2ebd8808351
9 from rhodecode.model.user import UserModel 9 from rhodecode.model.user import UserModel
10 from rhodecode.model.users_group import UserGroupModel 10 from rhodecode.model.users_group import UserGroupModel
11 from rhodecode.model.repo import RepoModel 11 from rhodecode.model.repo import RepoModel
12 from rhodecode.model.meta import Session 12 from rhodecode.model.meta import Session
13 from rhodecode.model.scm import ScmModel 13 from rhodecode.model.scm import ScmModel
14 from rhodecode.model.db import Repository 14 from rhodecode.model.db import Repository, User
15 15
16 16
17 API_URL = '/_admin/api' 17 API_URL = '/_admin/api'
18 TEST_USER_GROUP = 'test_users_group' 18 TEST_USER_GROUP = 'test_users_group'
19 19
162 162
163 def test_api_get_users(self): 163 def test_api_get_users(self):
164 id_, params = _build_data(self.apikey, 'get_users',) 164 id_, params = _build_data(self.apikey, 'get_users',)
165 response = api_call(self, params) 165 response = api_call(self, params)
166 ret_all = [] 166 ret_all = []
167 for usr in UserModel().get_all(): 167 _users = User.query().filter(User.username != User.DEFAULT_USER)\
168 .order_by(User.username).all()
169 for usr in _users:
168 ret = usr.get_api_data() 170 ret = usr.get_api_data()
169 ret_all.append(jsonify(ret)) 171 ret_all.append(jsonify(ret))
170 expected = ret_all 172 expected = ret_all
171 self._compare_ok(id_, expected, given=response.body) 173 self._compare_ok(id_, expected, given=response.body)
172 174