1. Patchew
  2. Libvirt
  3. [PATCH v2 0/6] Final changes to fix test suite on macOS
  4. View patch

[PATCH v2 3/6] qemuxml2argvtest: Increase timeout on macOS

Roman Bolshakov posted 6 patches 5 years, 2 months ago
[PATCH v2 3/6] qemuxml2argvtest: Increase timeout on macOS
Posted by Roman Bolshakov 5 years, 2 months ago 
The test takes 40+ seconds on MBP 2012, MBA 2015. Cirrus completes the
test within default timeout, just above 29 seconds but the error margin
is narrow, under a second.

It'd be good to provide reasonable default timeout to avoid test suite
failure if "meson test" is invoked without arguments.

Closes https://gitlab.com/libvirt/libvirt/-/issues/58
Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
---
 tests/meson.build | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/meson.build b/tests/meson.build
index f88410ff33..cb06873ba5 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -574,7 +574,13 @@ foreach data : tests
     ],
     export_dynamic: true,
   )
-  test(data['name'], test_bin, env: tests_env)
+  if data['name'] == 'qemuxml2argvtest' and host_machine.system() == 'darwin'
+    timeout = 90
+  else
+    # default meson timeout
+    timeout = 30
+  endif
+  test(data['name'], test_bin, env: tests_env, timeout: timeout)
 endforeach
 
 
-- 
2.29.2
Re: [PATCH v2 3/6] qemuxml2argvtest: Increase timeout on macOS
Posted by Michal Prívozník 5 years, 2 months ago 
On 11/23/20 11:10 PM, Roman Bolshakov wrote:
> The test takes 40+ seconds on MBP 2012, MBA 2015. Cirrus completes the
> test within default timeout, just above 29 seconds but the error margin
> is narrow, under a second.
> 
> It'd be good to provide reasonable default timeout to avoid test suite
> failure if "meson test" is invoked without arguments.
> 
> Closes https://gitlab.com/libvirt/libvirt/-/issues/58
> Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
> ---
>   tests/meson.build | 8 +++++++-
>   1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/meson.build b/tests/meson.build
> index f88410ff33..cb06873ba5 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -574,7 +574,13 @@ foreach data : tests
>       ],
>       export_dynamic: true,
>     )
> -  test(data['name'], test_bin, env: tests_env)
> +  if data['name'] == 'qemuxml2argvtest' and host_machine.system() == 'darwin'

If we are doing this, then I'd say do it host arch agnostic.

> +    timeout = 90
> +  else
> +    # default meson timeout
> +    timeout = 30
> +  endif
> +  test(data['name'], test_bin, env: tests_env, timeout: timeout)
>   endforeach
>   
>   
> 

Michal
Re: [PATCH v2 3/6] qemuxml2argvtest: Increase timeout on macOS
Posted by Roman Bolshakov 5 years, 2 months ago 
On Fri, Nov 27, 2020 at 10:53:49AM +0100, Michal Prívozník wrote:
> On 11/23/20 11:10 PM, Roman Bolshakov wrote:
> > The test takes 40+ seconds on MBP 2012, MBA 2015. Cirrus completes the
> > test within default timeout, just above 29 seconds but the error margin
> > is narrow, under a second.
> > 
> > It'd be good to provide reasonable default timeout to avoid test suite
> > failure if "meson test" is invoked without arguments.
> > 
> > Closes https://gitlab.com/libvirt/libvirt/-/issues/58
> > Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
> > ---
> >   tests/meson.build | 8 +++++++-
> >   1 file changed, 7 insertions(+), 1 deletion(-)
> > 
> > diff --git a/tests/meson.build b/tests/meson.build
> > index f88410ff33..cb06873ba5 100644
> > --- a/tests/meson.build
> > +++ b/tests/meson.build
> > @@ -574,7 +574,13 @@ foreach data : tests
> >       ],
> >       export_dynamic: true,
> >     )
> > -  test(data['name'], test_bin, env: tests_env)
> > +  if data['name'] == 'qemuxml2argvtest' and host_machine.system() == 'darwin'
> 
> If we are doing this, then I'd say do it host arch agnostic.
> 

I intended to do that but forgot about it. Thanks for catching that!

-Roman

> > +    timeout = 90
> > +  else
> > +    # default meson timeout
> > +    timeout = 30
> > +  endif
> > +  test(data['name'], test_bin, env: tests_env, timeout: timeout)
> >   endforeach
> > 
> 
> Michal
>
Re: [PATCH v2 3/6] qemuxml2argvtest: Increase timeout on macOS
Posted by Michal Prívozník 5 years, 2 months ago 
On 11/27/20 12:52 PM, Roman Bolshakov wrote:
> On Fri, Nov 27, 2020 at 10:53:49AM +0100, Michal Prívozník wrote:
>> On 11/23/20 11:10 PM, Roman Bolshakov wrote:
>>> The test takes 40+ seconds on MBP 2012, MBA 2015. Cirrus completes the
>>> test within default timeout, just above 29 seconds but the error margin
>>> is narrow, under a second.
>>>
>>> It'd be good to provide reasonable default timeout to avoid test suite
>>> failure if "meson test" is invoked without arguments.
>>>
>>> Closes https://gitlab.com/libvirt/libvirt/-/issues/58
>>> Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
>>> ---
>>>    tests/meson.build | 8 +++++++-
>>>    1 file changed, 7 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/tests/meson.build b/tests/meson.build
>>> index f88410ff33..cb06873ba5 100644
>>> --- a/tests/meson.build
>>> +++ b/tests/meson.build
>>> @@ -574,7 +574,13 @@ foreach data : tests
>>>        ],
>>>        export_dynamic: true,
>>>      )
>>> -  test(data['name'], test_bin, env: tests_env)
>>> +  if data['name'] == 'qemuxml2argvtest' and host_machine.system() == 'darwin'
>>
>> If we are doing this, then I'd say do it host arch agnostic.
>>
> 
> I intended to do that but forgot about it. Thanks for catching that!

Okay, I can fix that just before pushing.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

and pushed.

Michal
Re: [PATCH v2 3/6] qemuxml2argvtest: Increase timeout on macOS
Posted by Roman Bolshakov 5 years, 2 months ago 
On Fri, Nov 27, 2020 at 04:37:53PM +0100, Michal Prívozník wrote:
> On 11/27/20 12:52 PM, Roman Bolshakov wrote:
> > On Fri, Nov 27, 2020 at 10:53:49AM +0100, Michal Prívozník wrote:
> > > On 11/23/20 11:10 PM, Roman Bolshakov wrote:
> > > > The test takes 40+ seconds on MBP 2012, MBA 2015. Cirrus completes the
> > > > test within default timeout, just above 29 seconds but the error margin
> > > > is narrow, under a second.
> > > > 
> > > > It'd be good to provide reasonable default timeout to avoid test suite
> > > > failure if "meson test" is invoked without arguments.
> > > > 
> > > > Closes https://gitlab.com/libvirt/libvirt/-/issues/58
> > > > Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
> > > > ---
> > > >    tests/meson.build | 8 +++++++-
> > > >    1 file changed, 7 insertions(+), 1 deletion(-)
> > > > 
> > > > diff --git a/tests/meson.build b/tests/meson.build
> > > > index f88410ff33..cb06873ba5 100644
> > > > --- a/tests/meson.build
> > > > +++ b/tests/meson.build
> > > > @@ -574,7 +574,13 @@ foreach data : tests
> > > >        ],
> > > >        export_dynamic: true,
> > > >      )
> > > > -  test(data['name'], test_bin, env: tests_env)
> > > > +  if data['name'] == 'qemuxml2argvtest' and host_machine.system() == 'darwin'
> > > 
> > > If we are doing this, then I'd say do it host arch agnostic.
> > > 
> > 
> > I intended to do that but forgot about it. Thanks for catching that!
> 
> Okay, I can fix that just before pushing.
> 
> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
> 
> and pushed.
> 
> Michal
> 

I was about to resend v3 when received the email :)

Thanks for reviewing the series.

Best regards,
Roman

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.