Eduardo has uploaded a new change for review. Change subject: Fix caps code related broken master compilation. ......................................................................
Fix caps code related broken master compilation. Change-Id: Ie441664564e9cd227744e7b59c9ab0c90821b88b Signed-off-by: Eduardo <[email protected]> --- M tests/capsTests.py M vdsm/caps.py 2 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/25/10025/1 diff --git a/tests/capsTests.py b/tests/capsTests.py index dec0ec7..b39e8e2 100644 --- a/tests/capsTests.py +++ b/tests/capsTests.py @@ -67,8 +67,8 @@ path = os.path.join(dirName, "caps_libvirt.out") machines = caps._getEmulatedMachines(file(path).read()) expectedMachines = ['pc-1.2', 'none', 'pc', 'pc-1.1', 'pc-1.0', - 'pc-0.15', 'pc-0.14', 'pc-0.13', 'pc-0.12', 'pc-0.11', - 'pc-0.10', 'isapc'] + 'pc-0.15', 'pc-0.14', 'pc-0.13', 'pc-0.12', + 'pc-0.11', 'pc-0.10', 'isapc'] self.assertEqual(machines, expectedMachines) def test_parseKeyVal(self): diff --git a/vdsm/caps.py b/vdsm/caps.py index 0b16796..d6298df 100644 --- a/vdsm/caps.py +++ b/vdsm/caps.py @@ -135,6 +135,7 @@ if m.nodeName == 'machine'] return [] + def _getAllCpuModels(): cpu_map = minidom.parseString( file('/usr/share/libvirt/cpu_map.xml').read()) -- To view, visit http://gerrit.ovirt.org/10025 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie441664564e9cd227744e7b59c9ab0c90821b88b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
