diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-10-15 05:01:22 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-10-15 05:01:22 -0700 |
| commit | 800cac59556d78af8a96c9bd266d33bb28ee9c0c (patch) | |
| tree | 0a2a23e8a3622131a99eca613aa786f68ce3337d /pym/portage/tests/dep | |
| parent | 9f84ff11ed1a3f1ac74701fde1f20aecd35e1c8f (diff) | |
| download | portage-800cac59556d78af8a96c9bd266d33bb28ee9c0c.tar.gz portage-800cac59556d78af8a96c9bd266d33bb28ee9c0c.tar.bz2 portage-800cac59556d78af8a96c9bd266d33bb28ee9c0c.zip | |
use_reduce: Another fix for bug 340973.
Diffstat (limited to 'pym/portage/tests/dep')
| -rw-r--r-- | pym/portage/tests/dep/test_use_reduce.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/pym/portage/tests/dep/test_use_reduce.py b/pym/portage/tests/dep/test_use_reduce.py index 44f9fd710..f7e9b1012 100644 --- a/pym/portage/tests/dep/test_use_reduce.py +++ b/pym/portage/tests/dep/test_use_reduce.py @@ -317,12 +317,16 @@ class UseReduce(TestCase): "A || ( B C )", opconvert = True, expected_result = ['A', ['||', 'B', 'C']]), - # ['A', ['||', 'B', '||', 'C', 'D', 'E'], 'G'] != ['A', ['||', 'B', 'C', 'D', 'E'], 'G'] - #UseReduceTestCase( - # "A foo? ( || ( B || ( bar? ( || ( C D E ) ) !bar? ( F ) ) ) ) G", - # uselist = ["foo", "bar"], - # opconvert = True, - # expected_result = ['A', ['||', 'B', 'C', 'D', 'E'], 'G']), + UseReduceTestCase( + "A foo? ( || ( B || ( bar? ( || ( C D E ) ) !bar? ( F ) ) ) ) G", + uselist = ["foo", "bar"], + opconvert = True, + expected_result = ['A', ['||', 'B', ['||', 'C', 'D', 'E']], 'G']), + UseReduceTestCase( + "A foo? ( || ( B || ( bar? ( || ( C D E ) ) !bar? ( F ) ) ) ) G", + uselist = ["foo", "bar"], + opconvert = False, + expected_result = ['A', '||', ['B', 'C', 'D', 'E'], 'G']), UseReduceTestCase( "|| ( A )", @@ -366,13 +370,13 @@ class UseReduce(TestCase): "|| ( foo? ( || ( A B ) ) )", uselist = ["foo"], opconvert = True, - expected_result = ["||", "A", "B"]), + expected_result = [['||', 'A', 'B']]), UseReduceTestCase( "|| ( ( A B ) foo? ( || ( C D ) ) )", uselist = ["foo"], opconvert = True, - expected_result = [['||', ['A', 'B'], '||', 'C', 'D']]), + expected_result = [['||', ['A', 'B'], ['||', 'C', 'D']]]), UseReduceTestCase( "|| ( ( A B ) foo? ( || ( C D ) ) )", |