Mercurial > kallithea

changeset 3803:e2ebd8808351 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 6bad83d27fc1
children a5c234e934c5
files rhodecode/tests/api/api_base.py
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/tests/api/api_base.py	Fri Apr 26 20:54:25 2013 +0200
+++ b/rhodecode/tests/api/api_base.py	Thu May 02 00:08:03 2013 +0200
@@ -11,7 +11,7 @@
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.meta import Session
 from rhodecode.model.scm import ScmModel
-from rhodecode.model.db import Repository
+from rhodecode.model.db import Repository, User
 
 
 API_URL = '/_admin/api'
@@ -164,7 +164,9 @@
         id_, params = _build_data(self.apikey, 'get_users',)
         response = api_call(self, params)
         ret_all = []
-        for usr in UserModel().get_all():
+        _users = User.query().filter(User.username != User.DEFAULT_USER)\
+                             .order_by(User.username).all()
+        for usr in _users:
             ret = usr.get_api_data()
             ret_all.append(jsonify(ret))
         expected = ret_all