[copr] bkabrda-workspace: Fix tests after previous changes (f6a2268)

Repository : http://git.fedorahosted.org/cgit/copr.git

On branch  : bkabrda-workspace

> ---------------------------------------------------------------
commit f6a22684c02bd8e1546c0ba2b53449b929fa213e
Author: Bohuslav Kabrda <bkabrda(a)redhat.com&gt;
Date:   Mon Nov 26 08:28:25 2012 +0100

    Fix tests after previous changes


> ---------------------------------------------------------------
 wsgi/tests/coprs_test_case.py                      |   12 ++++++------
 .../tests/test_views/test_coprs_ns/test_general.py |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/wsgi/tests/coprs_test_case.py b/wsgi/tests/coprs_test_case.py
index 297b6c8..8aad8d8 100644
--- a/wsgi/tests/coprs_test_case.py
+++ b/wsgi/tests/coprs_test_case.py
@@ -28,9 +28,9 @@ class CoprsTestCase(object):
 
     @pytest.fixture
     def f_users(self):
-        self.u1 = models.User(openid_name = 'http://user1.id.fedoraproject.org/',
proven = False)
-        self.u2 = models.User(openid_name = 'http://user2.id.fedoraproject.org/',
proven = False)
-        self.u3 = models.User(openid_name = 'http://user3.id.fedoraproject.org/',
proven = False)
+        self.u1 = models.User(openid_name = 'http://user1.id.fedoraproject.org/',
proven = False, mail = &#39;user1(a)foo.bar&#39;)
+        self.u2 = models.User(openid_name = 'http://user2.id.fedoraproject.org/',
proven = False, mail = &#39;user2(a)spam.foo&#39;)
+        self.u3 = models.User(openid_name = 'http://user3.id.fedoraproject.org/',
proven = False, mail = &#39;baz(a)bar.bar&#39;)
 
         self.db.session.add_all([self.u1, self.u2, self.u3])
         self.db.session.commit()
@@ -56,9 +56,9 @@ class CoprsTestCase(object):
 
     @pytest.fixture
     def f_copr_permissions(self):
-        self.cp1 = models.CoprPermission(copr = self.c2, user = self.u1, approved =
True)
-        self.cp2 = models.CoprPermission(copr = self.c3, user = self.u3, approved =
False)
-        self.cp3 = models.CoprPermission(copr = self.c3, user = self.u1, approved =
False)
+        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.db.session.add_all([self.cp1, self.cp2, self.cp3])
         self.db.session.commit()
diff --git a/wsgi/tests/test_views/test_coprs_ns/test_general.py
b/wsgi/tests/test_views/test_coprs_ns/test_general.py
index 4eb54c4..af8ebe1 100644
--- a/wsgi/tests/test_views/test_coprs_ns/test_general.py
+++ b/wsgi/tests/test_views/test_coprs_ns/test_general.py
@@ -196,7 +196,7 @@ class TestCoprApplyForBuilding(CoprsTestCase):
             new_perm =
self.models.CoprPermission.query.filter(self.models.CoprPermission.user_id ==
self.u2.id).\
                                                        
filter(self.models.CoprPermission.copr_id == self.c1.id).\
                                                         first()
-            assert not new_perm.approved
+            assert not new_perm.copr_builder
 
 class TestCoprGiveUpBuilding(CoprsTestCase):
     def test_give_up(self, f_users, f_coprs, f_copr_permissions):