bodhi/model.py | 4 +++
bodhi/tests/test_model.py | 51 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+)
New commits:
commit 59ea15fa1bf40e31dca3dce0dabbfa87be85f79c
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Feb 23 11:30:41 2010 -0500
Add a bunch of unit tests to validate our release tag properties
diff --git a/bodhi/model.py b/bodhi/model.py
index bd08b4e..014a1f5 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -80,13 +80,13 @@ class Release(SQLObject):
@property
def testing_tag(self):
- if self.release.locked:
+ if self.locked:
return '%s-updates-testing' % self.stable_tag
return '%s-testing' % self.stable_tag
@property
def stable_tag(self):
- if self.release.locked:
+ if self.locked:
return self.dist_tag
if self.name.startswith('EL'): # EPEL Hack.
return self.dist_tag
diff --git a/bodhi/tests/test_model.py b/bodhi/tests/test_model.py
index ff635eb..2ae4fd0 100644
--- a/bodhi/tests/test_model.py
+++ b/bodhi/tests/test_model.py
@@ -535,6 +535,57 @@ class TestPackageUpdate(testutil.DBTest):
log = testutil.get_log()
assert "[old_pending] Nagging foo(a)bar.com about
TurboGears-1.0.2.2-2.fc7" in log
+ def test_pending_tag_property(self):
+ update = self.get_update(name='TurboGears-1.0.2.2-2.fc7')
+ assert update.release.candidate_tag == 'dist-fc7-updates-candidate'
+
+ def test_testing_tag_property(self):
+ update = self.get_update(name='TurboGears-1.0.2.2-2.fc7')
+ assert update.release.testing_tag == 'dist-fc7-updates-testing'
+
+ def test_stable_tag_property(self):
+ update = self.get_update(name='TurboGears-1.0.2.2-2.fc7')
+ assert update.release.stable_tag == 'dist-fc7-updates'
+
+ def test_stable_tag_property_for_pending_release(self):
+ update = self.get_update(name='TurboGears-1.0.2.2-2.fc7')
+ update.release.locked = True
+ assert update.release.stable_tag == 'dist-fc7'
+
+ def test_testing_tag_property_for_pending_release(self):
+ update = self.get_update(name='TurboGears-1.0.2.2-2.fc7')
+ update.release.locked = True
+ assert update.release.testing_tag == 'dist-fc7-updates-testing'
+
+ def test_pending_tag_property_for_pending_release(self):
+ update = self.get_update(name='TurboGears-1.0.2.2-2.fc7')
+ update.release.locked = True
+ assert update.release.candidate_tag == 'dist-fc7-updates-candidate'
+
+ def _get_epel_release(self):
+ rel = Release.select(Release.q.name=='EL5')
+ if rel.count():
+ rel = rel[0]
+ else:
+ rel = Release(name='EL5', long_name='Fedora EPEL 5',
id_prefix='FEDORA-EPEL',
+ dist_tag='dist-5E-epel')
+ return rel
+
+ def test_epel_pending_tag_property(self):
+ update = self.get_update(name='TurboGears-1.0.2.2-2.el5')
+ update.release = self._get_epel_release()
+ assert update.release.candidate_tag == 'dist-5E-epel-testing-candidate'
+
+ def test_epel_testing_tag_property(self):
+ update = self.get_update(name='TurboGears-1.0.2.2-2.el5')
+ update.release = self._get_epel_release()
+ assert update.release.testing_tag == 'dist-5E-epel-testing'
+
+ def test_epel_testing_tag_property(self):
+ update = self.get_update(name='TurboGears-1.0.2.2-2.el5')
+ update.release = self._get_epel_release()
+ assert update.release.stable_tag == 'dist-5E-epel'
+
def test_utf8_email(self):
update = self.get_update(name='TurboGears-1.0.2.2-2.fc7')
bug = self.get_bug()
commit 7e83e9510e4e8005d06f35c1f99dd6c9e0d81e4c
Author: Luke Macken <lmacken(a)redhat.com>
Date: Tue Feb 23 11:09:33 2010 -0500
Tweak our PackageUpdate.{stable,testing}_tag properties to work with pending releases
diff --git a/bodhi/model.py b/bodhi/model.py
index 3444b46..bd08b4e 100644
--- a/bodhi/model.py
+++ b/bodhi/model.py
@@ -80,10 +80,14 @@ class Release(SQLObject):
@property
def testing_tag(self):
+ if self.release.locked:
+ return '%s-updates-testing' % self.stable_tag
return '%s-testing' % self.stable_tag
@property
def stable_tag(self):
+ if self.release.locked:
+ return self.dist_tag
if self.name.startswith('EL'): # EPEL Hack.
return self.dist_tag
else:
Show replies by date