[copr] bkabrda-workspace: Refresh test fixtures, fix one logics function (2e0ada3)
bkabrda at fedorahosted.org
bkabrda at fedorahosted.org
Mon Nov 26 11:34:28 UTC 2012
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : bkabrda-workspace
>---------------------------------------------------------------
commit 2e0ada3e4b7efb072487c4db4a4d4718ddd65318
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date: Mon Nov 26 12:34:13 2012 +0100
Refresh test fixtures, fix one logics function
>---------------------------------------------------------------
wsgi/coprs/logic/coprs_logic.py | 3 ++-
wsgi/tests/coprs_test_case.py | 7 ++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/wsgi/coprs/logic/coprs_logic.py b/wsgi/coprs/logic/coprs_logic.py
index 1d57372..98371e0 100644
--- a/wsgi/coprs/logic/coprs_logic.py
+++ b/wsgi/coprs/logic/coprs_logic.py
@@ -1,5 +1,6 @@
from coprs import db
from coprs import exceptions
+from coprs import helpers
from coprs import models
class CoprsLogic(object):
@@ -34,7 +35,7 @@ class CoprsLogic(object):
elif user_relation == 'allowed':
aliased_user = db.aliased(models.User)
query = query.join(models.CoprPermission, models.Copr.copr_permissions).\
- filter(models.CoprPermission.copr_builder == True).\
+ filter(models.CoprPermission.copr_builder == helpers.PermissionEnum.num('Approved')).\
join(aliased_user, models.CoprPermission.user).\
filter(aliased_user.openid_name == models.User.openidize_name(username))
return query
diff --git a/wsgi/tests/coprs_test_case.py b/wsgi/tests/coprs_test_case.py
index 8aad8d8..1ddd094 100644
--- a/wsgi/tests/coprs_test_case.py
+++ b/wsgi/tests/coprs_test_case.py
@@ -5,6 +5,7 @@ import pytest
import coprs
+from coprs import helpers
from coprs import models
class CoprsTestCase(object):
@@ -56,9 +57,9 @@ class CoprsTestCase(object):
@pytest.fixture
def f_copr_permissions(self):
- self.cp1 = models.CoprPermission(copr = self.c2, user = self.u1, copr_builder = True, copr_admin = False)
- self.cp2 = models.CoprPermission(copr = self.c3, user = self.u3, copr_builder = False, copr_admin = False)
- self.cp3 = models.CoprPermission(copr = self.c3, user = self.u1, copr_builder = False, copr_admin = True)
+ self.cp1 = models.CoprPermission(copr = self.c2, user = self.u1, copr_builder = helpers.PermissionEnum.num('Approved'), copr_admin = helpers.PermissionEnum.num('No Action'))
+ self.cp2 = models.CoprPermission(copr = self.c3, user = self.u3, copr_builder = helpers.PermissionEnum.num('No Action'), copr_admin = helpers.PermissionEnum.num('No Action'))
+ self.cp3 = models.CoprPermission(copr = self.c3, user = self.u1, copr_builder = helpers.PermissionEnum.num('Requested'), copr_admin = helpers.PermissionEnum.num('Approved'))
self.db.session.add_all([self.cp1, self.cp2, self.cp3])
self.db.session.commit()
More information about the copr-devel
mailing list