Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : enter_the_matrix
---------------------------------------------------------------
commit d77a4e11c0937a5e711b91ba5dc62b0e812b81e2
Author: Richard Marko <rmarko(a)fedoraproject.org>
Date: Thu Nov 14 16:02:35 2013 +0100
[tests]: pep8 fixes
Signed-off-by: Richard Marko <rmarko(a)fedoraproject.org>
---------------------------------------------------------------
coprs_frontend/tests/coprs_test_case.py | 94 ++++++++++++++++++++++---------
1 files changed, 67 insertions(+), 27 deletions(-)
diff --git a/coprs_frontend/tests/coprs_test_case.py
b/coprs_frontend/tests/coprs_test_case.py
index 4685b25..8ff9c60 100644
--- a/coprs_frontend/tests/coprs_test_case.py
+++ b/coprs_frontend/tests/coprs_test_case.py
@@ -10,9 +10,10 @@ import coprs
from coprs import helpers
from coprs import models
-from coprs.logic.builds_logic import BuildsLogic
+
class CoprsTestCase(object):
+
def setup_method(self, method):
self.tc = coprs.app.test_client()
self.app = coprs.app
@@ -23,7 +24,8 @@ class CoprsTestCase(object):
self.helpers = helpers
self.backend_passwd = coprs.app.config['BACKEND_PASSWORD']
# create datadir if it doesn't exist
- datadir = os.path.commonprefix([self.app.config['DATABASE'],
self.app.config['OPENID_STORE']])
+ datadir = os.path.commonprefix(
+ [self.app.config['DATABASE'],
self.app.config['OPENID_STORE']])
if not os.path.exists(datadir):
os.makedirs(datadir)
coprs.db.create_all()
@@ -36,7 +38,8 @@ class CoprsTestCase(object):
@property
def auth_header(self):
- return {'Authorization': 'Basic ' +
base64.b64encode('doesntmatter:{0}'.format(self.backend_passwd))}
+ return {'Authorization': 'Basic ' +
+
base64.b64encode('doesntmatter:{0}'.format(self.backend_passwd))}
@pytest.fixture
def f_db(self):
@@ -44,26 +47,42 @@ class CoprsTestCase(object):
@pytest.fixture
def f_users(self):
- self.u1 =
models.User(openid_name=u'http://user1.id.fedoraproject.org/';,
proven=False, admin=True, mail='user1(a)foo.bar')
- self.u2 =
models.User(openid_name=u'http://user2.id.fedoraproject.org/';,
proven = False, mail='user2(a)spam.foo')
- self.u3 =
models.User(openid_name=u'http://user3.id.fedoraproject.org/';,
proven=False, mail='baz(a)bar.bar')
+ self.u1 = models.User(
+
openid_name=u'http://user1.id.fedoraproject.org/';,
+ proven=False,
+ admin=True,
+ mail='user1(a)foo.bar')
+
+ self.u2 = models.User(
+
openid_name=u'http://user2.id.fedoraproject.org/';,
+ proven=False,
+ mail='user2(a)spam.foo')
+
+ self.u3 = models.User(
+
openid_name=u'http://user3.id.fedoraproject.org/';,
+ proven=False,
+ mail='baz(a)bar.bar')
self.db.session.add_all([self.u1, self.u2, self.u3])
@pytest.fixture
def f_coprs(self):
- self.c1 = models.Copr(name = u'foocopr', owner = self.u1)
- self.c2 = models.Copr(name = u'foocopr', owner = self.u2)
- self.c3 = models.Copr(name = u'barcopr', owner = self.u2)
+ self.c1 = models.Copr(name=u'foocopr', owner=self.u1)
+ self.c2 = models.Copr(name=u'foocopr', owner=self.u2)
+ self.c3 = models.Copr(name=u'barcopr', owner=self.u2)
self.db.session.add_all([self.c1, self.c2, self.c3])
@pytest.fixture
def f_mock_chroots(self):
- self.mc1 = models.MockChroot(os_release='fedora',
os_version='18', arch='x86_64', is_active=True)
- self.mc2 = models.MockChroot(os_release='fedora',
os_version='17', arch='x86_64', is_active=True)
- self.mc3 = models.MockChroot(os_release='fedora',
os_version='17', arch='i386', is_active=True)
- self.mc4 = models.MockChroot(os_release='fedora',
os_version='rawhide', arch='i386', is_active=True)
+ self.mc1 = models.MockChroot(
+ os_release='fedora', os_version='18', arch='x86_64',
is_active=True)
+ self.mc2 = models.MockChroot(
+ os_release='fedora', os_version='17', arch='x86_64',
is_active=True)
+ self.mc3 = models.MockChroot(
+ os_release='fedora', os_version='17', arch='i386',
is_active=True)
+ self.mc4 = models.MockChroot(
+ os_release='fedora', os_version='rawhide',
arch='i386', is_active=True)
# only bind to coprs if the test has used the f_coprs fixture
if hasattr(self, 'c1'):
@@ -90,10 +109,14 @@ class CoprsTestCase(object):
@pytest.fixture
def f_builds(self):
- self.b1 = models.Build(copr = self.c1, user = self.u1, submitted_on = 50,
started_on = 100)
- self.b2 = models.Build(copr = self.c1, user = self.u2, submitted_on = 10,
ended_on = 150)
- self.b3 = models.Build(copr = self.c2, user = self.u2, submitted_on = 10)
- self.b4 = models.Build(copr = self.c2, user = self.u2, submitted_on = 100)
+ self.b1 = models.Build(
+ copr=self.c1, user=self.u1, submitted_on=50, started_on=100)
+ self.b2 = models.Build(
+ copr=self.c1, user=self.u2, submitted_on=10, ended_on=150)
+ self.b3 = models.Build(
+ copr=self.c2, user=self.u2, submitted_on=10)
+ self.b4 = models.Build(
+ copr=self.c2, user=self.u2, submitted_on=100)
for build in [self.b1, self.b2, self.b3, self.b4]:
self.db.session.add(build)
@@ -109,27 +132,46 @@ class CoprsTestCase(object):
@pytest.fixture
def f_copr_permissions(self):
- self.cp1 = models.CoprPermission(copr = self.c2, user = self.u1, copr_builder =
helpers.PermissionEnum('approved'), copr_admin =
helpers.PermissionEnum('nothing'))
- self.cp2 = models.CoprPermission(copr = self.c3, user = self.u3, copr_builder =
helpers.PermissionEnum('nothing'), copr_admin =
helpers.PermissionEnum('nothing'))
- self.cp3 = models.CoprPermission(copr = self.c3, user = self.u1, copr_builder =
helpers.PermissionEnum('request'), copr_admin =
helpers.PermissionEnum('approved'))
+ self.cp1 = models.CoprPermission(
+ copr=self.c2,
+ user=self.u1,
+ copr_builder=helpers.PermissionEnum('approved'),
+ copr_admin=helpers.PermissionEnum('nothing'))
+
+ self.cp2 = models.CoprPermission(
+ copr=self.c3,
+ user=self.u3,
+ copr_builder=helpers.PermissionEnum('nothing'),
+ copr_admin=helpers.PermissionEnum('nothing'))
+
+ self.cp3 = models.CoprPermission(
+ copr=self.c3,
+ user=self.u1,
+ copr_builder=helpers.PermissionEnum('request'),
+ copr_admin=helpers.PermissionEnum('approved'))
self.db.session.add_all([self.cp1, self.cp2, self.cp3])
@pytest.fixture
def f_actions(self):
- # if using actions, we need to flush coprs into db, so that we can get their ids
+ # if using actions, we need to flush coprs into db, so that we can get
+ # their ids
self.f_db()
self.a1 = models.Action(action_type=helpers.ActionTypeEnum('rename'),
object_type='copr',
object_id=self.c1.id,
- old_value='{0}/{1}'.format(self.c1.owner.name,
self.c1.name),
-
new_value='{0}/new_name'.format(self.c1.owner.name),
+ old_value='{0}/{1}'.format(
+ self.c1.owner.name, self.c1.name),
+ new_value='{0}/new_name'.format(
+ self.c1.owner.name),
created_on=int(time.time()))
self.a2 = models.Action(action_type=helpers.ActionTypeEnum('rename'),
object_type='copr',
object_id=self.c2.id,
- old_value='{0}/{1}'.format(self.c2.owner.name,
self.c2.name),
-
new_value='{0}/new_name2'.format(self.c2.owner.name),
+ old_value='{0}/{1}'.format(
+ self.c2.owner.name, self.c2.name),
+ new_value='{0}/new_name2'.format(
+ self.c2.owner.name),
created_on=int(time.time()))
self.a3 = models.Action(action_type=helpers.ActionTypeEnum('delete'),
object_type='copr',
@@ -141,8 +183,6 @@ class CoprsTestCase(object):
self.db.session.add_all([self.a1, self.a2, self.a3])
-
-
class TransactionDecorator(object):
"""