On Fri, 24 Jul 2020 at 17:31, John Snow <js...@redhat.com> wrote: > > On 7/20/20 4:20 PM, Eduardo Habkost wrote: > > On Mon, Jul 20, 2020 at 12:02:52PM -0400, John Snow wrote: > >> 3 seconds is too short for some tests running inside busy VMs. Build it > >> out to > >> a rather generous 30 seconds to find out conclusively if there are more > >> severe > >> problems in the merge/CI tests. > >> > >> Signed-off-by: John Snow <js...@redhat.com> > > > > It's weird how the hard shutdown method has a more graceful > > timeout than graceful shutdown (60 seconds vs 3 seconds). > > > > I would make both have the same timeout, but it's better to try > > this only after 5.1.0. > > > > Reviewed-by: Eduardo Habkost <ehabk...@redhat.com> > > > > > > Peter, do you want to take this directly to see if it starts to fix the > merge tests for you?
Applied to master, thanks. We'll see how it goes... -- PMM
