copr-commits May 2014

copr-commits@lists.fedorahosted.org

2 participants
29 discussions

[copr] tag 'copr-frontend-1.38-1' created
by Miroslav Suchý 30 May '14

30 May '14

Repository : http://git.fedorahosted.org/cgit/copr.git New tag : copr-frontend-1.38-1 Referencing: a01e3190b2f59a13a5e34bf93705824a711f3622

1 0

[copr] master: Automatic commit of package [copr-frontend] release [1.38-1]. (a194d31)
by Miroslav Suchý 30 May '14

30 May '14

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit a194d31153a26062ee48a911bc139eeb8ec37a2f Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Fri May 30 15:43:32 2014 +0200 Automatic commit of package [copr-frontend] release [1.38-1]. >--------------------------------------------------------------- frontend/copr-frontend.spec | 6 +++++- rel-eng/packages/copr-frontend | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/copr-frontend.spec b/frontend/copr-frontend.spec index 5c6265a..eecd1d3 100644 --- a/frontend/copr-frontend.spec +++ b/frontend/copr-frontend.spec @@ -5,7 +5,7 @@ %endif Name: copr-frontend -Version: 1.37 +Version: 1.38 Release: 1%{?dist} Summary: Frontend for Copr @@ -162,6 +162,10 @@ service httpd condrestart %doc %{_pkgdocdir}/python-doc %changelog +* Fri May 30 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.38-1 +- [frontend] running build can not be deleted +- [frontend] cancel status set to all chroots + * Fri May 30 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.37-1 - [frontend] monitor table design unified - [frontend] skipping bad package urls diff --git a/rel-eng/packages/copr-frontend b/rel-eng/packages/copr-frontend index 595c135..6015d9f 100644 --- a/rel-eng/packages/copr-frontend +++ b/rel-eng/packages/copr-frontend @@ -1 +1 @@ -1.37-1 frontend/ +1.38-1 frontend/

1 0

[copr] master: [frontend] cancel status set to all chroots (3e3e9f3)
by asamalik＠fedoraproject.org 30 May '14

30 May '14

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 3e3e9f390aaa5cf649a9a122cc16695960a9f0b3 Author: Adam Samalik <asamalik(a)redhat.com> Date: Fri May 30 14:18:57 2014 +0200 [frontend] cancel status set to all chroots >--------------------------------------------------------------- .../coprs_frontend/coprs/logic/builds_logic.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/frontend/coprs_frontend/coprs/logic/builds_logic.py b/frontend/coprs_frontend/coprs/logic/builds_logic.py index 4536f2b..4792bdb 100644 --- a/frontend/coprs_frontend/coprs/logic/builds_logic.py +++ b/frontend/coprs_frontend/coprs/logic/builds_logic.py @@ -150,6 +150,8 @@ class BuildsLogic(object): raise exceptions.InsufficientRightsException( "You are not allowed to cancel this build.") build.canceled = True + for chroot in build.build_chroots: + chroot.status = 2; #canceled @classmethod def delete_build(cls, user, build):

1 0

[copr] master: [frontend] running build can not be deleted (96c1910)
by asamalik＠fedoraproject.org 30 May '14

30 May '14

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 96c19101163f6547693c200927475a76068e9ae3 Author: Adam Samalik <asamalik(a)redhat.com> Date: Fri May 30 14:26:36 2014 +0200 [frontend] running build can not be deleted >--------------------------------------------------------------- .../coprs_frontend/coprs/logic/builds_logic.py | 4 ++++ .../templates/coprs/detail/_builds_forms.html | 2 +- .../coprs/views/coprs_ns/coprs_builds.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/coprs_frontend/coprs/logic/builds_logic.py b/frontend/coprs_frontend/coprs/logic/builds_logic.py index 4792bdb..d4961fc 100644 --- a/frontend/coprs_frontend/coprs/logic/builds_logic.py +++ b/frontend/coprs_frontend/coprs/logic/builds_logic.py @@ -159,6 +159,10 @@ class BuildsLogic(object): raise exceptions.InsufficientRightsException( "You are not allowed to delete this build.") + if build.state == "running": + raise exceptions.ActionInProgressException( + "You can not delete build which is running.", "Running build") + action = models.Action(action_type=helpers.ActionTypeEnum("delete"), object_type="build", object_id=build.id, diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/_builds_forms.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/_builds_forms.html index 4023881..edf0eb5 100644 --- a/frontend/coprs_frontend/coprs/templates/coprs/detail/_builds_forms.html +++ b/frontend/coprs_frontend/coprs/templates/coprs/detail/_builds_forms.html @@ -65,7 +65,7 @@ {% endmacro %} {% macro copr_build_delete_form(build, page) %} - {% if build.ended_on %} + {% if build.ended_on and build.state != "running" %} <form action="{{ url_for('coprs_ns.copr_delete_build', username=build.copr.owner.name, coprname=build.copr.name, build_id=build.id)}}" method="post"> <input type="hidden" value="page" value="{{ page }}"> <input type="submit" value="Delete"> diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py index 22f5c6b..a39f291 100644 --- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py +++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py @@ -226,7 +226,7 @@ def copr_delete_build(username, coprname, build_id, page=1): "Build with id {0} does not exist.".format(build_id)) try: builds_logic.BuildsLogic.delete_build(flask.g.user, build) - except InsufficientRightsException as e: + except (InsufficientRightsException, ActionInProgressException) as e: flask.flash(str(e)) else: db.session.commit()

1 0

[copr] tag 'copr-frontend-1.37-1' created
by Miroslav Suchý 30 May '14

30 May '14

Repository : http://git.fedorahosted.org/cgit/copr.git New tag : copr-frontend-1.37-1 Referencing: 110218c549dc86a776dcde7d253c8550c6e6f803

1 0

[copr] master: Automatic commit of package [copr-frontend] release [1.37-1]. (df576db)
by Miroslav Suchý 30 May '14

30 May '14

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit df576db3d125008301f9c9d3a7350a65d9f53336 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Fri May 30 14:44:28 2014 +0200 Automatic commit of package [copr-frontend] release [1.37-1]. >--------------------------------------------------------------- frontend/copr-frontend.spec | 8 +++++++- rel-eng/packages/copr-frontend | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/frontend/copr-frontend.spec b/frontend/copr-frontend.spec index 92205d0..5c6265a 100644 --- a/frontend/copr-frontend.spec +++ b/frontend/copr-frontend.spec @@ -5,7 +5,7 @@ %endif Name: copr-frontend -Version: 1.36 +Version: 1.37 Release: 1%{?dist} Summary: Frontend for Copr @@ -162,6 +162,12 @@ service httpd condrestart %doc %{_pkgdocdir}/python-doc %changelog +* Fri May 30 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.37-1 +- [frontend] monitor table design unified +- [frontend] skipping bad package urls +- builders can delete their builds +- css fix + * Wed May 21 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.36-1 - 1077794 - add LICENSE to -doc subpackage - 1077794 - own /usr/share/doc/copr-frontend diff --git a/rel-eng/packages/copr-frontend b/rel-eng/packages/copr-frontend index a7989ad..595c135 100644 --- a/rel-eng/packages/copr-frontend +++ b/rel-eng/packages/copr-frontend @@ -1 +1 @@ -1.36-1 frontend/ +1.37-1 frontend/

1 0

[copr] tag 'copr-backend-1.35-1' created
by Miroslav Suchý 30 May '14

30 May '14

Repository : http://git.fedorahosted.org/cgit/copr.git New tag : copr-backend-1.35-1 Referencing: bf9a7ce4d29fc8cf768f6cdabeb8d55bad67dfa1

1 0

[copr] master: Automatic commit of package [copr-backend] release [1.35-1]. (db7ceaa)
by Miroslav Suchý 30 May '14

30 May '14

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit db7ceaac3e5e9599c646e473a236d1dca6b59a5a Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Fri May 30 14:43:25 2014 +0200 Automatic commit of package [copr-backend] release [1.35-1]. >--------------------------------------------------------------- backend/copr-backend.spec | 6 +++++- rel-eng/packages/copr-backend | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/backend/copr-backend.spec b/backend/copr-backend.spec index 49392d9..de07ca6 100644 --- a/backend/copr-backend.spec +++ b/backend/copr-backend.spec @@ -3,7 +3,7 @@ %endif Name: copr-backend -Version: 1.34 +Version: 1.35 Release: 1%{?dist} Summary: Backend for Copr @@ -172,6 +172,10 @@ useradd -r -g copr -G lighttpd -s /bin/bash -c "COPR user" copr %exclude %{_pkgdocdir}/playbooks %changelog +* Fri May 30 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.35-1 +- follow selinux packaging draft +- [backend] epel 5 repo fix (sha256 -> sha) + * Thu Apr 24 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.34-1 - if directory does not exist, do not try to delete it diff --git a/rel-eng/packages/copr-backend b/rel-eng/packages/copr-backend index 42ca318..4413fa6 100644 --- a/rel-eng/packages/copr-backend +++ b/rel-eng/packages/copr-backend @@ -1 +1 @@ -1.34-1 backend/ +1.35-1 backend/

1 0

[copr] master: [frontend] monitor table design unified (1a8f470)
by asamalik＠fedoraproject.org 29 May '14

29 May '14

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 1a8f4704be1d24f6f48acc24a600b1b01c1dd5aa Author: Adam Samalik <asamalik(a)redhat.com> Date: Wed May 28 16:53:58 2014 +0200 [frontend] monitor table design unified >--------------------------------------------------------------- frontend/coprs_frontend/coprs/models.py | 10 ++++++++++ frontend/coprs_frontend/coprs/static/copr.css | 3 ++- .../templates/coprs/detail/_builds_table.html | 12 ++++++------ .../coprs/templates/coprs/detail/monitor.html | 14 +++++++++++--- .../coprs_frontend/coprs/templates/status.html | 10 +++++----- .../coprs/views/coprs_ns/coprs_general.py | 6 +++++- 6 files changed, 39 insertions(+), 16 deletions(-) diff --git a/frontend/coprs_frontend/coprs/models.py b/frontend/coprs_frontend/coprs/models.py index 7d083be..519aac6 100644 --- a/frontend/coprs_frontend/coprs/models.py +++ b/frontend/coprs_frontend/coprs/models.py @@ -329,6 +329,16 @@ class MockChroot(db.Model, helpers.Serializer): ver=self.os_version, arch=self.arch) + @property + def os(self): + if self.os_version: + format_string = "{rel} {ver}" + else: + format_string = "{rel}" + return format_string.format(rel=self.os_release, + ver=self.os_version) + + class CoprChroot(db.Model, helpers.Serializer): diff --git a/frontend/coprs_frontend/coprs/static/copr.css b/frontend/coprs_frontend/coprs/static/copr.css index 1ef2090..baa56ef 100644 --- a/frontend/coprs_frontend/coprs/static/copr.css +++ b/frontend/coprs_frontend/coprs/static/copr.css @@ -303,6 +303,7 @@ table.builds-table tr.details { table.status-table { width: 100%; + text-align: center; } table.status-table tr:nth-child(odd) { @@ -313,7 +314,7 @@ table.status-table tr:nth-child(even) { background-color: #eee; } -table.status-table tr:first-child { +table.status-table th { color: #fff; background-color: #1f4b89; } diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html index d5751fb..2c1eae2 100644 --- a/frontend/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html +++ b/frontend/coprs_frontend/coprs/templates/coprs/detail/_builds_table.html @@ -12,17 +12,17 @@ </tr> {% for build in builds %} <tr class="build-row build-row-{{ build.state }}" > - <th><a href="{{url_for("coprs_ns.copr_build", username = build.copr.owner.name, coprname = build.copr.name, build_id = build.id)}}">{{ build.id }}</a></th> - <th>{{ build.pkgs|pkg_name }}</th> - <th> + <td><a href="{{url_for("coprs_ns.copr_build", username = build.copr.owner.name, coprname = build.copr.name, build_id = build.id)}}">{{ build.id }}</a></td> + <td>{{ build.pkgs|pkg_name }}</td> + <td> {% if g.user %} {{ build.submitted_on|localized_time(g.user.timezone) }} {% else %} {{ build.submitted_on|localized_time("UTC") }} {% endif %} - </th> - <th> {{ build.started_on|time_ago(build.ended_on) }} </th> - <th class="build-{{ build.state }}">{{ build.state }}</th> + </td> + <td> {{ build.started_on|time_ago(build.ended_on) }} </td> + <td class="build-{{ build.state }}">{{ build.state }}</td> </tr> {% endfor %} </table> diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/monitor.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/monitor.html index a2d9ab6..d0bbac1 100644 --- a/frontend/coprs_frontend/coprs/templates/coprs/detail/monitor.html +++ b/frontend/coprs_frontend/coprs/templates/coprs/detail/monitor.html @@ -8,10 +8,18 @@ Latest build status: <strong>{{ build.state }}</strong> </p> - <table class="monitor"> + <table class="status-table"> + <tr></tr> <tr> - <th>Package</th> - {% for chroot in chroots %} + <th rowspan="2">Packages</th> + {% for i, chroot in oses %} + <th colspan="{{i}}"> + {{ chroot|capitalize }} + </th> + {% endfor %} + </tr> + <tr> + {% for chroot in archs %} <th> {{ chroot }} </th> diff --git a/frontend/coprs_frontend/coprs/templates/status.html b/frontend/coprs_frontend/coprs/templates/status.html index f7d1f48..2f5f107 100644 --- a/frontend/coprs_frontend/coprs/templates/status.html +++ b/frontend/coprs_frontend/coprs/templates/status.html @@ -22,14 +22,14 @@ </tr> {% for build in builds %} <tr> - <th>{{ build.time | time_ago }}</th> - <th><a href="{{ url_for('coprs_ns.copr_detail', username = build.owner, coprname = build.copr) }}">{{build.owner}}/{{build.copr}}</a></th> - <th>{%for pkg in build.pkgs[0:2]:%}{{pkg}}<br>{%endfor%} + <td>{{ build.time | time_ago }}</td> + <td><a href="{{ url_for('coprs_ns.copr_detail', username = build.owner, coprname = build.copr) }}">{{build.owner}}/{{build.copr}}</a></td> + <td>{%for pkg in build.pkgs[0:2]:%}{{pkg}}<br>{%endfor%} {%if build.pkgs|length > 2:%} ...{{build.pkgs|length}} more {%endif%} - </th> - <th>{{ build.chroot }}</th> + </td> + <td>{{ build.chroot }}</td> </tr> {% endfor %} </table> diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py index 2d3f474..f51f7e1 100644 --- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py +++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py @@ -7,6 +7,7 @@ import platform import smtplib import sqlalchemy from email.mime.text import MIMEText +from itertools import groupby from coprs import app from coprs import db @@ -544,6 +545,9 @@ def copr_build_monitor(username, coprname): out = {} build = None chroots = set([chroot.name for chroot in copr.active_chroots]) + oses = [chroot.os for chroot in copr.active_chroots] + oses_grouped = [(len(list(group)),key) for key, group in groupby(oses)] + archs = [chroot.arch for chroot in copr.active_chroots] latest_build = None if builds: @@ -575,6 +579,6 @@ def copr_build_monitor(username, coprname): return flask.render_template("coprs/detail/monitor.html", copr=copr, build=latest_build, - chroots=chroots, + chroots=chroots, oses = oses_grouped, archs = archs, packages=sorted(out.iteritems()), form=form)

1 0

[copr] master: [frontend] skipping bad package urls (37ac644)
by asamalik＠fedoraproject.org 27 May '14

27 May '14

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 37ac6446486bd5dbf9754ffe41958205d38060df Author: Adam Samalik <asamalik(a)redhat.com> Date: Tue May 27 14:09:14 2014 +0200 [frontend] skipping bad package urls >--------------------------------------------------------------- .../coprs/views/coprs_ns/coprs_builds.py | 54 +++++++++++++------- .../coprs/views/coprs_ns/coprs_general.py | 32 ++++++++--- .../test_views/test_coprs_ns/test_coprs_builds.py | 12 ++-- .../test_views/test_coprs_ns/test_coprs_general.py | 4 +- 4 files changed, 66 insertions(+), 36 deletions(-) diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py index 20112a5..22f5c6b 100644 --- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py +++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_builds.py @@ -1,4 +1,5 @@ import flask +import re from coprs import db from coprs import forms @@ -98,30 +99,45 @@ def copr_new_build(username, coprname): form = forms.BuildFormFactory.create_form_cls(copr.active_chroots)() if form.validate_on_submit(): - try: - pkgs = pkgs=form.pkgs.data.replace("\n", " ").split(" ") + pkgs = pkgs=form.pkgs.data.replace("\n", " ").split(" ") + + # validate (and skip bad) urls + bad_urls = [] + for pkg in pkgs: + if not re.match("^.*\.src\.rpm$", pkg): + bad_urls.append(pkg) + flask.flash("Bad url: {0} (skipped)".format(pkg)) + for bad_url in bad_urls: + pkgs.remove(bad_url) + + if not pkgs: + flask.flash("No builds submitted") + else: + # check which chroots we need chroots = [] for chroot in copr.active_chroots: if chroot.name in form.selected_chroots: chroots.append(chroot) - for pkg in pkgs: - build = builds_logic.BuildsLogic.add( - user=flask.g.user, - pkgs=pkg, - copr=copr, - chroots = chroots) - - if flask.g.user.proven: - build.memory_reqs = form.memory_reqs.data - build.timeout = form.timeout.data - - except (ActionInProgressException, InsufficientRightsException) as e: - flask.flash(str(e)) - db.session.rollback() - else: - flask.flash("Build was added") - db.session.commit() + # build each package as a separate build + try: + for pkg in pkgs: + build = builds_logic.BuildsLogic.add( + user=flask.g.user, + pkgs=pkg, + copr=copr, + chroots = chroots) + + if flask.g.user.proven: + build.memory_reqs = form.memory_reqs.data + build.timeout = form.timeout.data + + except (ActionInProgressException, InsufficientRightsException) as e: + flask.flash(str(e)) + db.session.rollback() + else: + flask.flash("Build was added") + db.session.commit() return flask.redirect(flask.url_for("coprs_ns.copr_builds", username=username, diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py index 0dd9746..2d3f474 100644 --- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py +++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py @@ -1,5 +1,6 @@ import os import time +import re import flask import platform @@ -118,17 +119,30 @@ def copr_new(username): flask.flash("New project was successfully created.") if form.initial_pkgs.data: - # we need to build each package separately now pkgs = form.initial_pkgs.data.replace("\n", " ").split(" ") - for pkg in pkgs: - builds_logic.BuildsLogic.add( - flask.g.user, - pkgs=pkg, - copr=copr) - db.session.commit() - flask.flash("Initial packages were successfully submitted " - "for building.") + # validate (and skip bad) urls + bad_urls = [] + for pkg in pkgs: + if not re.match("^.*\.src\.rpm$", pkg): + bad_urls.append(pkg) + flask.flash("Bad url: {0} (skipped)".format(pkg)) + for bad_url in bad_urls: + pkgs.remove(bad_url) + + if not pkgs: + flask.flash("No initial packages submitted") + else: + # build each package as a separate build + for pkg in pkgs: + builds_logic.BuildsLogic.add( + flask.g.user, + pkgs=pkg, + copr=copr) + + db.session.commit() + flask.flash("Initial packages were successfully submitted " + "for building.") return flask.redirect(flask.url_for("coprs_ns.copr_detail", username=flask.g.user.name, diff --git a/frontend/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_builds.py b/frontend/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_builds.py index c88799c..dab7a94 100644 --- a/frontend/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_builds.py +++ b/frontend/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_builds.py @@ -20,10 +20,10 @@ class TestCoprAddBuild(CoprsTestCase): self.db.session.add_all([self.u1, self.c1]) self.test_client.post("/coprs/{0}/{1}/new_build/" .format(self.u1.name, self.c1.name), - data={"pkgs": "http://testing"}, + data={"pkgs": "http://testing.src.rpm"}, follow_redirects=True) - assert self.models.Build.query.first().pkgs == "http://testing" + assert self.models.Build.query.first().pkgs == "http://testing.src.rpm" @TransactionDecorator("u1") def test_copr_allowed_user_can_add_build(self, f_users, f_coprs, @@ -33,10 +33,10 @@ class TestCoprAddBuild(CoprsTestCase): self.db.session.add_all([self.u2, self.c2]) self.test_client.post("/coprs/{0}/{1}/new_build/" .format(self.u2.name, self.c2.name), - data={"pkgs": "http://testing"}, + data={"pkgs": "http://testing.src.rpm"}, follow_redirects=True) - assert self.models.Build.query.first().pkgs == "http://testing" + assert self.models.Build.query.first().pkgs == "http://testing.src.rpm" @TransactionDecorator("u1") def test_copr_not_yet_allowed_user_cant_add_build(self, f_users, f_coprs, @@ -45,7 +45,7 @@ class TestCoprAddBuild(CoprsTestCase): self.db.session.add_all([self.u2, self.c3]) self.test_client.post("/coprs/{0}/{1}/new_build/" .format(self.u2.name, self.c3.name), - data={"pkgs": "http://testing"}, + data={"pkgs": "http://testing.src.rpm"}, follow_redirects=True) assert not self.models.Build.query.first() @@ -59,7 +59,7 @@ class TestCoprAddBuild(CoprsTestCase): self.db.session.add_all([self.u1, self.c1]) self.test_client.post("/coprs/{0}/{1}/new_build/" .format(self.u1.name, self.c1.name), - data={"pkgs": "http://testing"}, + data={"pkgs": "http://testing.src.rpm"}, follow_redirects=True) assert not self.models.Build.query.first() diff --git a/frontend/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py b/frontend/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py index 06137e7..a180c7d 100644 --- a/frontend/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py +++ b/frontend/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py @@ -129,8 +129,8 @@ class TestCoprNew(CoprsTestCase): r = self.test_client.post("/coprs/{0}/new/".format(self.u1.name), data={"name": "foo", "fedora-rawhide-i386": "y", - "initial_pkgs": ["http://f", - "http://b"]}, + "initial_pkgs": ["http://a/f.src.rpm", + "http://a/b.src.rpm"]}, follow_redirects=True) copr = self.models.Copr.query.filter(

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

copr-commits May 2014