diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-10-15 10:11:00 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-10-15 01:17:11 -0700 |
| commit | 4795d80fa995e90a79584ca258981444f8e39499 (patch) | |
| tree | 8cd78f49ac7d2fa6a532e7790fa5caf538d386b5 /pym/portage/tests/dep | |
| parent | eb3607540a3b88ec2148e84d87edd487901e4b9b (diff) | |
| download | portage-4795d80fa995e90a79584ca258981444f8e39499.tar.gz portage-4795d80fa995e90a79584ca258981444f8e39499.tar.bz2 portage-4795d80fa995e90a79584ca258981444f8e39499.zip | |
use_reduce: Fully reduce complex || constructs.
This will fix bug 340973.
Diffstat (limited to 'pym/portage/tests/dep')
| -rw-r--r-- | pym/portage/tests/dep/test_use_reduce.py | 100 |
1 files changed, 74 insertions, 26 deletions
diff --git a/pym/portage/tests/dep/test_use_reduce.py b/pym/portage/tests/dep/test_use_reduce.py index 05c580646..83735e1fd 100644 --- a/pym/portage/tests/dep/test_use_reduce.py +++ b/pym/portage/tests/dep/test_use_reduce.py @@ -180,13 +180,13 @@ class UseReduce(TestCase): expected_result = [ "||", [ ["A", "B"], "C"] ]), UseReduceTestCase( "|| ( A || ( B C ) )", - expected_result = [ "||", ["A", "||", ["B", "C"]]]), + expected_result = [ "||", ["A", "B", "C"]]), UseReduceTestCase( "|| ( A || ( B C D ) )", - expected_result = [ "||", ["A", "||", ["B", "C", "D"]] ]), + expected_result = [ "||", ["A", "B", "C", "D"] ]), UseReduceTestCase( "|| ( A || ( B || ( C D ) E ) )", - expected_result = [ "||", ["A", "||", ["B", "||", ["C", "D"], "E"]] ]), + expected_result = [ "||", ["A", "B", "C", "D", "E"] ]), UseReduceTestCase( "( || ( ( ( A ) B ) ) )", expected_result = ["A", "B"] ), @@ -276,22 +276,22 @@ class UseReduce(TestCase): UseReduceTestCase( "|| ( A B )", opconvert = True, - expected_result = [ ["||", "A", "B"] ]), + expected_result = ["||", "A", "B"]), UseReduceTestCase( "|| ( ( A B ) C )", opconvert = True, - expected_result = [ [ "||", ["A", "B"], "C" ] ]), + expected_result = [ "||", ["A", "B"], "C" ]), UseReduceTestCase( "|| ( A || ( B C ) )", opconvert = True, - expected_result = [ ["||", "A", ["||", "B", "C"]] ]), + expected_result = ["||", "A", "B", "C"]), UseReduceTestCase( "|| ( A || ( B C D ) )", opconvert = True, - expected_result = [ ["||", "A", ["||", "B", "C", "D"]] ]), + expected_result = ["||", "A", "B", "C", "D"]), UseReduceTestCase( "|| ( A || ( B || ( C D ) E ) )", - expected_result = [ "||", ["A", "||", ["B", "||", ["C", "D"], "E"]] ]), + expected_result = [ "||", ["A", "B", "C", "D", "E"] ]), UseReduceTestCase( "( || ( ( ( A ) B ) ) )", opconvert = True, @@ -348,24 +348,72 @@ class UseReduce(TestCase): opconvert = True, expected_result = ["||", "A", "B"]), - # [['||', ['A', 'B'], '||', 'C', 'D']] != ['||', ['A', 'B'], 'C', 'D'] - #UseReduceTestCase( - # "|| ( ( A B ) foo? ( || ( C D ) ) )", - # uselist = ["foo"], - # opconvert = True, - # expected_result = ['||', ['A', 'B'], 'C', 'D']), - - # ['||', [['A', 'B'], '||', ['C', 'D']]] != ['||', [['A', 'B'], 'C', 'D']] - #UseReduceTestCase( - # "|| ( ( A B ) foo? ( || ( C D ) ) )", - # uselist = ["foo"], - # opconvert = False, - # expected_result = ['||', [['A', 'B'], 'C', 'D']]), - - # ['||', [['A', 'B'], '||', ['C', 'D']]] != ['||', [['A', 'B'], 'C', 'D']] - #UseReduceTestCase( - # "|| ( ( A B ) || ( C D ) )", - # expected_result = ['||', [['A', 'B'], 'C', 'D']]), + UseReduceTestCase( + "|| ( ( A B ) foo? ( || ( C D ) ) )", + uselist = ["foo"], + opconvert = True, + expected_result = ['||', ['A', 'B'], 'C', 'D']), + + UseReduceTestCase( + "|| ( ( A B ) foo? ( || ( C D ) ) )", + uselist = ["foo"], + opconvert = False, + expected_result = ['||', [['A', 'B'], 'C', 'D']]), + + UseReduceTestCase( + "|| ( ( A B ) || ( C D ) )", + expected_result = ['||', [['A', 'B'], 'C', 'D']]), + + UseReduceTestCase( + "|| ( ( A B ) || ( C D || ( E ( F G ) || ( H ) ) ) )", + expected_result = ['||', [['A', 'B'], 'C', 'D', 'E', ['F', 'G'], 'H']]), + + UseReduceTestCase( + "|| ( foo? ( A B ) )", + uselist = ["foo"], + expected_result = ['A', 'B']), + + UseReduceTestCase( + "|| ( || ( foo? ( A B ) ) )", + uselist = ["foo"], + expected_result = ['A', 'B']), + + UseReduceTestCase( + "|| ( || ( || ( a? ( b? ( c? ( || ( || ( || ( d? ( e? ( f? ( A B ) ) ) ) ) ) ) ) ) ) ) )", + uselist = ["a", "b", "c", "d", "e", "f"], + expected_result = ['A', 'B']), + + UseReduceTestCase( + "|| ( || ( ( || ( a? ( ( b? ( c? ( || ( || ( || ( ( d? ( e? ( f? ( A B ) ) ) ) ) ) ) ) ) ) ) ) ) ) )", + uselist = ["a", "b", "c", "d", "e", "f"], + expected_result = ['A', 'B']), + + UseReduceTestCase( + "|| ( ( A ( || ( B ) ) ) )", + expected_result = ['A', 'B']), + + UseReduceTestCase( + "|| ( ( A B ) || ( foo? ( bar? ( ( C D || ( baz? ( E ) ( F G ) || ( H ) ) ) ) ) ) )", + uselist = ["foo", "bar", "baz"], + expected_result = ['||', [['A', 'B'], 'C', 'D', '||', ['E', ['F', 'G'], 'H']]]), + + UseReduceTestCase( + "|| ( foo? ( A B ) )", + uselist = ["foo"], + opconvert=True, + expected_result = ['A', 'B']), + + UseReduceTestCase( + "|| ( || ( foo? ( A B ) ) )", + uselist = ["foo"], + opconvert=True, + expected_result = ['A', 'B']), + + UseReduceTestCase( + "|| ( || ( || ( a? ( b? ( c? ( || ( || ( || ( d? ( e? ( f? ( A B ) ) ) ) ) ) ) ) ) ) ) )", + uselist = ["a", "b", "c", "d", "e", "f"], + opconvert=True, + expected_result = ['A', 'B']), #flat test UseReduceTestCase( |