From 8dbf6049bd6611d0f538842c524dfbadb347f44b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= Date: Mon, 5 Jul 2010 13:47:36 +0000 Subject: [PATCH] tests: Correct distro names and versions of example repositories Also set distro name and release in testcases. --- tests/database/testcase.py | 4 ++++ tests/repos/createrepo.py | 12 +++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tests/database/testcase.py b/tests/database/testcase.py index 765b1367..0ed2b409 100644 --- a/tests/database/testcase.py +++ b/tests/database/testcase.py @@ -1,6 +1,7 @@ import unittest import pisi +import pisi.context as ctx class TestCase(unittest.TestCase): @@ -11,6 +12,9 @@ class TestCase(unittest.TestCase): pisi.api.set_options(options) pisi.api.set_comar(False) + ctx.config.values.general.distribution = "Pardus" + ctx.config.values.general.distribution_release = "2007" + if not pisi.api.list_repos(): pisi.api.add_repo("pardus-2007", "repos/pardus-2007-bin/pisi-index.xml.bz2") pisi.api.add_repo("contrib-2007", "repos/contrib-2007-bin/pisi-index.xml.bz2") diff --git a/tests/repos/createrepo.py b/tests/repos/createrepo.py index 93ab17d3..6afe30ad 100755 --- a/tests/repos/createrepo.py +++ b/tests/repos/createrepo.py @@ -86,7 +86,7 @@ def install(): distributionTemplate = """ %(sourcename)s - 1.1 + %(version)s %(description)s Core @@ -170,8 +170,9 @@ class PackageFactory: return pkgs class Repository: - def __init__(self, name, packages, obsoletes): + def __init__(self, name, version, packages, obsoletes): self.name = name + self.version = version self.packages = packages self.obsoletes = obsoletes @@ -180,7 +181,8 @@ class Repository: for obs in self.obsoletes: obsoletes += " %s\n" % obs - return distributionTemplate % {"sourcename":self.name, + return distributionTemplate % {"sourcename": "Pardus", + "version": self.version, "description":self.name, "obsoletes":obsoletes} @@ -216,7 +218,7 @@ class Repository: class Pardus2007Repo(Repository): def __init__(self): - Repository.__init__(self, "pardus-2007", [], ["wengophone", "rar"]) + Repository.__init__(self, "pardus-2007", "2007", [], ["wengophone", "rar"]) def create(self): @@ -245,7 +247,7 @@ class Pardus2007Repo(Repository): class Contrib2007Repo(Repository): def __init__(self): - Repository.__init__(self, "contrib-2007", [], ["xara"]) + Repository.__init__(self, "contrib-2007", "2007", [], ["xara"]) def create(self):