From ec555f1a99a03ff19c5268483d1e67cad9ba5d77 Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Wed, 25 Aug 2021 18:42:40 +0000 Subject: Apply pylint to scripts/construct_context*.py 1. Run pyformat scripts/construct_context.py -s 4 --force_quote_type none -i to fix formatting 2. Wrap #pylint: [disable|enable]=line-too-long in tests Test: m construct_context construct_context_test Test: pylint --rcfile tools/repohooks/tools/pylintrc build/soong/scripts/construct_context.py build/soong/scripts/construct_context_test.py Bug: 195738175 Change-Id: I2e756b17aae3e70ddaa03356c78f1f2f85c0f6a5 --- scripts/construct_context_test.py | 90 ++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 40 deletions(-) (limited to 'scripts/construct_context_test.py') diff --git a/scripts/construct_context_test.py b/scripts/construct_context_test.py index 3b05f9013..2ff5ac54a 100755 --- a/scripts/construct_context_test.py +++ b/scripts/construct_context_test.py @@ -23,53 +23,63 @@ import construct_context as cc sys.dont_write_bytecode = True + def construct_contexts(arglist): - args = cc.parse_args(arglist) - return cc.construct_contexts(args) + args = cc.parse_args(arglist) + return cc.construct_contexts(args) + contexts = [ - '--host-context-for-sdk', '28', 'PCL[out/zdir/z.jar]', - '--target-context-for-sdk', '28', 'PCL[/system/z.jar]', - '--host-context-for-sdk', '29', 'PCL[out/xdir/x.jar]#PCL[out/ydir/y.jar]', - '--target-context-for-sdk', '29', 'PCL[/system/x.jar]#PCL[/product/y.jar]', - '--host-context-for-sdk', 'any', 'PCL[out/adir/a.jar]#PCL[out/bdir/b.jar]', - '--target-context-for-sdk', 'any', 'PCL[/system/a.jar]#PCL[/product/b.jar]', + '--host-context-for-sdk', + '28', + 'PCL[out/zdir/z.jar]', + '--target-context-for-sdk', + '28', + 'PCL[/system/z.jar]', + '--host-context-for-sdk', + '29', + 'PCL[out/xdir/x.jar]#PCL[out/ydir/y.jar]', + '--target-context-for-sdk', + '29', + 'PCL[/system/x.jar]#PCL[/product/y.jar]', + '--host-context-for-sdk', + 'any', + 'PCL[out/adir/a.jar]#PCL[out/bdir/b.jar]', + '--target-context-for-sdk', + 'any', + 'PCL[/system/a.jar]#PCL[/product/b.jar]', ] +#pylint: disable=line-too-long class ConstructContextTest(unittest.TestCase): - def test_construct_context_28(self): - args = ['--target-sdk-version', '28'] + contexts - result = construct_contexts(args) - expect = ('class_loader_context_arg=--class-loader-context=PCL[]{PCL[out/xdir/x.jar]' - '#PCL[out/ydir/y.jar]' - '#PCL[out/adir/a.jar]' - '#PCL[out/bdir/b.jar]}' - ' ; ' - 'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{PCL[/system/x.jar]' - '#PCL[/product/y.jar]' - '#PCL[/system/a.jar]' - '#PCL[/product/b.jar]}') - self.assertEqual(result, expect) - def test_construct_context_29(self): - args = ['--target-sdk-version', '29'] + contexts - result = construct_contexts(args) - expect = ('class_loader_context_arg=--class-loader-context=PCL[]{PCL[out/adir/a.jar]' - '#PCL[out/bdir/b.jar]}' - ' ; ' - 'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{PCL[/system/a.jar]' - '#PCL[/product/b.jar]}') - self.assertEqual(result, expect) + def test_construct_context_28(self): + args = ['--target-sdk-version', '28'] + contexts + result = construct_contexts(args) + expect = ( + 'class_loader_context_arg=--class-loader-context=PCL[]{PCL[out/xdir/x.jar]#PCL[out/ydir/y.jar]#PCL[out/adir/a.jar]#PCL[out/bdir/b.jar]}' + ' ; ' + 'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{PCL[/system/x.jar]#PCL[/product/y.jar]#PCL[/system/a.jar]#PCL[/product/b.jar]}') + self.assertEqual(result, expect) + + def test_construct_context_29(self): + args = ['--target-sdk-version', '29'] + contexts + result = construct_contexts(args) + expect = ( + 'class_loader_context_arg=--class-loader-context=PCL[]{PCL[out/adir/a.jar]#PCL[out/bdir/b.jar]}' + ' ; ' + 'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{PCL[/system/a.jar]#PCL[/product/b.jar]}') + self.assertEqual(result, expect) - def test_construct_context_S(self): - args = ['--target-sdk-version', 'S'] + contexts - result = construct_contexts(args) - expect = ('class_loader_context_arg=--class-loader-context=PCL[]{PCL[out/adir/a.jar]' - '#PCL[out/bdir/b.jar]}' - ' ; ' - 'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{PCL[/system/a.jar]' - '#PCL[/product/b.jar]}') - self.assertEqual(result, expect) + def test_construct_context_S(self): + args = ['--target-sdk-version', 'S'] + contexts + result = construct_contexts(args) + expect = ( + 'class_loader_context_arg=--class-loader-context=PCL[]{PCL[out/adir/a.jar]#PCL[out/bdir/b.jar]}' + ' ; ' + 'stored_class_loader_context_arg=--stored-class-loader-context=PCL[]{PCL[/system/a.jar]#PCL[/product/b.jar]}') + self.assertEqual(result, expect) +#pylint: enable=line-too-long if __name__ == '__main__': - unittest.main(verbosity=2) + unittest.main(verbosity=2) -- cgit v1.2.3-59-g8ed1b