bodhi/mail.py | 6 +++---
bodhi/tests/test_model.py | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit cd3c755ae9402ffe630ca5d8c16111e5a2e1725f
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Jan 27 09:09:06 2010 -0500
Update some unit tests for the new URLs
diff --git a/bodhi/tests/test_model.py b/bodhi/tests/test_model.py
index c84fcaa..baa63c8 100644
--- a/bodhi/tests/test_model.py
+++ b/bodhi/tests/test_model.py
@@ -288,7 +288,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\nhttp://fedoraproject.org/keys\n--------------------------------------...;,
templates[0][1]
+ 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]
def test_latest(self):
update = self.get_update(name='yum-3.2.1-1.fc7')
@@ -548,7 +548,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\nhttp://fedoraproject.org/keys\n--------------------------------------...
+ 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-------------------------------------...
class TestBugzilla(testutil.DBTest):
commit 520f66a34b6e2ca64d82f9f7ebc21d73d2c682ec
Author: Luke Macken <lmacken(a)redhat.com>
Date: Wed Jan 27 09:07:11 2010 -0500
Apply a patch from Till Maas to s/http/https/ some of our URLs (#256)
diff --git a/bodhi/mail.py b/bodhi/mail.py
index 83ac27d..78a83a8 100644
--- a/bodhi/mail.py
+++ b/bodhi/mail.py
@@ -194,7 +194,7 @@ for more than 2 weeks if you deem it necessary.
You can submit this update to be pushed to the stable repository by going to
the following URL:
-
http://admin.fedoraproject.org/updates/request/stable/%(package)s
+
https://admin.fedoraproject.org/updates/request/stable/%(package)s
or by running the following command with the bodhi-client:
@@ -218,7 +218,7 @@ or by running the following command with the bodhi-client:
To approve this update and request that it be pushed to stable, you can use
the link below:
-
http://admin.fedoraproject.org/updates/approve/%(package)s
+
https://admin.fedoraproject.org/updates/approve/%(package)s
""",
'fields' : lambda x: {
'package' : x.title,
@@ -267,7 +267,7 @@ available at
http://docs.fedoraproject.org/yum/.
All packages are signed with the Fedora Project GPG key. More details on the
GPG keys used by the Fedora Project can be found at
-http://fedoraproject.org/keys
+https://fedoraproject.org/keys
--------------------------------------------------------------------------------
"""