diff options
Diffstat (limited to 'src/tinderbox/test/TinderboxTest.py')
| -rw-r--r-- | src/tinderbox/test/TinderboxTest.py | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/tinderbox/test/TinderboxTest.py b/src/tinderbox/test/TinderboxTest.py index 11b26f9..d06b8c1 100644 --- a/src/tinderbox/test/TinderboxTest.py +++ b/src/tinderbox/test/TinderboxTest.py @@ -13,7 +13,7 @@ class TinderboxTest(unittest.TestCase): self.trees = portage.create_trees() self.portapi = self.trees[portage.root]["porttree"].dbapi self.portset = portage.config(clone=portage.settings) - self.pkgs = ['dev-db/hsqldb-1.8.0.9-r1','app-shells/bash-3.2_p39','sys-apps/portage-2.1.4.5'] + self.pkgs = ['dev-db/hsqldb-1.8.0.10','app-shells/bash-3.2_p39','sys-apps/portage-2.1.4.5'] def testCreateDepGroups(self): settings = self.portset @@ -27,9 +27,22 @@ class TinderboxTest(unittest.TestCase): use_deps = portage.dep.use_reduce(deps, list(use_enabled & iuse)) use_deps = self.tb._normalize_dependencies(use_deps) - use_deps = flatten_deps(use_deps) - print self.tb.create_dep_groups(use_deps) + self.tb.create_dep_groups(use_deps) + + def testNormalizeDeps(self): + settings = self.portset + portapi = self.portapi + for pkg in self.pkgs: + deps = portapi.aux_get(pkg, ["DEPEND"]) + deps = portage.dep.paren_reduce(deps[0]) + settings.setcpv(pkg, mydb=self.portapi) + use_enabled = set(settings["PORTAGE_USE"].split()) + iuse = set(settings["IUSE"].split()) + use_deps = portage.dep.use_reduce(deps, list(use_enabled & iuse)) + use_deps = self.tb._normalize_dependencies(use_deps) + for dep in use_deps: + self.assertTrue(portage.dep.isvalidatom(dep)) |