bodhi/templates bodhi/tests
by Luke Macken
bodhi/templates/show.kid | 85 +++++++++++++++++++++-------------------
bodhi/tests/test_controllers.py | 4 +
2 files changed, 50 insertions(+), 39 deletions(-)
New commits:
commit 1a750a4cc4896b8838d93eaed10f963b675a0955
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Mar 4 16:04:15 2010 -0500
Refactor the "Push to stable" logic in our show.kid, hopefully multiple issues.
This also modifies a unit test to ensure we can push non-critpath updates to
stable right after they're submitted. This should also fix the duplicate 'Mark
as Stable' button issue.
diff --git a/bodhi/templates/show.kid b/bodhi/templates/show.kid
index 04950a8..2ae0995 100644
--- a/bodhi/templates/show.kid
+++ b/bodhi/templates/show.kid
@@ -75,32 +75,37 @@ karma = "<img src=\"%s\" align=\"top\" /> <b>%d</b>" % (tg.url('/static/images/k
</a>
</td>
</span>
- <span py:if="update.release.locked and update.critpath and update.critpath_approved">
- <span py:if="'qa' in tg.identity.groups or 'releng' in tg.identity.groups">
+
+ <span py:if="update.status != 'stable'">
+ <span py:if="update.release.locked">
+ <span py:if="update.critpath">
+ <span py:if="update.critpath_approved">
+ <td>
+ <a href="${util.url('/request/stable/%s' % update.title)}" class="list">
+ <img src="${tg.url('/static/images/submit.png')}" border="0"/>
+ Push Critical Path update to Stable
+ </a>
+ </td>
+ </span>
+ </span>
+ <span py:if="not update.critpath">
+ <td>
+ <a href="${util.url('/request/stable/%s' % update.title)}" class="list">
+ <img src="${tg.url('/static/images/submit.png')}" border="0"/>
+ Push to Stable
+ </a>
+ </td>
+ </span>
+ </span>
+ <span py:if="not update.release.locked">
<td>
<a href="${util.url('/request/stable/%s' % update.title)}" class="list">
<img src="${tg.url('/static/images/submit.png')}" border="0"/>
- Push Critical Path update to Stable
+ Push to Stable
</a>
</td>
</span>
</span>
- <span py:if="update.status != 'stable' and update.release.locked and not update.critpath and update.critpath_approved">
- <td>
- <a href="${util.url('/request/stable/%s' % update.title)}" class="list">
- <img src="${tg.url('/static/images/submit.png')}" border="0"/>
- Push to Stable
- </a>
- </td>
- </span>
- <span py:if="not update.release.locked and update.status != 'stable'">
- <td>
- <a href="${util.url('/request/stable/%s' % update.title)}" class="list">
- <img src="${tg.url('/static/images/submit.png')}" border="0"/>
- Push to Stable
- </a>
- </td>
- </span>
<td>
<a href="${util.url('/confirm_delete?nvr=%s' % update.title)}" class="list">
<img src="${tg.url('/static/images/trash.png')}" border="0"/>
@@ -124,40 +129,42 @@ karma = "<img src=\"%s\" align=\"top\" /> <b>%d</b>" % (tg.url('/static/images/k
</td>
<span py:if="update.status == 'testing'">
<span py:if="update.request == None">
- <span py:if="update.release.locked and update.critpath and update.critpath_approved">
- <span py:if="'qa' in tg.identity.groups or 'releng' in tg.identity.groups">
- <td>
- <a href="${util.url('/request/stable/%s' % update.title)}" class="list">
- <img src="${tg.url('/static/images/submit.png')}" border="0"/>
- Mark Critical Path update as Stable
- </a>
- </td>
- </span>
- </span>
- <span py:if="not update.critpath">
+ <span py:if="update.release.locked">
+ <span py:if="update.critpath">
+ <span py:if="update.critpath_approved">
+ <td>
+ <a href="${util.url('/request/stable/%s' % update.title)}" class="list">
+ <img src="${tg.url('/static/images/submit.png')}" border="0"/>
+ Mark Critical Path update as Stable
+ </a>
+ </td>
+ </span>
+ </span>
+ <span py:if="not update.critpath">
+ <td>
+ <a href="${util.url('/request/stable/%s' % update.title)}" class="list">
+ <img src="${tg.url('/static/images/submit.png')}" border="0"/>
+ Mark as Stable
+ </a>
+ </td>
+ </span>
+ </span>
+ <span py:if="not update.release.locked">
<td>
<a href="${util.url('/request/stable/%s' % update.title)}" class="list">
<img src="${tg.url('/static/images/submit.png')}" border="0"/>
Mark as Stable
</a>
</td>
+ </span>
</span>
</span>
- <span py:if="not update.release.locked">
- <td>
- <a href="${util.url('/request/stable/%s' % update.title)}" class="list">
- <img src="${tg.url('/static/images/submit.png')}" border="0"/>
- Mark as Stable
- </a>
- </td>
- </span>
<td>
<a href="${util.url('/edit/%s' % update.title)}" class="list">
<img src="${tg.url('/static/images/edit.png')}" border="0"/>
Edit
</a>
</td>
- </span>
</span>
<span py:if="update.pushed and update.status == 'stable' and 'releng' in tg.identity.groups">
<td>
diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py
index eeedc03..adf32d3 100644
--- a/bodhi/tests/test_controllers.py
+++ b/bodhi/tests/test_controllers.py
@@ -1628,6 +1628,10 @@ class TestControllers(testutil.DBTest):
self.save_update(params, session)
update = PackageUpdate.byTitle(params['builds'])
+ testutil.create_request('/updates/%s' % params['builds'],
+ method='GET', headers=session)
+
+ assert "/updates/request/stable" in cherrypy.response.body[0], cherrypy.response.body[0]
# Pretend it's pushed to testing
update.pushed = True
update.status = 'testing'
14 years, 3 months
bodhi/release.py bodhi.spec
by Luke Macken
bodhi.spec | 5 ++++-
bodhi/release.py | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 2c2570c32fad6fe33e2f87ad0e2572d13a138045
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Mar 4 07:23:10 2010 -0500
0.7.3
diff --git a/bodhi.spec b/bodhi.spec
index 9c77731..2c54959 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -2,7 +2,7 @@
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
Name: bodhi
-Version: 0.7.2
+Version: 0.7.3
Release: 1%{?dist}
Summary: A modular framework that facilitates publishing software updates
Group: Applications/Internet
@@ -116,6 +116,9 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py
%changelog
+* Thu Mar 04 2010 Luke Macken <lmacken(a)redhat.com> - 0.7.3-1
+- 0.7.3
+
* Wed Mar 03 2010 Luke Macken <lmacken(a)redhat.com> - 0.7.2-1
- 0.7.2 bugfix release
diff --git a/bodhi/release.py b/bodhi/release.py
index ff3e76c..3f72f5e 100644
--- a/bodhi/release.py
+++ b/bodhi/release.py
@@ -1,4 +1,4 @@
-VERSION = '0.7.2'
+VERSION = '0.7.3'
NAME = 'bodhi'
DESCRIPTION = 'Bodhi is a modular web-system that facilitates the process of publishing updates for a Fedora-based software distribution'
AUTHOR = 'Luke Macken'
14 years, 3 months
[Patch] Make the masher more robust
by Josh Kayse
The attached patches make it so that when a MashTaskException is thrown
by the masher bodhi doesn't fall down. Instead the error is displayed
to the user in a flash object.
Works for me locally.
-josh
--
A: No.
Q: Should I include quotations after my reply?
Don't top post: see http://www.caliburn.nl/topposting.html for more.
14 years, 3 months
Changes to 'refs/tags/0.7.3'
by Luke Macken
Tag '0.7.3' created by Luke Macken <lmacken(a)redhat.com> at 2010-03-04 12:23 +0000
0.7.3
Changes since 0.7.2:
Josh Kayse (1):
only show push to stable if it needs to be pushed to stable
Luke Macken (3):
Have bodhi mention the critpath requirements in it's comments
Minor tweaks to our test suite to get it running again
0.7.3
---
bodhi.spec | 5 ++++-
bodhi/model.py | 2 +-
bodhi/release.py | 2 +-
bodhi/templates/show.kid | 4 ++--
bodhi/tests/test_client.py | 2 +-
bodhi/tests/test_controllers.py | 4 ++--
6 files changed, 11 insertions(+), 8 deletions(-)
---
14 years, 3 months
Changes to 'refs/tags/0.6.11'
by Luke Macken
Tag '0.6.11' created by Luke Macken <lmacken(a)redhat.com> at 2009-09-20 00:50 +0000
0.6.11
Changes since 0.6.10:
Luke Macken (2):
Add a trailing slash to our new update link to quickly hack around
0.6.11
---
bodhi.egg-info/PKG-INFO | 2 +-
bodhi.spec | 5 ++++-
bodhi/release.py | 2 +-
bodhi/templates/master.html | 2 +-
bodhi/templates/master.kid | 2 +-
5 files changed, 8 insertions(+), 5 deletions(-)
---
14 years, 3 months
2 commits - bodhi/model.py bodhi/tests
by Luke Macken
bodhi/model.py | 2 +-
bodhi/tests/test_client.py | 2 +-
bodhi/tests/test_controllers.py | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit ffd916c5b31030da23e558e2a1529f5cb0630b07
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Mar 4 07:17:41 2010 -0500
Minor tweaks to our test suite to get it running again
diff --git a/bodhi/tests/test_client.py b/bodhi/tests/test_client.py
index d82a072..ed2134f 100644
--- a/bodhi/tests/test_client.py
+++ b/bodhi/tests/test_client.py
@@ -208,4 +208,4 @@ close_bugs=True
update = bodhi.query()['updates'][0]
assert update and isinstance(update, dict)
assert bodhi.update_str(update).startswith(u'================================================================================\n TurboGears-1.0.3.2-1.fc7\n================================================================================\n Release: Fedora 7\n Status: pending\n Type: bugfix\n Karma: 0\n Request: stable\n Bugs: 12345 - None\n : 6789 - None\n Notes: foo\n Submitter: guest\n')
- assert bodhi.update_str(update).endswith(u' (karma 0)\n This update has been submitted for stable\n\n http://localhost:8084/updates/TurboGears-1.0.3.2-1.fc7\n')
+ assert bodhi.update_str(update).endswith(u' (karma 0)\n This update has been submitted for stable.\n\n http://localhost:8084/updates/TurboGears-1.0.3.2-1.fc7\n'), repr(bodhi.update_str(update))
diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py
index 7bae57a..eeedc03 100644
--- a/bodhi/tests/test_controllers.py
+++ b/bodhi/tests/test_controllers.py
@@ -1164,14 +1164,14 @@ class TestControllers(testutil.DBTest):
assert len(update.comments) == 1
assert update.comments[0].author == 'guest'
assert update.comments[0].karma == 0
- assert update.comments[0].text == 'This update has been submitted for testing'
+ assert update.comments[0].text == 'This update has been submitted for testing. '
testutil.create_request('/updates/request/stable/%s' %
params['builds'], method='POST',
headers=session)
update = PackageUpdate.byTitle(params['builds'])
assert update.request == 'stable'
assert len(update.comments) == 2
- assert update.get_comments()[-1].text == 'This update has been submitted for stable'
+ assert update.get_comments()[-1].text == 'This update has been submitted for stable. '
testutil.create_request('/updates/request/obsolete/%s' %
params['builds'], method='POST',
headers=session)
commit df270c4978a3bf8ef6f3e6277886d468be7911cc
Author: Luke Macken <lmacken(a)redhat.com>
Date: Thu Mar 4 07:17:27 2010 -0500
Have bodhi mention the critpath requirements in it's comments
diff --git a/bodhi/model.py b/bodhi/model.py
index 7b36eaa..34d2220 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -439,7 +439,7 @@ class PackageUpdate(SQLObject):
#self.date_pushed = None
notes = notes and '. '.join(notes) or ''
flash_log("%s has been submitted for %s. %s" %(self.title,action,notes))
- self.comment('This update has been submitted for %s' % action,
+ self.comment('This update has been submitted for %s. %s' % (action, notes),
author=identity.current.user_name)
mail.send_admin(action, self)
14 years, 3 months
bodhi/templates
by Luke Macken
bodhi/templates/show.kid | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit fca77d530e0fd51997d2588a36b40dbeb9e70154
Author: Josh Kayse <joshkayse(a)fedoraproject.org>
Date: Wed Mar 3 14:40:18 2010 -0500
only show push to stable if it needs to be pushed to stable
diff --git a/bodhi/templates/show.kid b/bodhi/templates/show.kid
index 5c2f65a..04950a8 100644
--- a/bodhi/templates/show.kid
+++ b/bodhi/templates/show.kid
@@ -85,7 +85,7 @@ karma = "<img src=\"%s\" align=\"top\" /> <b>%d</b>" % (tg.url('/static/images/k
</td>
</span>
</span>
- <span py:if="update.release.locked and not update.critpath and update.critpath_approved">
+ <span py:if="update.status != 'stable' and update.release.locked and not update.critpath and update.critpath_approved">
<td>
<a href="${util.url('/request/stable/%s' % update.title)}" class="list">
<img src="${tg.url('/static/images/submit.png')}" border="0"/>
@@ -93,7 +93,7 @@ karma = "<img src=\"%s\" align=\"top\" /> <b>%d</b>" % (tg.url('/static/images/k
</a>
</td>
</span>
- <span py:if="not update.release.locked">
+ <span py:if="not update.release.locked and update.status != 'stable'">
<td>
<a href="${util.url('/request/stable/%s' % update.title)}" class="list">
<img src="${tg.url('/static/images/submit.png')}" border="0"/>
14 years, 3 months
bodhi.egg-info/SOURCES.txt bodhi/release.py
by Luke Macken
bodhi.egg-info/SOURCES.txt | 2 ++
bodhi/release.py | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit ff7fbaf7a8f0e1ecd833a97079cf2ac402d197ac
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Mar 3 17:29:20 2010 -0500
0.7.2
diff --git a/bodhi.egg-info/SOURCES.txt b/bodhi.egg-info/SOURCES.txt
index fe7e4d8..30292b4 100644
--- a/bodhi.egg-info/SOURCES.txt
+++ b/bodhi.egg-info/SOURCES.txt
@@ -138,6 +138,7 @@ bodhi/templates/captchacommentform.kid
bodhi/templates/commentform.kid
bodhi/templates/comments.kid
bodhi/templates/confirmation.kid
+bodhi/templates/critpath.kid
bodhi/templates/form.kid
bodhi/templates/list.kid
bodhi/templates/login.html
@@ -175,6 +176,7 @@ bodhi/tools/__init__.py
bodhi/tools/clean-testing.py
bodhi/tools/client.py
bodhi/tools/dev_init.py
+bodhi/tools/fix_dupe_ids.py
bodhi/tools/init.py
bodhi/tools/metrics.py
bodhi/tools/pickledb.py
diff --git a/bodhi/release.py b/bodhi/release.py
index b2d74f7..ff3e76c 100644
--- a/bodhi/release.py
+++ b/bodhi/release.py
@@ -1,4 +1,4 @@
-VERSION = '0.7.1'
+VERSION = '0.7.2'
NAME = 'bodhi'
DESCRIPTION = 'Bodhi is a modular web-system that facilitates the process of publishing updates for a Fedora-based software distribution'
AUTHOR = 'Luke Macken'
14 years, 3 months
