Change in vdsm[master]: tests: make virtTests run on RHEL/CentOS

fromani at redhat.com fromani at redhat.com
Fri Mar 28 16:07:12 UTC 2014


Francesco Romani has uploaded a new change for review.

Change subject: tests: make virtTests run on RHEL/CentOS
......................................................................

tests: make virtTests run on RHEL/CentOS

This patch includes fixes to let the virt functional test run
on RHEL/CentOS 6.x:

* add /sbin to mkinitrd search path
* fix usage of format() on strings to be python 2.6 friendly.

Change-Id: I248acbf03fa86585b74e3c6e8c76afe31561663d
Signed-off-by: Francesco Romani <fromani at redhat.com>
---
M tests/functional/virtTests.py
1 file changed, 5 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/98/26198/1

diff --git a/tests/functional/virtTests.py b/tests/functional/virtTests.py
index 54a137f..0c5a232 100644
--- a/tests/functional/virtTests.py
+++ b/tests/functional/virtTests.py
@@ -39,7 +39,9 @@
 
 from virt import vmstatus
 
-_mkinitrd = CommandPath("mkinitrd", "/usr/bin/mkinitrd")
+_mkinitrd = CommandPath("mkinitrd",
+                        "/usr/bin/mkinitrd",  # Fedora
+                        "/sbin/mkinitrd")  # RHEL 6.x, Centos 6.x
 _modprobe = CommandPath("modprobe",
                         "/usr/sbin/modprobe",  # Fedora, Ubuntu
                         "/sbin/modprobe")  # RHEL6
@@ -281,11 +283,11 @@
         customization = {'vmId': '77777777-ffff-3333-bbbb-222222222222',
                          'devices': [],
                          'vmName':
-                         ('testVmWithCdrom_{}').format(pathLocation)}
+                         ('testVmWithCdrom_{0}').format(pathLocation)}
 
         # echo -n testPayload | md5sum
         # d37e46c24c78b1aed33496107afdb44b
-        vmPayloadName = ('/var/run/vdsm/payload/{}.'
+        vmPayloadName = ('/var/run/vdsm/payload/{0}.'
                          'd37e46c24c78b1aed33496107afdb44b'
                          '.img').format(customization['vmId'])
 


-- 
To view, visit http://gerrit.ovirt.org/26198
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I248acbf03fa86585b74e3c6e8c76afe31561663d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani at redhat.com>


More information about the vdsm-patches mailing list