| Message ID | 20221111085221.1216196-1-ani@anisinha.ca (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | acpi/tests/avocado/bits: some misc fixes and spelling corrections | expand |
On 11/11/2022 09.52, Ani Sinha wrote: > Most of the changes are cosmetic. The bits test timeout has now been increased > to 90 seconds in order to accommodate slower systems and fewer unnecessary > failures. One spelling correction in docs along with removal of the reference > to non-existent README file. > > CC: Thomas Huth <thuth@redhat.com> > CC: qemu-trivial@nongnu.org > Signed-off-by: Ani Sinha <ani@anisinha.ca> > --- > docs/devel/acpi-bits.rst | 3 +-- > tests/avocado/acpi-bits.py | 5 +++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/docs/devel/acpi-bits.rst b/docs/devel/acpi-bits.rst > index c9564d871a..a9020adb2d 100644 > --- a/docs/devel/acpi-bits.rst > +++ b/docs/devel/acpi-bits.rst > @@ -41,7 +41,6 @@ Under ``tests/avocado/`` as the root we have: > │ │ ├── smbios.py2 > │ │ ├── testacpi.py2 > │ │ └── testcpuid.py2 That leaves the second "|" dangling around ... should those second pipe characters now be removed, too? > - │ └── README > ├── acpi-bits.py > > * ``tests/avocado``: > @@ -132,7 +131,7 @@ Under ``tests/avocado/`` as the root we have: > > (a) They are python2.7 based scripts and not python 3 scripts. > (b) They are run from within the bios bits VM and is not subjected to QEMU > - build/test python script maintainance and dependency resolutions. > + build/test python script maintenance and dependency resolutions. FWIW, this will also be fixed by Stefan Weil's current pending doc update patch. > (c) They need not be loaded by avocado framework when running tests. > > > diff --git a/tests/avocado/acpi-bits.py b/tests/avocado/acpi-bits.py > index 8745a58a76..5ebe8c14a2 100644 > --- a/tests/avocado/acpi-bits.py > +++ b/tests/avocado/acpi-bits.py > @@ -385,8 +385,9 @@ def test_acpi_smbios_bits(self): > self._vm.launch() > # biosbits has been configured to run all the specified test suites > # in batch mode and then automatically initiate a vm shutdown. > - # sleep for maximum of one minute > - max_sleep_time = time.monotonic() + 60 > + # sleep for maximum of a minute and a half to accomomodate even slower s/accomomodate/accomodate/ > + # test setups. > + max_sleep_time = time.monotonic() + 90 > while self._vm.is_running() and time.monotonic() < max_sleep_time: > time.sleep(1) > Thomas
On Fri, Nov 11, 2022 at 2:36 PM Thomas Huth <thuth@redhat.com> wrote: > > On 11/11/2022 09.52, Ani Sinha wrote: > > Most of the changes are cosmetic. The bits test timeout has now been increased > > to 90 seconds in order to accommodate slower systems and fewer unnecessary > > failures. One spelling correction in docs along with removal of the reference > > to non-existent README file. > > > > CC: Thomas Huth <thuth@redhat.com> > > CC: qemu-trivial@nongnu.org > > Signed-off-by: Ani Sinha <ani@anisinha.ca> > > --- > > docs/devel/acpi-bits.rst | 3 +-- > > tests/avocado/acpi-bits.py | 5 +++-- > > 2 files changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/docs/devel/acpi-bits.rst b/docs/devel/acpi-bits.rst > > index c9564d871a..a9020adb2d 100644 > > --- a/docs/devel/acpi-bits.rst > > +++ b/docs/devel/acpi-bits.rst > > @@ -41,7 +41,6 @@ Under ``tests/avocado/`` as the root we have: > > │ │ ├── smbios.py2 > > │ │ ├── testacpi.py2 > > │ │ └── testcpuid.py2 > > That leaves the second "|" dangling around ... should those second pipe > characters now be removed, too? No, the second "|" is for everything under "acpi-bits" directory, which is "bits-config" and "bits-test" directories. README was a file under the same hierarchy which now we want to remove, leaving only the directories there. > > > - │ └── README > > ├── acpi-bits.py > > > > * ``tests/avocado``: > > @@ -132,7 +131,7 @@ Under ``tests/avocado/`` as the root we have: > > > > (a) They are python2.7 based scripts and not python 3 scripts. > > (b) They are run from within the bios bits VM and is not subjected to QEMU > > - build/test python script maintainance and dependency resolutions. > > + build/test python script maintenance and dependency resolutions. > > FWIW, this will also be fixed by Stefan Weil's current pending doc update patch. Since you pulled his patch, I will drop this change. > > > (c) They need not be loaded by avocado framework when running tests. > > > > > > diff --git a/tests/avocado/acpi-bits.py b/tests/avocado/acpi-bits.py > > index 8745a58a76..5ebe8c14a2 100644 > > --- a/tests/avocado/acpi-bits.py > > +++ b/tests/avocado/acpi-bits.py > > @@ -385,8 +385,9 @@ def test_acpi_smbios_bits(self): > > self._vm.launch() > > # biosbits has been configured to run all the specified test suites > > # in batch mode and then automatically initiate a vm shutdown. > > - # sleep for maximum of one minute > > - max_sleep_time = time.monotonic() + 60 > > + # sleep for maximum of a minute and a half to accomomodate even slower > > s/accomomodate/accomodate/ Ugh! Will fix it too. > > > + # test setups. > > + max_sleep_time = time.monotonic() + 90 > > while self._vm.is_running() and time.monotonic() < max_sleep_time: > > time.sleep(1) > > > > Thomas >
diff --git a/docs/devel/acpi-bits.rst b/docs/devel/acpi-bits.rst index c9564d871a..a9020adb2d 100644 --- a/docs/devel/acpi-bits.rst +++ b/docs/devel/acpi-bits.rst @@ -41,7 +41,6 @@ Under ``tests/avocado/`` as the root we have: │ │ ├── smbios.py2 │ │ ├── testacpi.py2 │ │ └── testcpuid.py2 - │ └── README ├── acpi-bits.py * ``tests/avocado``: @@ -132,7 +131,7 @@ Under ``tests/avocado/`` as the root we have: (a) They are python2.7 based scripts and not python 3 scripts. (b) They are run from within the bios bits VM and is not subjected to QEMU - build/test python script maintainance and dependency resolutions. + build/test python script maintenance and dependency resolutions. (c) They need not be loaded by avocado framework when running tests. diff --git a/tests/avocado/acpi-bits.py b/tests/avocado/acpi-bits.py index 8745a58a76..5ebe8c14a2 100644 --- a/tests/avocado/acpi-bits.py +++ b/tests/avocado/acpi-bits.py @@ -385,8 +385,9 @@ def test_acpi_smbios_bits(self): self._vm.launch() # biosbits has been configured to run all the specified test suites # in batch mode and then automatically initiate a vm shutdown. - # sleep for maximum of one minute - max_sleep_time = time.monotonic() + 60 + # sleep for maximum of a minute and a half to accomomodate even slower + # test setups. + max_sleep_time = time.monotonic() + 90 while self._vm.is_running() and time.monotonic() < max_sleep_time: time.sleep(1)
Most of the changes are cosmetic. The bits test timeout has now been increased to 90 seconds in order to accommodate slower systems and fewer unnecessary failures. One spelling correction in docs along with removal of the reference to non-existent README file. CC: Thomas Huth <thuth@redhat.com> CC: qemu-trivial@nongnu.org Signed-off-by: Ani Sinha <ani@anisinha.ca> --- docs/devel/acpi-bits.rst | 3 +-- tests/avocado/acpi-bits.py | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-)