KVM test: Reverting r4217
There is a simpler and better solution to
executing multiple pre/postprocessing commands:
Append a ; to the commands and make sure these
commands allways append (+=) instead of override
(=).
Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@4227 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/tests/kvm/kvm_preprocessing.py b/client/tests/kvm/kvm_preprocessing.py
index f75733d..e91d1da 100644
--- a/client/tests/kvm/kvm_preprocessing.py
+++ b/client/tests/kvm/kvm_preprocessing.py
@@ -126,7 +126,7 @@
vm.destroy(gracefully = params.get("kill_vm_gracefully") == "yes")
-def process_command(test, params, env, commands, command_timeout,
+def process_command(test, params, env, command, command_timeout,
command_noncritical):
"""
Pre- or post- custom commands to be executed before/after a test is run
@@ -134,7 +134,7 @@
@param test: An Autotest test object.
@param params: A dict containing all VM and image parameters.
@param env: The environment (a dict-like object).
- @param commands: List of commands to be run.
+ @param command: Command to be run.
@param command_timeout: Timeout for command execution.
@param command_noncritical: If True test will not fail if command fails.
"""
@@ -142,15 +142,14 @@
for k in params.keys():
os.putenv("KVM_TEST_%s" % k, str(params[k]))
# Execute commands
- for command in commands:
- try:
- utils.system("cd %s; %s" % (test.bindir, command))
- except error.CmdError, e:
- logging.warn("Custom processing command '%s' failed, output is: %s",
- command, str(e))
- if not command_noncritical:
- raise error.TestError("Custom processing command failed: %s" %
- str(e))
+ try:
+ utils.system("cd %s; %s" % (test.bindir, command))
+ except error.CmdError, e:
+ logging.warn("Custom processing command '%s' failed, output is: %s",
+ command, str(e))
+ if not command_noncritical:
+ raise error.TestError("Custom processing command failed: %s" %
+ str(e))
def process(test, params, env, image_func, vm_func):
@@ -221,8 +220,7 @@
# Execute any pre_commands
if params.get("pre_command"):
- pre_commands = params.get("pre_command").split()
- process_command(test, params, env, pre_commands,
+ process_command(test, params, env, params.get("pre_command"),
int(params.get("pre_command_timeout", "600")),
params.get("pre_command_noncritical") == "yes")
@@ -298,8 +296,7 @@
# Execute any post_commands
if params.get("post_command"):
- post_commands = params.get("post_command").split()
- process_command(test, params, env, post_commands,
+ process_command(test, params, env, params.get("post_command"),
int(params.get("post_command_timeout", "600")),
params.get("post_command_noncritical") == "yes")