[PATCH v2] acpi/tests/avocado/bits: some misc fixes

[PATCH v2] acpi/tests/avocado/bits: some misc fixes

[Ani Sinha]

Most of the changes are trivial. The bits test timeout has now been increased
to 110 seconds in order to accommodate slower systems and fewer unnecessary
failures. Removed of the reference to non-existent README file in docs.

CC: Thomas Huth <thuth@redhat.com>
CC: qemu-trivial@nongnu.org
Signed-off-by: Ani Sinha <ani@anisinha.ca>
---
 changed from v1: address Thomas' suggestions.

 docs/devel/acpi-bits.rst   | 7 +++----
 tests/avocado/acpi-bits.py | 5 +++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/devel/acpi-bits.rst b/docs/devel/acpi-bits.rst
index c9564d871a..2c776ab166 100644
--- a/docs/devel/acpi-bits.rst
+++ b/docs/devel/acpi-bits.rst
@@ -38,10 +38,9 @@ Under ``tests/avocado/`` as the root we have:
    │ ├── bits-config
    │ │ └── bits-cfg.txt
    │ ├── bits-tests
-   │ │ ├── smbios.py2
-   │ │ ├── testacpi.py2
-   │ │ └── testcpuid.py2
-   │ └── README
+   │   ├── smbios.py2
+   │   ├── testacpi.py2
+   │   └── testcpuid.py2
    ├── acpi-bits.py
 
 * ``tests/avocado``:
diff --git a/tests/avocado/acpi-bits.py b/tests/avocado/acpi-bits.py
index 8745a58a76..2edc36fc26 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 50 seconds in order to accommodate
+        # even slower test setups.
+        max_sleep_time = time.monotonic() + 110
         while self._vm.is_running() and time.monotonic() < max_sleep_time:
             time.sleep(1)
 
-- 
2.34.1

Re: [PATCH v2] acpi/tests/avocado/bits: some misc fixes

[Thomas Huth]

On 11/11/2022 13.31, Ani Sinha wrote:
> Most of the changes are trivial. The bits test timeout has now been increased
> to 110 seconds in order to accommodate slower systems and fewer unnecessary
> failures. Removed of the reference to non-existent README file in docs.
> 
> CC: Thomas Huth <thuth@redhat.com>
> CC: qemu-trivial@nongnu.org
> Signed-off-by: Ani Sinha <ani@anisinha.ca>
> ---
>   changed from v1: address Thomas' suggestions.
> 
>   docs/devel/acpi-bits.rst   | 7 +++----
>   tests/avocado/acpi-bits.py | 5 +++--
>   2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/docs/devel/acpi-bits.rst b/docs/devel/acpi-bits.rst
> index c9564d871a..2c776ab166 100644
> --- a/docs/devel/acpi-bits.rst
> +++ b/docs/devel/acpi-bits.rst
> @@ -38,10 +38,9 @@ Under ``tests/avocado/`` as the root we have:
>      │ ├── bits-config
>      │ │ └── bits-cfg.txt
>      │ ├── bits-tests
> -   │ │ ├── smbios.py2
> -   │ │ ├── testacpi.py2
> -   │ │ └── testcpuid.py2
> -   │ └── README
> +   │   ├── smbios.py2
> +   │   ├── testacpi.py2
> +   │   └── testcpuid.py2

Thanks, that looks better now!

>      ├── acpi-bits.py
>   
>   * ``tests/avocado``:
> diff --git a/tests/avocado/acpi-bits.py b/tests/avocado/acpi-bits.py
> index 8745a58a76..2edc36fc26 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 50 seconds in order to accommodate
> +        # even slower test setups.
> +        max_sleep_time = time.monotonic() + 110
>           while self._vm.is_running() and time.monotonic() < max_sleep_time:
>               time.sleep(1)
>   

Reviewed-by: Thomas Huth <thuth@redhat.com>

(I sent my "misc fixes" pull request already, sorry ... I hope this can go 
via qemu-trival or another branch instead)

Re: [PATCH v2] acpi/tests/avocado/bits: some misc fixes

[Michael S. Tsirkin]

On Fri, Nov 11, 2022 at 06:01:08PM +0530, Ani Sinha wrote:
> Most of the changes are trivial. The bits test timeout has now been increased
> to 110 seconds in order to accommodate slower systems and fewer unnecessary
> failures. Removed of the reference to non-existent README file in docs.
> 
> CC: Thomas Huth <thuth@redhat.com>
> CC: qemu-trivial@nongnu.org
> Signed-off-by: Ani Sinha <ani@anisinha.ca>

You need to pick a tree through which work on these
will be merged.
If it's my pc/pci tree you need to add that to MAINTAINERS
so I get to see the patches.


> ---
>  changed from v1: address Thomas' suggestions.
> 
>  docs/devel/acpi-bits.rst   | 7 +++----
>  tests/avocado/acpi-bits.py | 5 +++--
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/docs/devel/acpi-bits.rst b/docs/devel/acpi-bits.rst
> index c9564d871a..2c776ab166 100644
> --- a/docs/devel/acpi-bits.rst
> +++ b/docs/devel/acpi-bits.rst
> @@ -38,10 +38,9 @@ Under ``tests/avocado/`` as the root we have:
>     │ ├── bits-config
>     │ │ └── bits-cfg.txt
>     │ ├── bits-tests
> -   │ │ ├── smbios.py2
> -   │ │ ├── testacpi.py2
> -   │ │ └── testcpuid.py2
> -   │ └── README
> +   │   ├── smbios.py2
> +   │   ├── testacpi.py2
> +   │   └── testcpuid.py2
>     ├── acpi-bits.py
>  
>  * ``tests/avocado``:
> diff --git a/tests/avocado/acpi-bits.py b/tests/avocado/acpi-bits.py
> index 8745a58a76..2edc36fc26 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 50 seconds in order to accommodate
> +        # even slower test setups.
> +        max_sleep_time = time.monotonic() + 110
>          while self._vm.is_running() and time.monotonic() < max_sleep_time:
>              time.sleep(1)
>  
> -- 
> 2.34.1
> 
> 
> 

Re: [PATCH v2] acpi/tests/avocado/bits: some misc fixes

[Ani Sinha]

[-- Attachment #1: Type: text/plain, Size: 2538 bytes --]

On Fri, Nov 11, 2022 at 20:05 Michael S. Tsirkin <mst@redhat.com> wrote:

> On Fri, Nov 11, 2022 at 06:01:08PM +0530, Ani Sinha wrote:
> > Most of the changes are trivial. The bits test timeout has now been
> increased
> > to 110 seconds in order to accommodate slower systems and fewer
> unnecessary
> > failures. Removed of the reference to non-existent README file in docs.
> >
> > CC: Thomas Huth <thuth@redhat.com>
> > CC: qemu-trivial@nongnu.org
> > Signed-off-by: Ani Sinha <ani@anisinha.ca>
>
> You need to pick a tree through which work on these
> will be merged.
> If it's my pc/pci tree you need to add that to MAINTAINERS
> so I get to see the patches.


Adding you to MAINTAINERS should be enough right?


>
>
> > ---
> >  changed from v1: address Thomas' suggestions.
> >
> >  docs/devel/acpi-bits.rst   | 7 +++----
> >  tests/avocado/acpi-bits.py | 5 +++--
> >  2 files changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/docs/devel/acpi-bits.rst b/docs/devel/acpi-bits.rst
> > index c9564d871a..2c776ab166 100644
> > --- a/docs/devel/acpi-bits.rst
> > +++ b/docs/devel/acpi-bits.rst
> > @@ -38,10 +38,9 @@ Under ``tests/avocado/`` as the root we have:
> >     │ ├── bits-config
> >     │ │ └── bits-cfg.txt
> >     │ ├── bits-tests
> > -   │ │ ├── smbios.py2
> > -   │ │ ├── testacpi.py2
> > -   │ │ └── testcpuid.py2
> > -   │ └── README
> > +   │   ├── smbios.py2
> > +   │   ├── testacpi.py2
> > +   │   └── testcpuid.py2
> >     ├── acpi-bits.py
> >
> >  * ``tests/avocado``:
> > diff --git a/tests/avocado/acpi-bits.py b/tests/avocado/acpi-bits.py
> > index 8745a58a76..2edc36fc26 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 50 seconds in order to
> accommodate
> > +        # even slower test setups.
> > +        max_sleep_time = time.monotonic() + 110
> >          while self._vm.is_running() and time.monotonic() <
> max_sleep_time:
> >              time.sleep(1)
> >
> > --
> > 2.34.1
> >
> >
> >
>
>

[-- Attachment #2: Type: text/html, Size: 3671 bytes --]

Re: [PATCH v2] acpi/tests/avocado/bits: some misc fixes

[Michael S. Tsirkin]

On Fri, Nov 11, 2022 at 08:16:22PM +0530, Ani Sinha wrote:
> 
> 
> On Fri, Nov 11, 2022 at 20:05 Michael S. Tsirkin <mst@redhat.com> wrote:
> 
>     On Fri, Nov 11, 2022 at 06:01:08PM +0530, Ani Sinha wrote:
>     > Most of the changes are trivial. The bits test timeout has now been
>     increased
>     > to 110 seconds in order to accommodate slower systems and fewer
>     unnecessary
>     > failures. Removed of the reference to non-existent README file in docs.
>     >
>     > CC: Thomas Huth <thuth@redhat.com>
>     > CC: qemu-trivial@nongnu.org
>     > Signed-off-by: Ani Sinha <ani@anisinha.ca>
> 
>     You need to pick a tree through which work on these
>     will be merged.
>     If it's my pc/pci tree you need to add that to MAINTAINERS
>     so I get to see the patches.
> 
> 
> Adding you to MAINTAINERS should be enough right? 
> 

That's fine, yes.

> 
> 
> 
>     > ---
>     >  changed from v1: address Thomas' suggestions.
>     >
>     >  docs/devel/acpi-bits.rst   | 7 +++----
>     >  tests/avocado/acpi-bits.py | 5 +++--
>     >  2 files changed, 6 insertions(+), 6 deletions(-)
>     >
>     > diff --git a/docs/devel/acpi-bits.rst b/docs/devel/acpi-bits.rst
>     > index c9564d871a..2c776ab166 100644
>     > --- a/docs/devel/acpi-bits.rst
>     > +++ b/docs/devel/acpi-bits.rst
>     > @@ -38,10 +38,9 @@ Under ``tests/avocado/`` as the root we have:
>     >     │ ├── bits-config
>     >     │ │ └── bits-cfg.txt
>     >     │ ├── bits-tests
>     > -   │ │ ├── smbios.py2
>     > -   │ │ ├── testacpi.py2
>     > -   │ │ └── testcpuid.py2
>     > -   │ └── README
>     > +   │   ├── smbios.py2
>     > +   │   ├── testacpi.py2
>     > +   │   └── testcpuid.py2
>     >     ├── acpi-bits.py
>     > 
>     >  * ``tests/avocado``:
>     > diff --git a/tests/avocado/acpi-bits.py b/tests/avocado/acpi-bits.py
>     > index 8745a58a76..2edc36fc26 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 50 seconds in order to
>     accommodate
>     > +        # even slower test setups.
>     > +        max_sleep_time = time.monotonic() + 110
>     >          while self._vm.is_running() and time.monotonic() <
>     max_sleep_time:
>     >              time.sleep(1)
>     > 
>     > --
>     > 2.34.1
>     >
>     >
>     >
> 
>