bodhi/templates/master.kid | 2 -
bodhi/tests/test_controllers.py | 45 +++++++++++++++++++++++++++++++++++++++-
2 files changed, 45 insertions(+), 2 deletions(-)
New commits:
commit 7d185dad2e5e0050a06d5f1696883f818897a5f3
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Oct 27 15:01:53 2010 -0400
Remove 'All rights reserved' from our copyright notice
diff --git a/bodhi/templates/master.kid b/bodhi/templates/master.kid
index 1c29c22..09cee33 100644
--- a/bodhi/templates/master.kid
+++ b/bodhi/templates/master.kid
@@ -139,7 +139,7 @@ $(document).ready(function() {
<!-- footer BEGIN -->
<div id="fedora-footer">
Bodhi Version: ${version} -- Server: ${hostname}<br/>
- Copyright © 2007-2010 Red Hat, Inc. and others. All Rights
Reserved.<br/>
+ Copyright © 2007-2010 Red Hat, Inc. and others.<br/>
Licensed under the GNU Public License v2 or later.<br />
The Fedora Project is maintained and driven by the community and sponsored by Red
Hat.<br/>This is a community maintained site. Red Hat is not responsible for
content.<br/>
[ <a
href="https://fedoraproject.org/wiki/Legal">Legal</a>,
<a
href="https://fedoraproject.org/wiki/Legal/TrademarkGuidelines"...
Guidelines</a>, <a
href="https://fedorahosted.org/bodhi">Source
Code</a> ]
commit bf13258dfe03baf28fdd1c0f03aa15c61c092b62
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Oct 27 15:01:02 2010 -0400
Add a couple more unit tests
diff --git a/bodhi/tests/test_controllers.py b/bodhi/tests/test_controllers.py
index 0eaec14..f4fbc43 100644
--- a/bodhi/tests/test_controllers.py
+++ b/bodhi/tests/test_controllers.py
@@ -2176,7 +2176,8 @@ class TestControllers(testutil.DBTest):
testutil.create_request('/updates/metrics/?tg_format=json',
method='GET')
response = simplejson.loads(cherrypy.response.body[0])
assert 'F7' in response
- assert response['F7']['TopTestersMetric']['data'] == []
+ print response
+ assert response['F7']['TopTestersMetric']['data'] == [],
response
def test_metrics_html(self):
release = create_release()
@@ -2676,3 +2677,45 @@ class TestControllers(testutil.DBTest):
except SQLObjectNotFound:
pass
+ def test_push_EPEL_critpath_before_tested(self):
+ """
+ Try pushing an epel package to stable after 13 days in testing, which
+ will fail, and then try after 14 days.
+ """
+ session = login()
+ rel = Release(name='EL5', long_name='Fedora EPEL 5',
+ id_prefix='FEDORA-EPEL', dist_tag='dist-5E-epel')
+ params = {
+ 'builds' : 'kernel-2.6.31-1.el5',
+ 'release' : 'Fedora EPEL 5',
+ 'type_' : 'bugfix',
+ 'bugs' : '',
+ 'notes' : '',
+ 'autokarma': True,
+ 'stable_karma' : 1,
+ 'request': 'stable',
+ 'unstable_karma' : -1,
+ }
+ self.save_update(params, session)
+ update = PackageUpdate.byTitle(params['builds'])
+ assert update.request == 'testing', update.request
+
+ update.comment('This update has been pushed to testing',
author='bodhi')
+ update.comments[-1].timestamp -= timedelta(days=13)
+
+ assert update.days_in_testing == 13
+
+ testutil.create_request('/updates/request/stable/%s' %
params['builds'],
+ method='POST', headers=session)
+ update = PackageUpdate.byTitle(params['builds'])
+ assert update.request == 'testing', update.request
+
+ update.comments[-2].timestamp -= timedelta(days=1)
+ assert update.days_in_testing == 14, update.days_in_testing
+
+ testutil.capture_log(['bodhi.controllers', 'bodhi.util',
'bodhi.model'])
+ testutil.create_request('/updates/request/stable/%s' %
params['builds'],
+ method='POST', headers=session)
+ log = testutil.get_log()
+ update = PackageUpdate.byTitle(params['builds'])
+ assert update.request == 'stable', log