diff options
| author |   Sebastian Luther <SebastianLuther@gmx.de> | 2010-08-14 08:43:34 +0200 |
|---|---|---|
| committer |   Zac Medico <zmedico@gentoo.org> | 2010-08-13 23:51:35 -0700 |
| commit | 1e69471d3eac6d0e2a01878ed3f0031783f57671 (patch) | |
| tree | 2bdca931d8285942adfd5f7d1cb6022387004ba7 /pym/portage/tests/dep/testAtom.py | |
| parent | Add a SIGUSR1 handling to trigger pdb.set_trace(). (diff) | |
| download | portage-1e69471d3eac6d0e2a01878ed3f0031783f57671.tar.gz portage-1e69471d3eac6d0e2a01878ed3f0031783f57671.tar.bz2 portage-1e69471d3eac6d0e2a01878ed3f0031783f57671.zip | |
Atom.violated_conditionals: Use iuse.is_valid_flag instead of iuse.all
Diffstat (limited to 'pym/portage/tests/dep/testAtom.py')
| -rw-r--r-- | pym/portage/tests/dep/testAtom.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pym/portage/tests/dep/testAtom.py b/pym/portage/tests/dep/testAtom.py index fecf2bfa0..650e5c332 100644 --- a/pym/portage/tests/dep/testAtom.py +++ b/pym/portage/tests/dep/testAtom.py @@ -197,10 +197,18 @@ class TestAtom(TestCase): test_cases_xfail = ( ("dev-libs/A[a,b=,!c=,d?,!e?,-f]", [], ["a", "b", "c", "d", "e", "f"], None), ) - + + class use_flag_validator(object): + def __init__(self, iuse): + self.iuse = iuse + + def is_valid_flag(self, flag): + return flag in iuse + for atom, other_use, iuse, parent_use, expected_violated_atom in test_cases: a = Atom(atom) - violated_atom = a.violated_conditionals(other_use, iuse, parent_use) + validator = use_flag_validator(iuse) + violated_atom = a.violated_conditionals(other_use, validator.is_valid_flag, parent_use) if parent_use is None: fail_msg = "Atom: %s, other_use: %s, iuse: %s, parent_use: %s, got: %s, expected: %s" % \ (atom, " ".join(other_use), " ".join(iuse), "None", str(violated_atom), expected_violated_atom) @@ -211,8 +219,9 @@ class TestAtom(TestCase): for atom, other_use, iuse, parent_use in test_cases_xfail: a = Atom(atom) + validator = use_flag_validator(iuse) self.assertRaisesMsg(atom, InvalidAtom, \ - a.violated_conditionals, other_use, iuse, parent_use) + a.violated_conditionals, other_use, validator.is_valid_flag, parent_use) def test_evaluate_conditionals(self): test_cases = ( |