bodhi/templates
by Luke Macken
bodhi/templates/show.kid | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2edfc7a6d350c62fba1b34b780713c62eb70e7cc
Author: Luke Macken <lmacken(a)redhat.com>
Date: Mon Jan 31 12:51:08 2011 -0500
Tighten up our test case list
diff --git a/bodhi/templates/show.kid b/bodhi/templates/show.kid
index b68886d..34a2b69 100644
--- a/bodhi/templates/show.kid
+++ b/bodhi/templates/show.kid
@@ -254,7 +254,7 @@ for build in update.builds:
<div py:if="test_cases">
<div class="show">Test Cases</div>
<ul py:for="test in test_cases">
- <li><a href="https://fedoraproject.org/wiki/${test}">${test.replace('QA:', '')}</a></li>
+ <li style="line-height:0px;"><a href="https://fedoraproject.org/wiki/${test}">${test.replace('QA:', '')}</a></li>
</ul>
</div>
13 years, 2 months
bodhi/model.py bodhi.spec bodhi/templates
by Luke Macken
bodhi.spec | 4 ++++
bodhi/model.py | 31 +++++++++++++++++++++++++++++++
bodhi/templates/show.kid | 12 ++++++++++++
3 files changed, 47 insertions(+)
New commits:
commit 2548cc6d38bdc337a9070624f10e9f72d2b2695b
Author: Luke Macken <lmacken(a)redhat.com>
Date: Mon Jan 31 12:42:47 2011 -0500
Query the wiki for test cases and display them in the update
diff --git a/bodhi.spec b/bodhi.spec
index 491ec1b..6ad7f0a 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -63,6 +63,7 @@ Requires: httpd
Requires: python-markdown
Requires: python-hashlib
Requires: python-kitchen
+Requires: python-simplemediawiki
%description server
@@ -120,6 +121,9 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py
%changelog
+* Mon Jan 31 2011 Luke Macken <lmacken(a)redhat.com> - 0.7.11
+- Require python-simplemediawiki for our test case integration
+
* Mon Jan 10 2011 Luke Macken <lmacken(a)redhat.com> - 0.7.10-1
- 0.7.10 release
diff --git a/bodhi/model.py b/bodhi/model.py
index b9c59a1..2f3a241 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -170,6 +170,37 @@ class Package(SQLObject):
return dict(name=self.name, suggest_reboot=self.suggest_reboot,
committers=self.committers)
+ def get_test_cases(self):
+ """ Get a list of test cases from the wiki """
+ from simplemediawiki import MediaWiki
+ wiki = MediaWiki('https://fedoraproject.org/w/api.php')
+ cat_page = 'Category:Package %s test cases' % self.name
+ limit = 10
+
+ def list_categorymembers(wiki, cat_page, limit=10):
+ # Build query arguments and call wiki
+ query = dict(action='query', list='categorymembers', cmtitle=cat_page)
+ response = wiki.call(query)
+ members = [entry.get('title') for entry in
+ response.get('query',{}).get('categorymembers',{})
+ if entry.has_key('title')]
+
+ # Determine whether we need to recurse
+ idx = 0
+ while True:
+ if idx >= len(members) or limit <= 0:
+ break
+ # Recurse?
+ if members[idx].startswith('Category:') and limit > 0:
+ members.extend(list_categorymembers(wiki, members[idx], limit-1))
+ members.remove(members[idx]) # remove Category from list
+ else:
+ idx += 1
+
+ return members
+
+ return list_categorymembers(wiki, cat_page)
+
class PackageBuild(SQLObject):
nvr = UnicodeCol(notNone=True, alternateID=True)
diff --git a/bodhi/templates/show.kid b/bodhi/templates/show.kid
index b0e29a2..b68886d 100644
--- a/bodhi/templates/show.kid
+++ b/bodhi/templates/show.kid
@@ -57,6 +57,11 @@ statusinfo = {
'obsolete': 'Obsolete - <b>This update has been obsoleted by a newer update.</b>',
'stable': 'Stable - <b>This update has been released to the stable updates repository and is available for all users to install via the standard update mechanisms.</b>',
}
+
+## Build a list of test cases for this update
+test_cases = []
+for build in update.builds:
+ test_cases.extend(build.package.get_test_cases())
?>
<body>
@@ -246,6 +251,13 @@ statusinfo = {
</blockquote>
</div>
+ <div py:if="test_cases">
+ <div class="show">Test Cases</div>
+ <ul py:for="test in test_cases">
+ <li><a href="https://fedoraproject.org/wiki/${test}">${test.replace('QA:', '')}</a></li>
+ </ul>
+ </div>
+
<div class="show">Feedback</div>
<blockquote>
<div py:if="update.comments">
13 years, 2 months
Re: [bodhi] [PATCH] incite bug reporters to post feedback
by François Cami
Hello Luke, test@, bodhi@,
On Sun, Dec 5, 2010 at 6:22 AM, Kevin Fenzi <kevin(a)scrye.com> wrote:
> On Sat, 4 Dec 2010 17:56:42 +0100
> François Cami <fdc-lists(a)fcami.net> wrote:
>
>> The following patch tentatively changes the message bodhi posts to
>> bugzilla when a build is tagged as an update candidate to make clear
>> that we expect bug reporters to post their feedbacks on updates in the
>> bodhi instance.
>> Please review the message - I am sure someone can make it better.
>
> See also:
>
> https://fedorahosted.org/fedora-infrastructure/ticket/701
I have attached a refined version of the patch to this email, that
hopefully takes into account all the feedboack from Monday's QA
meeting.
I don't think this is a perfect solution and it clearly does not solve
all the issues listed in the afore-mentioned ticket but should still
incite bug reporters to post feedback / karma.
Cheers
François
13 years, 3 months
bodhi/controllers.py
by Luke Macken
bodhi/controllers.py | 30 ++++++++++++++++++++++++------
1 file changed, 24 insertions(+), 6 deletions(-)
New commits:
commit 24e4377ec27eb50f6276d40fab6f21c024fc0b63
Author: François Cami <fcami(a)fedoraproject.org>
Date: Tue Dec 14 19:00:59 2010 +0100
ask bug reporters to test updates and post karma
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index 1dab04e..1e41831 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -975,9 +975,18 @@ class Root(controllers.RootController):
log.debug("Updating newly added bug: %s" % bug)
try:
Bugzilla.byBz_id(bug).add_comment(update,
- "%s has been submitted as an update for %s.\n%s" %
- (update.title, release.long_name,
- config.get('base_address') + tg_url(update.get_url())))
+ "Package %s:\n"
+ "* should fix your issue,\n"
+ "* was pushed to the %s updates-testing repository,\n"
+ "* should be available at your local mirror within two days.\n"
+ "Update it with:\n"
+ "# su -c 'yum update --enablerepo=updates-testing %s'\n"
+ "as soon as you are able to, then reboot.\n"
+ "Please go to the following url:\n"
+ "%s\n"
+ "then log in and leave karma (feedback)." %
+ (update.title, release.long_name, update.title,
+ config.get('base_address') + tg_url(update.get_url())))
except SQLObjectNotFound:
log.debug('Bug #%d not found in our database' % bug)
@@ -996,9 +1005,18 @@ class Root(controllers.RootController):
# Comment on all bugs
for bug in update.bugs:
bug.add_comment(update,
- "%s has been submitted as an update for %s.\n%s" %
- (update.title, release.long_name,
- config.get('base_address') + tg_url(update.get_url())))
+ "Package %s:\n"
+ "* should fix your issue,\n"
+ "* was pushed to the %s updates-testing repository,\n"
+ "* should be available at your local mirror within two days.\n"
+ "Update it with:\n"
+ "# su -c 'yum update --enablerepo=updates-testing %s'\n"
+ "as soon as you are able to, then reboot.\n"
+ "Please go to the following url:\n"
+ "%s\n"
+ "then log in and leave karma (feedback)." %
+ (update.title, release.long_name, update.title,
+ config.get('base_address') + tg_url(update.get_url())))
# If a request is specified, make it. By default we're submitting
# new updates directly into testing
13 years, 3 months
bodhi/controllers.py bodhi/model.py
by Luke Macken
bodhi/controllers.py | 4 ++++
bodhi/model.py | 12 ++++++++++++
2 files changed, 16 insertions(+)
New commits:
commit d6218003bda6ce41f85d1a71260aa4152ec63b41
Author: Luke Macken <lmacken(a)redhat.com>
Date: Mon Jan 17 12:11:11 2011 -0500
Add the appropriate pending tag upon reaching stablekarma.
Also, remove the pending tags when revoking a request.
diff --git a/bodhi/controllers.py b/bodhi/controllers.py
index f323291..1dab04e 100644
--- a/bodhi/controllers.py
+++ b/bodhi/controllers.py
@@ -439,6 +439,10 @@ class Root(controllers.RootController):
raise redirect(update.get_url())
flash_log("%s request revoked" % update.request.title())
mail.send_admin('revoke', update)
+ if update.request == 'testing':
+ update.remove_tag(update.release.pending_testing_tag)
+ elif update.request == 'stable':
+ update.remove_tag(update.release.pending_stable_tag)
update.request = None
raise redirect(update.get_url())
diff --git a/bodhi/model.py b/bodhi/model.py
index 768b003..b9c59a1 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -807,6 +807,10 @@ class PackageUpdate(SQLObject):
# stable once it has met the requirements.
if (self.stable_karma < min_karma and self.critpath_approved and
self.karma >= min_karma and self.pushable):
+ if self.request == 'testing':
+ self.remove_tag(self.release.pending_testing_tag)
+ if self.request != 'stable':
+ self.add_tag(self.release.pending_stable_tag)
self.request = 'stable'
self.comment(config.get('stablekarma_comment'), author='bodhi')
mail.send(self.submitter, 'stablekarma', self)
@@ -816,6 +820,10 @@ class PackageUpdate(SQLObject):
if (self.critpath_approved and self.pushable and
self.karma >= self.stable_karma and
self.karma >= min_karma):
+ if self.request == 'testing':
+ self.remove_tag(self.release.pending_testing_tag)
+ if self.request != 'stable':
+ self.add_tag(self.release.pending_stable_tag)
self.request = 'stable'
self.comment(config.get('stablekarma_comment'), author='bodhi')
mail.send(self.submitter, 'stablekarma', self)
@@ -824,6 +832,10 @@ class PackageUpdate(SQLObject):
if self.stable_karma != 0 and self.stable_karma == self.karma:
if self.pushable:
log.info("Automatically marking %s as stable" % self.title)
+ if self.request == 'testing':
+ self.remove_tag(self.release.pending_testing_tag)
+ if self.request != 'stable':
+ self.add_tag(self.release.pending_stable_tag)
self.request = 'stable'
self.pushed = False
#self.date_pushed = None
13 years, 3 months
bodhi.egg-info/PKG-INFO
by Luke Macken
bodhi.egg-info/PKG-INFO | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 24be4fc942fb191f72d5b32eaa4a17c33d55dbe3
Author: Luke Macken <lmacken(a)redhat.com>
Date: Mon Jan 10 16:19:00 2011 -0500
More 0.7.10 version bumpage
diff --git a/bodhi.egg-info/PKG-INFO b/bodhi.egg-info/PKG-INFO
index 45f7e76..af1dfc9 100644
--- a/bodhi.egg-info/PKG-INFO
+++ b/bodhi.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: bodhi
-Version: 0.7.9
+Version: 0.7.10
Summary: Bodhi is a modular web-system that facilitates the process of publishing updates for a Fedora-based software distribution
Home-page: https://fedorahosted.org/bodhi
Author: Luke Macken
13 years, 3 months
2 commits - bodhi/release.py bodhi.spec bodhi/tests
by Luke Macken
bodhi.spec | 5 ++++-
bodhi/release.py | 2 +-
bodhi/tests/test_model.py | 18 +++++++++---------
3 files changed, 14 insertions(+), 11 deletions(-)
New commits:
commit 3e40e6aa32f764fd266b17dc2209fc3bdea39240
Author: Luke Macken <lmacken(a)redhat.com>
Date: Mon Jan 10 14:11:21 2011 -0500
Our yearly unit test tweaks
diff --git a/bodhi/tests/test_model.py b/bodhi/tests/test_model.py
index d4c36b2..9d9887b 100644
--- a/bodhi/tests/test_model.py
+++ b/bodhi/tests/test_model.py
@@ -128,14 +128,14 @@ class TestPackageUpdate(testutil.DBTest):
time.localtime()[0])
# 10k bug
- update.updateid = 'FEDORA-2010-9999'
+ update.updateid = 'FEDORA-2011-9999'
newupdate = self.get_update(name='nethack-2.5.6-1.fc10')
newupdate.assign_id()
- assert newupdate.updateid == 'FEDORA-2010-10000'
+ assert newupdate.updateid == 'FEDORA-2011-10000'
newerupdate = self.get_update(name='nethack-2.5.7-1.fc10')
newerupdate.assign_id()
- assert newerupdate.updateid == 'FEDORA-2010-10001'
+ assert newerupdate.updateid == 'FEDORA-2011-10001'
# test updates that were pushed at the same time. assign_id should
# be able to figure out which one has the highest id.
@@ -145,17 +145,17 @@ class TestPackageUpdate(testutil.DBTest):
newest = self.get_update(name='nethack-2.5.8-1.fc10')
newest.assign_id()
- assert newest.updateid == 'FEDORA-2010-10002'
+ assert newest.updateid == 'FEDORA-2011-10002'
@raises(AssertionError) # Ideally, this shouldn't happen, but it does.
def test_duplicate_ids(self):
older = self.get_update(name='nethack-2.5.8-1.fc10')
older.assign_id()
- assert older.updateid == 'FEDORA-2010-0001', older.updateid
+ assert older.updateid == 'FEDORA-2011-0001', older.updateid
newest = self.get_update(name='TurboGears-2.5.8-1.fc10')
newest.assign_id()
- assert newest.updateid == 'FEDORA-2010-0002', newest.updateid
+ assert newest.updateid == 'FEDORA-2011-0002', newest.updateid
# Now, pretend 'older' goes from testing->stable, and the date_pushed changes
older.date_pushed = older.date_pushed + timedelta(days=7)
@@ -163,7 +163,7 @@ class TestPackageUpdate(testutil.DBTest):
up = self.get_update(name='kernel-2.6.9er-1.fc10')
up.status = 'testing'
up.assign_id()
- assert up.updateid == 'FEDORA-2010-1003', up.updateid
+ assert up.updateid == 'FEDORA-2011-1003', up.updateid
def test_epel_id(self):
""" Make sure we can handle id_prefixes that contain dashes. eg: FEDORA-EPEL """
@@ -308,7 +308,7 @@ class TestPackageUpdate(testutil.DBTest):
templates = get_template(update)
assert templates
assert templates[0][0] == u'[SECURITY] Fedora 7 Test Update: TurboGears-1.0.2.2-2.fc7'
- assert templates[0][1] == u'--------------------------------------------------------------------------------\nFedora Test Update Notification\nFEDORA-2010-0001\nNone\n--------------------------------------------------------------------------------\n\nName : TurboGears\nProduct : Fedora 7\nVersion : 1.0.2.2\nRelease : 2.fc7\nURL : turbogears.org\nSummary : summary\nDescription :\ndescription\n\n--------------------------------------------------------------------------------\nUpdate Information:\n\nfoobar\n--------------------------------------------------------------------------------\nReferences:\n\n [ 1 ] Bug #1 - None\n https://bugzilla.redhat.com/show_bug.cgi?id=1\n [ 2 ] CVE-2007-0000\n http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-0000\n--------... update can be installed with the "yum" update program. Use \nsu -c \'yum --enablerepo=updates-testing update TurboGears\' at the command line.\nFor more information, refer to "Managing Software with yum",\navailable at http://docs.fedoraproject.org/yum/.\n\nAll packages are signed with the Fedora Project GPG key. More details on the\nGPG keys used by the Fedora Project can be found at\nhttps://fedoraproject.org/keys\n-------------------------------------...', templates[0][1]
+ assert templates[0][1] == u'--------------------------------------------------------------------------------\nFedora Test Update Notification\nFEDORA-2011-0001\nNone\n--------------------------------------------------------------------------------\n\nName : TurboGears\nProduct : Fedora 7\nVersion : 1.0.2.2\nRelease : 2.fc7\nURL : turbogears.org\nSummary : summary\nDescription :\ndescription\n\n--------------------------------------------------------------------------------\nUpdate Information:\n\nfoobar\n--------------------------------------------------------------------------------\nReferences:\n\n [ 1 ] Bug #1 - None\n https://bugzilla.redhat.com/show_bug.cgi?id=1\n [ 2 ] CVE-2007-0000\n http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-0000\n--------... update can be installed with the "yum" update program. Use \nsu -c \'yum --enablerepo=updates-testing update TurboGears\' at the command line.\nFor more information, refer to "Managing Software with yum",\navailable at http://docs.fedoraproject.org/yum/.\n\nAll packages are signed with the Fedora Project GPG key. More details on the\nGPG keys used by the Fedora Project can be found at\nhttps://fedoraproject.org/keys\n-------------------------------------...', templates[0][1]
def test_latest(self):
update = self.get_update(name='yum-3.2.1-1.fc7')
@@ -627,7 +627,7 @@ class TestPackageUpdate(testutil.DBTest):
templates = get_template(update)
assert templates
assert templates[0][0] == u'[SECURITY] Fedora 7 Test Update: TurboGears-1.0.2.2-2.fc7'
- assert templates[0][1] == u'--------------------------------------------------------------------------------\nFedora Test Update Notification\nFEDORA-2010-0001\nNone\n--------------------------------------------------------------------------------\n\nName : TurboGears\nProduct : Fedora 7\nVersion : 1.0.2.2\nRelease : 2.fc7\nURL : turbogears.org\nSummary : summary\nDescription :\nZ\u2019s\n\n--------------------------------------------------------------------------------\nUpdate Information:\n\nfoobar\n--------------------------------------------------------------------------------\nReferences:\n\n [ 1 ] Bug #1 - None\n https://bugzilla.redhat.com/show_bug.cgi?id=1\n [ 2 ] CVE-2007-0000\n http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-0000\n--------... update can be installed with the "yum" update program. Use \nsu -c \'yum --enablerepo=updates-testing update TurboGears\' at the command line.\nFor more information, refer to "Managing Software with yum",\navailable at http://docs.fedoraproject.org/yum/.\n\nAll packages are signed with the Fedora Project GPG key. More details on the\nGPG keys used by the Fedora Project can be found at\nhttps://fedoraproject.org/keys\n-------------------------------------...'
+ assert templates[0][1] == u'--------------------------------------------------------------------------------\nFedora Test Update Notification\nFEDORA-2011-0001\nNone\n--------------------------------------------------------------------------------\n\nName : TurboGears\nProduct : Fedora 7\nVersion : 1.0.2.2\nRelease : 2.fc7\nURL : turbogears.org\nSummary : summary\nDescription :\nZ\u2019s\n\n--------------------------------------------------------------------------------\nUpdate Information:\n\nfoobar\n--------------------------------------------------------------------------------\nReferences:\n\n [ 1 ] Bug #1 - None\n https://bugzilla.redhat.com/show_bug.cgi?id=1\n [ 2 ] CVE-2007-0000\n http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-0000\n--------... update can be installed with the "yum" update program. Use \nsu -c \'yum --enablerepo=updates-testing update TurboGears\' at the command line.\nFor more information, refer to "Managing Software with yum",\navailable at http://docs.fedoraproject.org/yum/.\n\nAll packages are signed with the Fedora Project GPG key. More details on the\nGPG keys used by the Fedora Project can be found at\nhttps://fedoraproject.org/keys\n-------------------------------------...'
class TestBugzilla(testutil.DBTest):
commit fda01368f0c631caed099905ec6948b6330000d2
Author: Luke Macken <lmacken(a)redhat.com>
Date: Mon Jan 10 14:07:22 2011 -0500
0.7.10
diff --git a/bodhi.spec b/bodhi.spec
index be7c2c2..491ec1b 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.9
+Version: 0.7.10
Release: 1%{?dist}
Summary: A modular framework that facilitates publishing software updates
Group: Applications/Internet
@@ -120,6 +120,9 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py
%changelog
+* Mon Jan 10 2011 Luke Macken <lmacken(a)redhat.com> - 0.7.10-1
+- 0.7.10 release
+
* Fri Sep 10 2010 Luke Macken <lmacken(a)redhat.com> - 0.7.9-1
- 0.7.9 release
diff --git a/bodhi/release.py b/bodhi/release.py
index 8f82ad9..c02bacc 100644
--- a/bodhi/release.py
+++ b/bodhi/release.py
@@ -1,4 +1,4 @@
-VERSION = '0.7.9'
+VERSION = '0.7.10'
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'
13 years, 3 months