Signed-off-by: Michael Goldish <mgold...@redhat.com>
---
client/tests/kvm/kvm_preprocessing.py | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/client/tests/kvm/kvm_preprocessing.py
b/client/tests/kvm/kvm_preprocessing.py
index 5ce0a3b..e5b8906 100644
--- a/client/tests/kvm/kvm_preprocessing.py
+++ b/client/tests/kvm/kvm_preprocessing.py
@@ -39,6 +39,7 @@ def preprocess_image(test, params):
raise error.TestError("Could not create image")
+...@error.context_aware
def preprocess_vm(test, params, env, name):
"""
Preprocess a single VM object according to the instructions in params.
@@ -49,7 +50,8 @@ def preprocess_vm(test, params, env, name):
@param env: The environment (a dict-like object).
@param name: The name of the VM object.
"""
- logging.debug("Preprocessing VM '%s'..." % name)
+ error.context("preprocessing '%s'" % name)
+
vm = env.get_vm(name)
if vm:
logging.debug("VM object found in environment")
@@ -104,6 +106,7 @@ def postprocess_image(test, params):
kvm_vm.remove_image(params, test.bindir)
+...@error.context_aware
def postprocess_vm(test, params, env, name):
"""
Postprocess a single VM object according to the instructions in params.
@@ -114,7 +117,7 @@ def postprocess_vm(test, params, env, name):
@param env: The environment (a dict-like object).
@param name: The name of the VM object.
"""
- logging.debug("Postprocessing VM '%s'..." % name)
+ error.context("postprocessing '%s'" % name)
vm = env.get_vm(name)
if vm:
logging.debug("VM object found in environment")
@@ -187,6 +190,7 @@ def process(test, params, env, image_func, vm_func):
vm_func(test, vm_params, env, vm_name)
+...@error.context_aware
def preprocess(test, params, env):
"""
Preprocess all VMs and images according to the instructions in params.
@@ -196,6 +200,8 @@ def preprocess(test, params, env):
@param params: A dict containing all VM and image parameters.
@param env: The environment (a dict-like object).
"""
+ error.context("preprocessing")
+
# Start tcpdump if it isn't already running
if "address_cache" not in env:
env["address_cache"] = {}
@@ -274,6 +280,7 @@ def preprocess(test, params, env):
_screendump_thread.start()
+...@error.context_aware
def postprocess(test, params, env):
"""
Postprocess all VMs and images according to the instructions in params.
@@ -282,6 +289,8 @@ def postprocess(test, params, env):
@param params: Dict containing all VM and image parameters.
@param env: The environment (a dict-like object).
"""
+ error.context("postprocessing")
+
# Postprocess all VMs and images
process(test, params, env, postprocess_image, postprocess_vm)
--
1.7.3.4
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
