[apparmor] [patch] test new parameters of write_header()

Steve Beattie steve at nxnw.org
Wed Apr 1 22:40:16 UTC 2015


On Sun, Mar 15, 2015 at 08:21:57PM +0100, Christian Boltz wrote:
> Am Samstag, 14. März 2015 schrieb Christian Boltz:
> > this patch changes the write_header tests so that the
> > 'profile_keyword' and 'header_comment' parameters can be (and are)
> > tested:
> > - add a None for both to the existing tests
> > - add some tests that come with the profile keyword and/or a comment
> 
> Here's v2, adopted to the whitespace-handling changes in patch 18.
> 
> 
> [ 20-write-header-test-new-parameters.diff ]

Acked-by: Steve Beattie <steve at nxnw.org>

> === modified file utils/test/test-aa.py
> --- utils/test/test-aa.py       2015-03-14 02:16:34.770280565 +0100
> +++ utils/test/test-aa.py       2015-03-14 02:15:39.268573693 +0100
> @@ -309,26 +309,32 @@
>  
>  class AaTest_write_header(AATest):
>      tests = [
> -        # name       embedded_hat    write_flags    depth   flags           attachment      expected
> -        (['/foo',    False,          True,          1,      'complain',     None        ],  '  /foo flags=(complain) {'),
> -        (['/foo',    True,           True,          1,      'complain',     None        ],  '  profile /foo flags=(complain) {'),
> -        (['/foo sp', False,          False,         2,      'complain',     None        ],  '    "/foo sp" {'),
> -        (['/foo'    ,False,          False,         2,      'complain',     None        ],  '    /foo {'),
> -        (['/foo',    True,           False,         2,      'complain',     None        ],  '    profile /foo {'),
> -        (['/foo',    False,          True,          0,      None,           None        ],  '/foo {'),
> -        (['/foo',    True,           True,          0,      None,           None        ],  'profile /foo {'),
> -        (['/foo',    False,          False,         0,      None,           None        ],  '/foo {'),
> -        (['/foo',    True,           False,         0,      None,           None        ],  'profile /foo {'),
> -        (['bar',     False,          True,          1,      'complain',     None,       ],  '  profile bar flags=(complain) {'),
> -        (['bar',     False,          True,          1,      'complain',     '/foo'      ],  '  profile bar /foo flags=(complain) {'),
> -        (['bar',     True,           True,          1,      'complain',     '/foo'      ],  '  profile bar /foo flags=(complain) {'),
> -        (['bar baz', False,          True,          1,      None,           '/foo'      ],  '  profile "bar baz" /foo {'),
> -        (['bar',     True,           True,          1,      None,           '/foo'      ],  '  profile bar /foo {'),
> -        (['bar baz', False,          True,          1,      'complain',     '/foo sp'   ],  '  profile "bar baz" "/foo sp" flags=(complain) {'),
> -        (['^foo',    False,          True,          1,      'complain',     None        ],  '  profile ^foo flags=(complain) {'),
> -        (['^foo',    True,           True,          1,      'complain',     None        ],  '  ^foo flags=(complain) {'),
> -        (['^foo',    True,           True,          1.5,    'complain',     None        ],  '   ^foo flags=(complain) {'),
> -        (['^foo',    True,           True,          1.3,    'complain',     None        ],  '  ^foo flags=(complain) {'),
> +        # name       embedded_hat    write_flags    depth   flags           attachment  prof.keyw.  comment    expected
> +        (['/foo',    False,          True,          1,      'complain',     None,       None,       None    ],  '  /foo flags=(complain) {'),
> +        (['/foo',    True,           True,          1,      'complain',     None,       None,       None    ],  '  profile /foo flags=(complain) {'),
> +        (['/foo sp', False,          False,         2,      'complain',     None,       None,       None    ],  '    "/foo sp" {'),
> +        (['/foo'    ,False,          False,         2,      'complain',     None,       None,       None    ],  '    /foo {'),
> +        (['/foo',    True,           False,         2,      'complain',     None,       None,       None    ],  '    profile /foo {'),
> +        (['/foo',    False,          True,          0,      None,           None,       None,       None    ],  '/foo {'),
> +        (['/foo',    True,           True,          0,      None,           None,       None,       None    ],  'profile /foo {'),
> +        (['/foo',    False,          False,         0,      None,           None,       None,       None    ],  '/foo {'),
> +        (['/foo',    True,           False,         0,      None,           None,       None,       None    ],  'profile /foo {'),
> +        (['bar',     False,          True,          1,      'complain',     None,       None,       None    ],  '  profile bar flags=(complain) {'),
> +        (['bar',     False,          True,          1,      'complain',     '/foo',     None,       None    ],  '  profile bar /foo flags=(complain) {'),
> +        (['bar',     True,           True,          1,      'complain',     '/foo',     None,       None    ],  '  profile bar /foo flags=(complain) {'),
> +        (['bar baz', False,          True,          1,      None,           '/foo',     None,       None    ],  '  profile "bar baz" /foo {'),
> +        (['bar',     True,           True,          1,      None,           '/foo',     None,       None    ],  '  profile bar /foo {'),
> +        (['bar baz', False,          True,          1,      'complain',     '/foo sp',  None,       None    ],  '  profile "bar baz" "/foo sp" flags=(complain) {'),
> +        (['^foo',    False,          True,          1,      'complain',     None,       None,       None    ],  '  profile ^foo flags=(complain) {'),
> +        (['^foo',    True,           True,          1,      'complain',     None,       None,       None    ],  '  ^foo flags=(complain) {'),
> +        (['^foo',    True,           True,          1.5,    'complain',     None,       None,       None    ],  '   ^foo flags=(complain) {'),
> +        (['^foo',    True,           True,          1.3,    'complain',     None,       None,       None    ],  '  ^foo flags=(complain) {'),
> +        (['/foo',    False,          True,          1,      'complain',     None,       'profile',  None    ],  '  profile /foo flags=(complain) {'),
> +        (['/foo',    True,           True,          1,      'complain',     None,       'profile',  None    ],  '  profile /foo flags=(complain) {'),
> +        (['/foo',    False,          True,          1,      'complain',     None,       None,       '# x'   ],  '  /foo flags=(complain) { # x'),
> +        (['/foo',    True,           True,          1,      None,           None,       None,       '# x'   ],  '  profile /foo { # x'),
> +        (['/foo',    False,          True,          1,      None,           None,       'profile',  '# x'   ],  '  profile /foo { # x'),
> +        (['/foo',    True,           True,          1,      'complain',     None,       'profile',  '# x'   ],  '  profile /foo flags=(complain) { # x'),
>       ]
>  
>      def _run_test(self, params, expected):
> @@ -335,7 +341,7 @@
>          embedded_hat = params[1]
>          write_flags = params[2]
>          depth = params[3]
> -        prof_data = { 'flags': params[4], 'attachment': params[5], 'profile_keyword': None, 'header_comment': None }
> +        prof_data = { 'flags': params[4], 'attachment': params[5], 'profile_keyword': params[6], 'header_comment': params[7] }
>  
>          result = write_header(prof_data, depth, name, embedded_hat, write_flags)
>          self.assertEqual(result, [expected])
> 
> 
> 
> 
> 
> Regards,
> 
> Christian Boltz
> -- 
> Das hier ist eine Anfängerliste.
> Ich will Dir auch erklären warum:
> Den 'Linux Profi' gibt es IMHO nicht.
> [Bernd Obermayr in suse-linux]
> 
> 
> -- 
> AppArmor mailing list
> AppArmor at lists.ubuntu.com
> Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor

-- 
Steve Beattie
<sbeattie at ubuntu.com>
http://NxNW.org/~steve/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20150401/d18dee83/attachment.pgp>


More information about the AppArmor mailing list