Re: [PATCH] testsuite: Always cleanup gpg agent

[Henning Schild <henning.schild@siemens.com>]

ACK.

Am Tue,  9 May 2023 11:25:08 +0300
schrieb Anton Mikanovich <amikan@ilbers.de>:

> In addition to 1284155a cleanup gpg agent even if test fails.
> 
> Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
> ---
>  testsuite/cibase.py | 28 +++++++++++++++-------------
>  1 file changed, 15 insertions(+), 13 deletions(-)
> 
> diff --git a/testsuite/cibase.py b/testsuite/cibase.py
> index d1543a9b..df8b350e 100755
> --- a/testsuite/cibase.py
> +++ b/testsuite/cibase.py
> @@ -42,24 +42,26 @@ class CIBaseTest(CIBuilder):
>          if result.exit_status:
>              self.fail('GPG import failed')
>  
> -        self.bitbake(targets, **kwargs)
> +        try:
> +            self.bitbake(targets, **kwargs)
>  
> -        self.delete_from_build_dir('tmp')
> -        self.configure(gpg_pub_key=gpg_pub_key if signed else None,
> offline=True, sstate_dir="", **kwargs)
> +            self.delete_from_build_dir('tmp')
> +            self.configure(gpg_pub_key=gpg_pub_key if signed else
> None, offline=True, sstate_dir="", **kwargs) 
> -        self.bitbake(targets, **kwargs)
> +            self.bitbake(targets, **kwargs)
>  
> -        # Disable use of cached base repository
> -        self.unconfigure()
> +            # Disable use of cached base repository
> +            self.unconfigure()
>  
> -        if not signed:
> -            # Try to build with changed configuration with no cleanup
> -            self.configure(**kwargs)
> -            self.bitbake(targets, **kwargs)
> +            if not signed:
> +                # Try to build with changed configuration with no
> cleanup
> +                self.configure(**kwargs)
> +                self.bitbake(targets, **kwargs)
>  
> -        # Cleanup
> -        process.run('gpgconf --kill gpg-agent')
> -        shutil.rmtree(gnupg_home, True)
> +        finally:
> +            # Cleanup
> +            process.run('gpgconf --kill gpg-agent')
> +            shutil.rmtree(gnupg_home, True)
>  
>      def perform_ccache_test(self, targets, **kwargs):
>          def ccache_stats(dir, field):