Change in vdsm[master]: tests: Allow setting custom libvirt error message

nsoffer at redhat.com nsoffer at redhat.com
Mon Jun 29 19:24:27 UTC 2015


Nir Soffer has uploaded a new change for review.

Change subject: tests: Allow setting custom libvirt error message
......................................................................

tests: Allow setting custom libvirt error message

Fake Domain object was repeating the code in Error factory, and was
using a default empty error message. Now we use Error and allow faking
also the error message.

Change-Id: I61e26d50ef7babd8bf9a9aadc38451297631a65b
Signed-off-by: Nir Soffer <nsoffer at redhat.com>
---
M tests/vmfakelib.py
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/20/43020/1

diff --git a/tests/vmfakelib.py b/tests/vmfakelib.py
index 2c841ca..bdaf275 100644
--- a/tests/vmfakelib.py
+++ b/tests/vmfakelib.py
@@ -163,6 +163,7 @@
 class Domain(object):
     def __init__(self, xml='',
                  virtError=libvirt.VIR_ERR_OK,
+                 errorMessage="",
                  domState=libvirt.VIR_DOMAIN_RUNNING,
                  domReason=0,
                  vmId=''):
@@ -170,6 +171,7 @@
         self._xml = xml
         self.devXml = ''
         self._virtError = virtError
+        self._errorMessage = errorMessage
         self._metadata = ""
         self._io_tune = {}
         self._domState = domState
@@ -180,9 +182,7 @@
 
     def _failIfRequested(self):
         if self._virtError != libvirt.VIR_ERR_OK:
-            err = libvirt.libvirtError(defmsg='')
-            err.err = [self._virtError]
-            raise err
+            raise Error(self._virtError, self._errorMessage)
 
     def UUIDString(self):
         return self._vmId


-- 
To view, visit https://gerrit.ovirt.org/43020
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I61e26d50ef7babd8bf9a9aadc38451297631a65b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer at redhat.com>


More information about the vdsm-patches mailing list