ubuntu-bugcontrol team mailing list archive

[Chris J Arges <chris.j.arges@xxxxxxxxxxxxx>]

Chris J Arges has proposed merging lp:~arges/qa-regression-testing/libvirt-fixes into lp:qa-regression-testing.

Requested reviews:
  Ubuntu Bug Control (ubuntu-bugcontrol)

For more details, see:
https://code.launchpad.net/~arges/qa-regression-testing/libvirt-fixes/+merge/264159
-- 
Your team Ubuntu Bug Control is requested to review the proposed merge of lp:~arges/qa-regression-testing/libvirt-fixes into lp:qa-regression-testing.

=== modified file 'scripts/test-libvirt.py'
--- scripts/test-libvirt.py	2015-02-09 18:32:16 +0000
+++ scripts/test-libvirt.py	2015-07-08 14:55:05 +0000
@@ -361,13 +361,13 @@
 
     def _stop_daemon(self):
         '''Stop libvirtd daemon'''
-        testlib.cmd(['/etc/init.d/libvirt-bin', 'stop'])
+        testlib.cmd(['/usr/sbin/service', 'libvirt-bin', 'stop'])
         time.sleep(1)
         testlib.cmd(['killall', '-9', 'libvirtd'])
 
     def _start_daemon(self):
         '''Start libvirtd daemon'''
-        testlib.cmd(['/etc/init.d/libvirt-bin', 'start'])
+        testlib.cmd(['/usr/sbin/service', 'libvirt-bin', 'start'])
         time.sleep(3)
         self.assertTrue(testlib.check_pidfile('libvirtd', '/var/run/libvirtd.pid'))
         # throwaway command that blocks until libvirt comes up
@@ -379,6 +379,7 @@
     def _restart_daemon(self):
         '''Restart libvirtd daemon'''
         self._stop_daemon()
+        time.sleep(5) # systemd complains if you stop/start service too rapidly
         self._start_daemon()
 
     def _start_vm(self, uri, vm_name):