On Fri, May 19, 2023 at 08:44:18PM +0530, Ani Sinha wrote:
>
>
> > On 17-May-2023, at 12:23 PM, Ani Sinha <anisi...@redhat.com> wrote:
> >
> > Biosbits avocado tests on gitlab has thus far been disabled because some
> > packages needed by this test was missing in the container images used by
> > gitlab
> > CI. These packages have now been added with the commit:
> >
> > da9000784c90d ("tests/lcitool: Add mtools and xorriso and remove
> > genisoimage as dependencies")
> >
> > Therefore, this change enables bits avocado test on gitlab.
> > At the same time, the bits cleanup code has also been made more robust with
> > this change.
> >
> > Signed-off-by: Ani Sinha <anisi...@redhat.com>
>
> Michael, did you forget to queue this?
Not that I forgot but it takes me time to process new patches.
This came after I started testing the pull.
> > ---
> > tests/avocado/acpi-bits.py | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > Pipeline is green:
> > https://gitlab.com/anisinha/qemu/-/pipelines/869670000
> > bios bits tests passing:
> > https://gitlab.com/anisinha/qemu/-/jobs/4298116787#L189
> >
> > diff --git a/tests/avocado/acpi-bits.py b/tests/avocado/acpi-bits.py
> > index 14038fa3c4..3ed286dcbd 100644
> > --- a/tests/avocado/acpi-bits.py
> > +++ b/tests/avocado/acpi-bits.py
> > @@ -123,9 +123,9 @@ def base_args(self):
> > """return the base argument to QEMU binary"""
> > return self._base_args
> >
> > -@skipIf(not supported_platform() or missing_deps() or
> > os.getenv('GITLAB_CI'),
> > - 'incorrect platform or dependencies (%s) not installed ' \
> > - 'or running on GitLab' % ','.join(deps))
> > +@skipIf(not supported_platform() or missing_deps(),
> > + 'unsupported platform or dependencies (%s) not installed' \
> > + % ','.join(deps))
> > class AcpiBitsTest(QemuBaseTest): #pylint:
> > disable=too-many-instance-attributes
> > """
> > ACPI and SMBIOS tests using biosbits.
> > @@ -356,7 +356,7 @@ def tearDown(self):
> > """
> > if self._vm:
> > self.assertFalse(not self._vm.is_running)
> > - if not os.getenv('BITS_DEBUG'):
> > + if not os.getenv('BITS_DEBUG') and self._workDir:
> > self.logger.info('removing the work directory %s',
> > self._workDir)
> > shutil.rmtree(self._workDir)
> > else:
> > --
> > 2.39.1
> >
