[copr] master: simplify code (330ab9e)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 330ab9e66917e76f1d413c8f641cf14381db0eb9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Oct 17 11:51:04 2013 +0200
simplify code
no need to handle general exception and print TB. python does that by default
>---------------------------------------------------------------
copr-be.py | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/copr-be.py b/copr-be.py
index e5d66ef..70aa67b 100755
--- a/copr-be.py
+++ b/copr-be.py
@@ -291,10 +291,6 @@ def main(args):
if __name__ == '__main__':
try:
main(sys.argv[1:])
- except Exception, e:
- print "ERROR: %s - %s" % (str(type(e)), str(e))
- # FIXME - maybe check on daemonize and do this as a syslog.syslog() call?
- sys.exit(1)
except KeyboardInterrupt, e:
print "\nUser cancelled, may need cleanup\n"
sys.exit(0)
10 years, 6 months
[copr] master: simplify code (d359c67)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit d359c67d27f7f4efb8b41568c2d64e5dccd76afc
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Oct 17 11:41:39 2013 +0200
simplify code
no need to handle general exception and print TB. python does that by default
>---------------------------------------------------------------
backend/mockremote.py | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/backend/mockremote.py b/backend/mockremote.py
index bbde96c..3bdd9c4 100755
--- a/backend/mockremote.py
+++ b/backend/mockremote.py
@@ -636,10 +636,4 @@ def main(args):
if __name__ == '__main__':
- try:
- main(sys.argv[1:])
- except Exception, e:
-
- print "ERROR: %s - %s" % (str(type(e)), str(e))
- traceback.print_exc()
- sys.exit(1)
+ main(sys.argv[1:])
10 years, 6 months
[copr] master: Comma not followed by a space (0348307)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 034830779f69e92a015144eaf791cab3d205b3b7
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Oct 17 11:38:17 2013 +0200
Comma not followed by a space
>---------------------------------------------------------------
backend/mockremote.py | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/backend/mockremote.py b/backend/mockremote.py
index 930670d..bbde96c 100755
--- a/backend/mockremote.py
+++ b/backend/mockremote.py
@@ -542,7 +542,7 @@ def parse_args(args):
parser.add_option('-c', '--continue', default=False, action='store_true',
dest='cont',
help="if a pkg fails to build, continue to the next one")
- parser.add_option('-a','--addrepo', default=DEF_REPOS, action='append',
+ parser.add_option('-a', '--addrepo', default=DEF_REPOS, action='append',
dest='repos',
help="add these repo baseurls to the chroot's yum config")
parser.add_option('--recurse', default=False, action='store_true',
@@ -559,10 +559,10 @@ def parse_args(args):
help="place to download all the results/packages")
parser.add_option("--packages", dest="packages_file", default=None,
help="file to read list of packages from")
- parser.add_option("-q","--quiet", dest="quiet", default=False, action="store_true",
+ parser.add_option("-q", "--quiet", dest="quiet", default=False, action="store_true",
help="output very little to the terminal")
- opts,args = parser.parse_args(args)
+ opts, args = parser.parse_args(args)
if not opts.builder:
print "Must specify a system to build on"
@@ -598,7 +598,7 @@ def parse_args(args):
def main(args):
# parse args
- opts,pkgs = parse_args(args)
+ opts, pkgs = parse_args(args)
if not os.path.exists(opts.destdir):
os.makedirs(opts.destdir)
10 years, 6 months
[copr] master: operator should be preceded and followed by space (222d6ed)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 222d6ed2a51436ad99f6c0e5b6fc7ca81998faf2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Oct 17 11:37:18 2013 +0200
operator should be preceded and followed by space
>---------------------------------------------------------------
backend/mockremote.py | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/backend/mockremote.py b/backend/mockremote.py
index c21643b..930670d 100755
--- a/backend/mockremote.py
+++ b/backend/mockremote.py
@@ -204,7 +204,7 @@ class CliLogCallBack(DefaultCallBack):
try:
open(self.logfn, 'a').write(str(now) + ':' + msg + '\n')
except (IOError, OSError), e:
- print >>sys.stderr, 'Could not write to logfile %s - %s' % (self.logfn, str(e))
+ print >> sys.stderr, 'Could not write to logfile %s - %s' % (self.logfn, str(e))
if not self.quiet:
print msg
@@ -235,8 +235,8 @@ class Builder(object):
if self._tempdir:
return self._tempdir
- cmd='/bin/mktemp -d %s/%s-XXXXX' % (self.mockremote.remote_basedir, 'mockremote')
- self.conn.module_name="shell"
+ cmd = '/bin/mktemp -d %s/%s-XXXXX' % (self.mockremote.remote_basedir, 'mockremote')
+ self.conn.module_name = "shell"
self.conn.module_args = str(cmd)
results = self.conn.run()
tempdir = None
@@ -280,7 +280,7 @@ class Builder(object):
dest = None
if os.path.exists(pkg):
dest = self.tempdir + '/' + os.path.basename(pkg)
- self.conn.module_name="copy"
+ self.conn.module_name = "copy"
margs = 'src=%s dest=%s' % (pkg, dest)
self.conn.module_args = str(margs)
self.mockremote.callback.log("Sending %s to %s to build" % (os.path.basename(pkg), self.hostname))
@@ -301,7 +301,7 @@ class Builder(object):
# run the mockchain command async
# this runs it sync - FIXME
self.mockremote.callback.log('executing: %r' % buildcmd)
- self.conn.module_name="shell"
+ self.conn.module_name = "shell"
self.conn.module_args = str(buildcmd)
results = self.conn.run()
@@ -630,8 +630,8 @@ def main(args):
print "Output written to: %s" % mr.destdir
except MockRemoteError, e:
- print >>sys.stderr, "Error on build:"
- print >>sys.stderr, str(e)
+ print >> sys.stderr, "Error on build:"
+ print >> sys.stderr, str(e)
return
10 years, 6 months
[copr] master: remove trailing whitespace (1f706d5)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 1f706d5fd41807192e58308f1506daed57ee961d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Oct 17 11:34:41 2013 +0200
remove trailing whitespace
>---------------------------------------------------------------
0 files changed, 0 insertions(+), 0 deletions(-)
10 years, 6 months
[copr] master: convert comment to docstring (037e22a)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 037e22a3abe6d62e22b8c9db2d3194856ffa7cb4
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Oct 17 11:24:33 2013 +0200
convert comment to docstring
>---------------------------------------------------------------
backend/mockremote.py | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/backend/mockremote.py b/backend/mockremote.py
index b7429c8..2a3863d 100755
--- a/backend/mockremote.py
+++ b/backend/mockremote.py
@@ -102,10 +102,11 @@ def _create_ans_conn(hostname, username, timeout):
def check_for_ans_error(results, hostname, err_codes=[], success_codes=[0],
return_on_error=['stdout', 'stderr']):
- # returns True or False + dict
- # dict includes 'msg'
- # may include 'rc', 'stderr', 'stdout' and any other
- # requested result codes
+ """ returns True or False + dict
+ dict includes 'msg'
+ may include 'rc', 'stderr', 'stdout' and any other
+ requested result codes
+ """
err_results = {}
if 'dark' in results and hostname in results['dark']:
10 years, 6 months
[copr] master: use ssh transport (4f863bd)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 4f863bd5e87369ac8d1071cc0d4460cc145eeb90
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Oct 17 11:23:14 2013 +0200
use ssh transport
do not use paramiko as it will have problem with known_hosts
>---------------------------------------------------------------
backend/mockremote.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/backend/mockremote.py b/backend/mockremote.py
index c622ace..b7429c8 100755
--- a/backend/mockremote.py
+++ b/backend/mockremote.py
@@ -96,7 +96,7 @@ def get_ans_results(results, hostname):
def _create_ans_conn(hostname, username, timeout):
ans_conn = ansible.runner.Runner(remote_user=username,
- host_list=hostname + ',', pattern=hostname, forks=1,
+ host_list=hostname + ',', pattern=hostname, forks=1, transport='ssh',
timeout=timeout)
return ans_conn
10 years, 6 months
[copr] master: do not create new ansible connection, reuse self.conn (12a1053)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 12a10535a1add468b22095abb4a7beaf6a4ca197
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Oct 17 11:22:29 2013 +0200
do not create new ansible connection, reuse self.conn
>---------------------------------------------------------------
backend/mockremote.py | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/backend/mockremote.py b/backend/mockremote.py
index d903d28..c622ace 100755
--- a/backend/mockremote.py
+++ b/backend/mockremote.py
@@ -362,13 +362,9 @@ class Builder(object):
except socket.gaierror:
raise BuilderError('%s could not be resolved' % self.hostname)
- # connect as user
-
- ans = ansible.runner.Runner(host_list=self.hostname + ',', pattern='*',
- remote_user=self.username, forks=1, timeout=20)
- ans.module_name = "shell"
- ans.module_args = str("/bin/rpm -q mock rsync")
- res = ans.run()
+ self.conn.module_name = "shell"
+ self.conn.module_args = str("/bin/rpm -q mock rsync")
+ res = self.conn.run()
# check for mock/rsync from results
is_err, err_results = check_for_ans_error(res, self.hostname, success_codes=[0])
if is_err:
@@ -379,9 +375,9 @@ class Builder(object):
# test for path existence for mockchain and chroot config for this chroot
- ans.module_name = "shell"
- ans.module_args = str("/usr/bin/test -f %s && /usr/bin/test -f /etc/mock/%s.cfg" % (mockchain, self.chroot))
- res = ans.run()
+ self.conn.module_name = "shell"
+ self.conn.module_args = "/usr/bin/test -f %s && /usr/bin/test -f /etc/mock/%s.cfg" % (mockchain, self.chroot)
+ res = self.conn.run()
is_err, err_results = check_for_ans_error(res, self.hostname, success_codes=[0])
if is_err:
10 years, 6 months
[copr] master: run copr-be.py as copr (ab599b8)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit ab599b8c0ce40962a80c893990f99ad163204002
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Oct 16 14:50:34 2013 +0200
run copr-be.py as copr
This should not be needed as we setuid to copr before forking, but for some
reason ansible.playbook.Playbook does not work under this conditions
But work when run as copr from start.
>---------------------------------------------------------------
copr-backend.service | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/copr-backend.service b/copr-backend.service
index ec1163d..297889d 100644
--- a/copr-backend.service
+++ b/copr-backend.service
@@ -6,6 +6,8 @@ After=syslog.target network.target auditd.service
Type=simple
PIDFile=/var/run/copr-backend/copr-be.pid
#ExecStartPre=/home/copr/cloud/ec2rc.variable
+User=copr
+Group=copr
ExecStart=/usr/share/copr/copr-be.py
ExecReload=/bin/kill -HUP $MAINPID
10 years, 6 months
[copr] master: s/Copr/Project/ where we use copr in meaning of projects (746c513)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 746c513921f59c100d7ce089647fa77460e08f78
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Oct 14 16:46:17 2013 +0200
s/Copr/Project/ where we use copr in meaning of projects
>---------------------------------------------------------------
coprs_frontend/coprs/forms.py | 2 +-
coprs_frontend/coprs/logic/coprs_logic.py | 12 ++++----
.../coprs/templates/coprs/_coprs_forms.html | 4 +-
coprs_frontend/coprs/templates/coprs/add.html | 6 ++--
.../coprs/templates/coprs/detail/delete.html | 2 +-
coprs_frontend/coprs/templates/coprs/show.html | 8 +++---
coprs_frontend/coprs/views/api_ns/api_general.py | 2 +-
.../coprs/views/coprs_ns/coprs_general.py | 20 +++++++-------
.../test_views/test_coprs_ns/test_coprs_general.py | 28 ++++++++++----------
9 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/coprs_frontend/coprs/forms.py b/coprs_frontend/coprs/forms.py
index 02272d8..886e834 100644
--- a/coprs_frontend/coprs/forms.py
+++ b/coprs_frontend/coprs/forms.py
@@ -37,7 +37,7 @@ class UrlListValidator(object):
class CoprUniqueNameValidator(object):
def __init__(self, message = None):
if not message:
- message = 'You already have copr named "{0}".'
+ message = 'You already have project named "{0}".'
self.message = message
def __call__(self, form, field):
diff --git a/coprs_frontend/coprs/logic/coprs_logic.py b/coprs_frontend/coprs/logic/coprs_logic.py
index c304fdd..2eee113 100644
--- a/coprs_frontend/coprs/logic/coprs_logic.py
+++ b/coprs_frontend/coprs/logic/coprs_logic.py
@@ -105,14 +105,14 @@ class CoprsLogic(object):
@classmethod
def update(cls, user, copr, check_for_duplicates = True):
cls.raise_if_unfinished_blocking_action(user, copr,
- 'Can\'t change this Copr name, another operation is in progress: {action}')
+ 'Can\'t change this project name, another operation is in progress: {action}')
users_logic.UsersLogic.raise_if_cant_update_copr(user, copr,
- 'Only owners and admins may update their Coprs.')
+ 'Only owners and admins may update their projects.')
existing = cls.exists_for_user(copr.owner, copr.name).first()
if existing:
if check_for_duplicates and existing.id != copr.id:
- raise exceptions.DuplicateException('Copr: "{0}" already exists'.format(copr.name))
+ raise exceptions.DuplicateException('Project: "{0}" already exists'.format(copr.name))
else: # we're renaming
# if we fire a models.Copr.query, it will use the modified copr in session
# -> workaround this by just getting the name
@@ -133,7 +133,7 @@ class CoprsLogic(object):
cls.raise_if_cant_delete(user, copr)
# TODO: do we want to dump the information somewhere, so that we can search it in future?
cls.raise_if_unfinished_blocking_action(user, copr,
- 'Can\'t delete this Copr, another operation is in progress: {action}')
+ 'Can\'t delete this project, another operation is in progress: {action}')
action = models.Action(action_type=helpers.ActionTypeEnum('delete'),
object_type='copr',
object_id=copr.id,
@@ -186,7 +186,7 @@ class CoprsLogic(object):
by given user. Returns None otherwise.
"""
if not user.admin and user != copr.owner:
- raise exceptions.InsufficientRightsException('Only owners may delete their Coprs.')
+ raise exceptions.InsufficientRightsException('Only owners may delete their projects.')
class CoprPermissionsLogic(object):
@classmethod
@@ -209,7 +209,7 @@ class CoprPermissionsLogic(object):
@classmethod
def update_permissions(cls, user, copr, copr_permission, new_builder, new_admin):
users_logic.UsersLogic.raise_if_cant_update_copr(user, copr,
- 'Only owners and admins may update their Coprs permissions.')
+ 'Only owners and admins may update their projects permissions.')
models.CoprPermission.query.filter(models.CoprPermission.copr_id == copr.id).\
filter(models.CoprPermission.user_id == copr_permission.user_id).\
update({'copr_builder': new_builder,
diff --git a/coprs_frontend/coprs/templates/coprs/_coprs_forms.html b/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
index a43d307..6fe89d9 100644
--- a/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
+++ b/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
@@ -12,7 +12,7 @@
<dl>
{{ form.csrf_token }}
{{ render_field(form.id, hidden = True) }}
- {{ render_field(form.name, label='Copr Name') }}
+ {{ render_field(form.name, label='Project Name') }}
{{ render_field(form.description, rows=5, cols=50) }}
{{ render_field(form.instructions, rows=5, cols=50) }}
<dt class="field-label">Chroots</dt>
@@ -85,7 +85,7 @@
{% macro copr_legal_flag_form(form, copr) %}
<form class="legal-flag" method="post" action={{ url_for('coprs_ns.copr_legal_flag', username=copr.owner.name, coprname=copr.name) }}>
- If you think that this copr may be violating our policies, you can mark it for legal review.
+ If you think that this project may be violating our policies, you can mark it for legal review.
You can add an optional comment describing what you think is wrong here.
<dl>
diff --git a/coprs_frontend/coprs/templates/coprs/add.html b/coprs_frontend/coprs/templates/coprs/add.html
index 9b97814..732d6b3 100644
--- a/coprs_frontend/coprs/templates/coprs/add.html
+++ b/coprs_frontend/coprs/templates/coprs/add.html
@@ -1,11 +1,11 @@
{% extends "layout.html" %}
-{% block title %}Add a Copr{% endblock %}
-{% block header %}Add a new Copr{% endblock %}
+{% block title %}Add a Project{% endblock %}
+{% block header %}Add a new Project{% endblock %}
{% from "coprs/_coprs_forms.html" import copr_form %}
{% block body %}
- <h1>Add a new Copr</h1>
+ <h1>Add a new Project</h1>
{{ copr_form(form, view = 'coprs_ns.copr_new', username=g.user.name) }}
{% endblock %}
diff --git a/coprs_frontend/coprs/templates/coprs/detail/delete.html b/coprs_frontend/coprs/templates/coprs/detail/delete.html
index 0e65de0..f0e22b9 100644
--- a/coprs_frontend/coprs/templates/coprs/detail/delete.html
+++ b/coprs_frontend/coprs/templates/coprs/detail/delete.html
@@ -4,7 +4,7 @@
{% from "coprs/_coprs_forms.html" import copr_delete_form %}
{% block detail_body %}
- <p>If you really want to delete this Copr, you'll have to answer this riddle:</p>
+ <p>If you really want to delete this Project, you'll have to answer this riddle:</p>
<p>{{ range(5)|random }}.{{ range(10)|random }} hens lay {{ range(5)|random }}.{{ range(10)|random }} eggs in
{{ range(5)|random }}.{{ range(10)|random }} days. How many eggs do {{ range(5)|random }}.{{ range(10)|random }}
hens lay in {{ range(5)|random }}.{{ range(10)|random }} days?</p>
diff --git a/coprs_frontend/coprs/templates/coprs/show.html b/coprs_frontend/coprs/templates/coprs/show.html
index 0d85a68..d198d2d 100644
--- a/coprs_frontend/coprs/templates/coprs/show.html
+++ b/coprs_frontend/coprs/templates/coprs/show.html
@@ -5,12 +5,12 @@
{% block body %}
{% if g.user %}
<div class="user-info">
- <a href="{{ url_for('coprs_ns.coprs_by_owner', username=g.user.name) }}" title="My Coprs">
+ <a href="{{ url_for('coprs_ns.coprs_by_owner', username=g.user.name) }}" title="My Projects">
<img src="{{ g.user.gravatar_url }}" alt="User Image">
</a>
<p>{{ g.user.name }}</p>
<p class="coprs-count">
- <a href="{{ url_for('coprs_ns.coprs_by_owner', username=g.user.name) }}" title="My Coprs">{{ g.user.coprs_count }}</a>
+ <a href="{{ url_for('coprs_ns.coprs_by_owner', username=g.user.name) }}" title="My Projects">{{ g.user.coprs_count }}</a>
</p>
<p class="other-text">coprs</p>
</div>
@@ -19,7 +19,7 @@
{% if g.user %}
<div class="add-copr">+
<a href={{ url_for('coprs_ns.copr_add', username=g.user.name) }}>
- add a new Copr
+ add a new Project
</a>
</div>
{% endif %}
@@ -37,7 +37,7 @@
</p>
</div>
{% else %}
- <p>No coprs...</p>
+ <p>No projects...</p>
{% endfor %}
<div class="pagination">
{{ render_pagination(request, paginator) }}
diff --git a/coprs_frontend/coprs/views/api_ns/api_general.py b/coprs_frontend/coprs/views/api_ns/api_general.py
index 205f561..8d42745 100644
--- a/coprs_frontend/coprs/views/api_ns/api_general.py
+++ b/coprs_frontend/coprs/views/api_ns/api_general.py
@@ -71,7 +71,7 @@ def api_new_copr(username):
description=form.description.data,
instructions=form.instructions.data,
check_for_duplicates=True)
- infos.append('New copr was successfully created.')
+ infos.append('New project was successfully created.')
if form.initial_pkgs.data:
builds_logic.BuildsLogic.add_build(
diff --git a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
index 143ee6c..4415a3a 100644
--- a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
+++ b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
@@ -90,7 +90,7 @@ def copr_new(username):
description=form.description.data,
instructions=form.instructions.data)
db.session.commit()
- flask.flash('New copr was successfully created.')
+ flask.flash('New project was successfully created.')
if form.initial_pkgs.data:
builds_logic.BuildsLogic.add(flask.g.user,
@@ -187,7 +187,7 @@ def copr_update(username, coprname):
flask.flash(e)
db.session.rollback()
else:
- flask.flash('Copr was updated successfully.')
+ flask.flash('Project was updated successfully.')
db.session.commit()
return flask.redirect(flask.url_for('coprs_ns.copr_detail', username = username, coprname = copr.name))
@@ -203,16 +203,16 @@ def copr_permissions_applier_change(username, coprname):
applier_permissions_form = forms.PermissionsApplierFormFactory.create_form_cls(permission)()
if not copr:
- return page_not_found('Copr with name {0} does not exist.'.format(name))
+ return page_not_found('Project with name {0} does not exist.'.format(name))
if copr.owner == flask.g.user:
- flask.flash('Owner cannot request permissions for his own copr.')
+ flask.flash('Owner cannot request permissions for his own project.')
elif applier_permissions_form.validate_on_submit():
# we rely on these to be 0 or 1 from form. TODO: abstract from that
new_builder = applier_permissions_form.copr_builder.data
new_admin = applier_permissions_form.copr_admin.data
coprs_logic.CoprPermissionsLogic.update_permissions_by_applier(flask.g.user, copr, permission, new_builder, new_admin)
db.session.commit()
- flask.flash('Successfuly updated permissions do Copr "{0}".'.format(copr.name))
+ flask.flash('Successfuly updated permissions for project "{0}".'.format(copr.name))
return flask.redirect(flask.url_for('coprs_ns.copr_detail', username = copr.owner.name, coprname = copr.name))
@@ -241,7 +241,7 @@ def copr_update_permissions(username, coprname):
flask.flash(e)
else:
db.session.commit()
- flask.flash('Copr permissions were updated successfully.')
+ flask.flash('Project permissions were updated successfully.')
return flask.redirect(flask.url_for('coprs_ns.copr_detail', username = copr.owner.name, coprname = copr.name))
@@ -261,7 +261,7 @@ def copr_delete(username, coprname):
return flask.redirect(flask.url_for('coprs_ns.copr_detail', username=username, coprname=coprname))
else:
db.session.commit()
- flask.flash('Copr was deleted successfully.')
+ flask.flash('Project was deleted successfully.')
return flask.redirect(flask.url_for('coprs_ns.coprs_by_owner', username=username))
else:
return flask.render_template('coprs/detail/delete.html', form=form, copr=copr)
@@ -279,7 +279,7 @@ def copr_legal_flag(username, coprname):
reporter=flask.g.user)
db.session.add(legal_flag)
db.session.commit()
- flask.flash('Admin was noticed about your report and will investigate the copr shortly.')
+ flask.flash('Admin was noticed about your report and will investigate the project shortly.')
return flask.redirect(flask.url_for('coprs_ns.copr_detail', username=username, coprname=coprname))
@@ -294,7 +294,7 @@ def generate_repo_file(username, coprname):
reponame = "%s-%s" % (username, coprname)
if '-' not in reponame:
- return page_not_found('Bad repository name: {0}. Must be username-coprname'.format(reponame))
+ return page_not_found('Bad repository name: {0}. Must be username-projectname'.format(reponame))
username, coprname = reponame.split('-', 1)
copr = None
@@ -303,7 +303,7 @@ def generate_repo_file(username, coprname):
copr = coprs_logic.CoprsLogic.get(flask.g.user, username, coprname,
with_builds=True).one()
except sqlalchemy.orm.exc.NoResultFound:
- return page_not_found('Copr {0}/{1} does not exist'.format(username, coprname))
+ return page_not_found('Project {0}/{1} does not exist'.format(username, coprname))
url = ''
for build in copr.builds:
diff --git a/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py b/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py
index 499f892..a248c0c 100644
--- a/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py
+++ b/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py
@@ -9,7 +9,7 @@ from tests.coprs_test_case import CoprsTestCase, TransactionDecorator
class TestCoprsShow(CoprsTestCase):
def test_show_no_entries(self):
- assert 'No coprs...' in self.tc.get('/').data
+ assert 'No projects...' in self.tc.get('/').data
def test_show_more_entries(self, f_users, f_coprs, f_db):
r = self.tc.get('/')
@@ -20,7 +20,7 @@ class TestCoprsOwned(CoprsTestCase):
def test_owned_none(self, f_users, f_coprs, f_db):
self.db.session.add(self.u3)
r = self.test_client.get('/coprs/{0}/'.format(self.u3.name))
- assert 'No coprs...' in r.data
+ assert 'No projects...' in r.data
@TransactionDecorator('u1')
def test_owned_one(self, f_users, f_coprs, f_db):
@@ -34,7 +34,7 @@ class TestCoprsAllowed(CoprsTestCase):
def test_allowed_none(self, f_users, f_coprs, f_copr_permissions, f_db):
self.db.session.add(self.u3)
r = self.test_client.get('/coprs/{0}/allowed/'.format(self.u3.name))
- assert 'No coprs...' in r.data
+ assert 'No projects...' in r.data
@TransactionDecorator('u2')
def test_allowed_one(self, f_users, f_coprs, f_copr_permissions, f_db):
@@ -49,7 +49,7 @@ class TestCoprsAllowed(CoprsTestCase):
assert r.data.count('<div class="copr">') == 1
class TestCoprNew(CoprsTestCase):
- success_string = 'New copr was successfully created'
+ success_string = 'New project was successfully created'
@TransactionDecorator('u1')
def test_copr_new_normal(self, f_users, f_mock_chroots, f_db):
@@ -92,7 +92,7 @@ class TestCoprNew(CoprsTestCase):
r = self.test_client.post('/coprs/{0}/new/'.format(self.u1.name), data = {'name': self.c1.name, 'fedora-rawhide-i386': 'y'}, follow_redirects = True)
self.db.session.add(self.c1)
assert len(self.models.Copr.query.filter(self.models.Copr.name == self.c1.name).all()) == foocoprs
- assert "You already have copr named" in r.data
+ assert "You already have project named" in r.data
@TransactionDecorator('u1')
def test_copr_new_with_initial_pkgs(self, f_users, f_mock_chroots, f_db):
@@ -203,7 +203,7 @@ class TestCoprUpdate(CoprsTestCase):
r = self.test_client.post('/coprs/{0}/{1}/update/'.format(self.u1.name, self.c1.name),
data = {'name': self.c1.name, 'fedora-18-x86_64': 'y', 'id': self.c1.id},
follow_redirects = True)
- assert 'Copr was updated successfully' in r.data
+ assert 'Project was updated successfully' in r.data
@TransactionDecorator('u1')
def test_copr_admin_can_update(self, f_users, f_coprs, f_copr_permissions, f_mock_chroots, f_db):
@@ -211,7 +211,7 @@ class TestCoprUpdate(CoprsTestCase):
r = self.test_client.post('/coprs/{0}/{1}/update/'.format(self.u2.name, self.c3.name),
data = {'name': self.c3.name, 'fedora-rawhide-i386': 'y', 'id': self.c3.id},
follow_redirects = True)
- assert 'Copr was updated successfully' in r.data
+ assert 'Project was updated successfully' in r.data
@TransactionDecorator('u1')
def test_update_multiple_chroots(self, f_users, f_coprs, f_copr_permissions, f_mock_chroots, f_db):
@@ -219,7 +219,7 @@ class TestCoprUpdate(CoprsTestCase):
r = self.test_client.post('/coprs/{0}/{1}/update/'.format(self.u1.name, self.c1.name),
data = {'name': self.c1.name, self.mc2.chroot_name: 'y', self.mc3.chroot_name: 'y', 'id': self.c1.id},
follow_redirects = True)
- assert 'Copr was updated successfully' in r.data
+ assert 'Project was updated successfully' in r.data
self.db.session.add_all([self.c1, self.mc1, self.mc2, self.mc3])
mock_chroots = self.models.MockChroot.query.join(self.models.CoprChroot).\
filter(self.models.CoprChroot.copr_id==\
@@ -241,7 +241,7 @@ class TestCoprUpdate(CoprsTestCase):
r = self.test_client.post('/coprs/{0}/{1}/update/'.format(self.u2.name, self.c2.name),
data = {'name': self.c2.name, self.mc1.chroot_name: 'y', 'id': self.c2.id},
follow_redirects = True)
- assert 'Copr was updated successfully' in r.data
+ assert 'Project was updated successfully' in r.data
self.db.session.add_all([self.c2, self.mc1])
mock_chroots = self.models.MockChroot.query.join(self.models.CoprChroot).\
filter(self.models.CoprChroot.copr_id==\
@@ -320,7 +320,7 @@ class TestCoprUpdatePermissions(CoprsTestCase):
r = self.test_client.post('/coprs/{0}/{1}/update_permissions/'.format(self.u2.name, self.c3.name),
data = {'copr_builder_1': '2', 'copr_admin_3': '2'},
follow_redirects = True)
- assert 'Copr permissions were updated' in r.data
+ assert 'Project permissions were updated' in r.data
@TransactionDecorator('u1')
def test_copr_admin_can_give_up_his_permissions(self, f_users, f_coprs, f_copr_permissions, f_db):
@@ -340,7 +340,7 @@ class TestCoprUpdatePermissions(CoprsTestCase):
filter(self.models.CoprPermission.copr_id==self.c3.id).\
first()
assert perm.copr_admin == 1
- assert 'Copr permissions were updated' in r.data
+ assert 'Project permissions were updated' in r.data
class TestCoprDelete(CoprsTestCase):
@@ -351,7 +351,7 @@ class TestCoprDelete(CoprsTestCase):
r = self.test_client.post('/coprs/{0}/{1}/delete/'.format(self.u1.name, self.c1.name),
data = {'verify': 'yes'},
follow_redirects = True)
- assert 'Copr was deleted successfully' in r.data
+ assert 'Project was deleted successfully' in r.data
self.db.session.add(self.c1)
assert self.models.Action.query.first().id == self.c1.id
assert self.models.Copr.query.filter(self.models.Copr.id==self.c1.id).first().deleted
@@ -362,7 +362,7 @@ class TestCoprDelete(CoprsTestCase):
r = self.test_client.post('/coprs/{0}/{1}/delete/'.format(self.u1.name, self.c1.name),
data = {'verify': 'no'},
follow_redirects = True)
- assert 'Copr was deleted successfully' not in r.data
+ assert 'Project was deleted successfully' not in r.data
assert not self.models.Action.query.first()
assert self.models.Copr.query.filter(self.models.Copr.id==self.c1.id).first()
@@ -373,7 +373,7 @@ class TestCoprDelete(CoprsTestCase):
data = {'verify': 'yes'},
follow_redirects = True)
self.db.session.add_all([self.c1])
- assert 'Copr was deleted successfully' not in r.data
+ assert 'Project was deleted successfully' not in r.data
assert not self.models.Action.query.first()
assert self.models.Copr.query.filter(self.models.Copr.id==self.c1.id).first()
10 years, 6 months