[apparmor] [patch] test-translations.py: add two button sets used in aa-mergeprof

[Seth Arnold]

On Fri, May 13, 2016 at 11:25:31PM +0200, Christian Boltz wrote:
> Hello,
> 
> $subject ;-)
> 
> 
> [ 80-test-mergeprof-translations.diff ]

Acked-by: Seth Arnold <seth.arnold at canonical.com>

Thanks

> === modified file 'utils/test/test-translations.py'
> --- utils/test/test-translations.py     2016-05-06 20:19:34 +0000
> +++ utils/test/test-translations.py     2016-05-13 21:21:56 +0000
> @@ -30,6 +30,8 @@
>          (['CMD_ix', 'CMD_cx', 'CMD_px', 'CMD_nx', 'CMD_ux', 'CMD_EXEC_IX_ON', 'CMD_DENY', 'CMD_ABORT', 'CMD_FINISHED'],                     True),  # aa.py build_x_functions() without exec_toggle
>          (['CMD_ADDHAT', 'CMD_USEDEFAULT', 'CMD_DENY', 'CMD_ABORT', 'CMD_FINISHED'],                                                         True),  # aa.py handle_children()
>          (['CMD_YES', 'CMD_NO', 'CMD_CANCEL'],                                                                                               True),  # ui.py UI_YesNo() and UI_YesNoCancel
> +        (['CMD_SAVE_CHANGES', 'CMD_VIEW_CHANGES', 'CMD_ABORT', 'CMD_IGNORE_ENTRY'],                                                         True),  # aa-mergeprof act()
> +        (['CMD_ALLOW', 'CMD_ABORT'],                                                                                                        True),  # aa-mergeprof conflict_mode()
>      ]
>  
>      def _run_test(self, params, expected):
> 
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20160513/3fb85380/attachment.pgp>