bodhi/buildsys.py | 10 ---------- bodhi/tests/test_metadata.py | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 20 deletions(-)
New commits: commit 3cf00f878eb4235bccfb45333fee11c2c85225b5 Author: Luke Macken lmacken@redhat.com Date: Mon Aug 9 18:34:59 2010 -0400
Get our metadata tests working again, since they broke when I removed the F7 mash configs :(
diff --git a/bodhi/buildsys.py b/bodhi/buildsys.py index 28dcea8..176e169 100644 --- a/bodhi/buildsys.py +++ b/bodhi/buildsys.py @@ -171,16 +171,6 @@ class DevBuildsys(Buildsystem): 'name': 'dist-f8-updates-testing', 'perm': None, 'perm_id': None}]
def listTagged(self, tag, *args, **kw): - if tag not in ('dist-rawhide', 'dist-fc7', 'dist-fc7-updates-candidate', - 'dist-fc7-updates-testing', 'dist-fc7-updates', - 'dist-f8', 'dist-f8-updates', 'dist-f8-updates-testing', - 'dist-fc8', 'dist-fc8-updates', - 'dist-fc8-updates-testing', 'dist-f8-updates-candidate', - 'dist-f9', 'dist-f9-updates', 'dist-f9-updates-testing', - 'dist-f9-updates-candidate', - 'dist-5E-epel-testing-candidate', 'dist-5E-epel', - 'dist-5E-epel-testing'): - raise koji.GenericError return [self.getBuild(),]
def getLatestBuilds(self, *args, **kw): diff --git a/bodhi/tests/test_metadata.py b/bodhi/tests/test_metadata.py index c0db24d..82ae232 100644 --- a/bodhi/tests/test_metadata.py +++ b/bodhi/tests/test_metadata.py @@ -22,11 +22,11 @@ class TestExtendedMetadata(testutil.DBTest): def test_extended_metadata(self): # grab the name of a build in updates-testing, and create it in our db koji = get_session() - builds = koji.listTagged('dist-fc7-updates-testing', latest=True) + builds = koji.listTagged('dist-f13-updates-testing', latest=True)
# Create all of the necessary database entries - release = Release(name='fc7', long_name='Fedora 7', id_prefix='FEDORA', - dist_tag='dist-fc7') + release = Release(name='F13', long_name='Fedora 13', + id_prefix='FEDORA', dist_tag='dist-f13') package = Package(name=builds[0]['package_name']) update = PackageUpdate(title=builds[0]['nvr'], release=release, @@ -45,7 +45,7 @@ class TestExtendedMetadata(testutil.DBTest): print update
## Initialize our temporary repo - temprepo = join(tempfile.mkdtemp('bodhi'), 'f7-updates-testing') + temprepo = join(tempfile.mkdtemp('bodhi'), 'f13-updates-testing') print "Inserting updateinfo into temprepo: %s" % temprepo mkmetadatadir(join(temprepo, 'i386')) repodata = join(temprepo, 'i386', 'repodata') @@ -62,7 +62,7 @@ class TestExtendedMetadata(testutil.DBTest): ## Read an verify the updateinfo.xml.gz uinfo = UpdateMetadata() uinfo.add(updateinfo) - notice = uinfo.get_notice(('mutt', '1.5.14', '1.fc7')) + notice = uinfo.get_notice(('mutt', '1.5.14', '1.fc13')) assert not notice notice = uinfo.get_notice(get_nvr(update.title)) assert notice @@ -95,11 +95,11 @@ class TestExtendedMetadata(testutil.DBTest): def test_extended_metadata_updating(self): # grab the name of a build in updates-testing, and create it in our db koji = get_session() - builds = koji.listTagged('dist-fc7-updates-testing', latest=True) + builds = koji.listTagged('dist-f13-updates-testing', latest=True)
# Create all of the necessary database entries - release = Release(name='fc7', long_name='Fedora 7', id_prefix='FEDORA', - dist_tag='dist-fc7') + release = Release(name='F13', long_name='Fedora 13', id_prefix='FEDORA', + dist_tag='dist-f13') package = Package(name=builds[0]['package_name']) update = PackageUpdate(title=builds[0]['nvr'], release=release, @@ -135,7 +135,7 @@ class TestExtendedMetadata(testutil.DBTest): ## Read an verify the updateinfo.xml.gz uinfo = UpdateMetadata() uinfo.add(updateinfo) - notice = uinfo.get_notice(('mutt', '1.5.14', '1.fc7')) + notice = uinfo.get_notice(('mutt', '1.5.14', '1.fc13')) assert not notice notice = uinfo.get_notice(get_nvr(update.title)) assert notice @@ -171,7 +171,7 @@ class TestExtendedMetadata(testutil.DBTest): ## Read an verify the updateinfo.xml.gz uinfo = UpdateMetadata() uinfo.add(updateinfo) - notice = uinfo.get_notice(('mutt', '1.5.14', '1.fc7')) + notice = uinfo.get_notice(('mutt', '1.5.14', '1.fc13')) assert not notice notice = uinfo.get_notice(get_nvr(update.title)) assert notice