[libvirt] [PATCH] libvirt-tck: 052-domain-hook.t - reload after hook cleanup
Reload libvirtd after hook testing has completed. Otherwise, libvirtd is still expecting hook test scripts to exist. --- scripts/hooks/052-domain-hook.t | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/hooks/052-domain-hook.t b/scripts/hooks/052-domain-hook.t index 90b8a48..d1070b5 100644 --- a/scripts/hooks/052-domain-hook.t +++ b/scripts/hooks/052-domain-hook.t @@ -180,4 +180,8 @@ SKIP: { Sys::Virt::Error::ERR_NO_DOMAIN); $hook->cleanup(); + + diag "reload libvirtd after hook cleanup"; + $hook->action('reload'); + $hook->service_libvirtd(); }; -- 1.8.4.5
I just realized this was never reviewed/commented on. Without this patch, libvirtd is left in a state where future tests expect hooks to exist, but the hooks themselves are removed in $hook->cleanup. The subsequent 'hook files not found' errors cause the tests to fail. -Mike On Thursday, March 06, 2014 03:41:01 PM Mike Latimer wrote:
Reload libvirtd after hook testing has completed. Otherwise, libvirtd is still expecting hook test scripts to exist.
--- scripts/hooks/052-domain-hook.t | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/scripts/hooks/052-domain-hook.t b/scripts/hooks/052-domain-hook.t index 90b8a48..d1070b5 100644 --- a/scripts/hooks/052-domain-hook.t +++ b/scripts/hooks/052-domain-hook.t @@ -180,4 +180,8 @@ SKIP: { Sys::Virt::Error::ERR_NO_DOMAIN);
$hook->cleanup(); + + diag "reload libvirtd after hook cleanup"; + $hook->action('reload'); + $hook->service_libvirtd(); };
On Thu, Mar 06, 2014 at 03:41:01PM -0700, Mike Latimer wrote:
Reload libvirtd after hook testing has completed. Otherwise, libvirtd is still expecting hook test scripts to exist.
--- scripts/hooks/052-domain-hook.t | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/scripts/hooks/052-domain-hook.t b/scripts/hooks/052-domain-hook.t index 90b8a48..d1070b5 100644 --- a/scripts/hooks/052-domain-hook.t +++ b/scripts/hooks/052-domain-hook.t @@ -180,4 +180,8 @@ SKIP: { Sys::Virt::Error::ERR_NO_DOMAIN);
$hook->cleanup(); + + diag "reload libvirtd after hook cleanup"; + $hook->action('reload'); + $hook->service_libvirtd(); };
ACK Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
On 03/27/2014 05:39 AM, Daniel P. Berrange wrote:
On Thu, Mar 06, 2014 at 03:41:01PM -0700, Mike Latimer wrote:
Reload libvirtd after hook testing has completed. Otherwise, libvirtd is still expecting hook test scripts to exist.
--- scripts/hooks/052-domain-hook.t | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/scripts/hooks/052-domain-hook.t b/scripts/hooks/052-domain-hook.t index 90b8a48..d1070b5 100644 --- a/scripts/hooks/052-domain-hook.t +++ b/scripts/hooks/052-domain-hook.t @@ -180,4 +180,8 @@ SKIP: { Sys::Virt::Error::ERR_NO_DOMAIN);
$hook->cleanup(); + + diag "reload libvirtd after hook cleanup"; + $hook->action('reload'); + $hook->service_libvirtd(); };
ACK
Pushed. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (3)
-
Daniel P. Berrange -
Eric Blake -
Mike Latimer