Make possible to use kvm_config as a standalone program.
PATCH 1/3 Make possible to use kvm_config as a standalone program.
Replace autotest exceptions for standard python exceptions. This will allow kvm_config.py to be used as a stand alone program.
Signed-off-by Lucas Meneghel Rodrigues <[email protected]>
--- client/tests/kvm/kvm_config.py | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
client/tests/kvm/kvm_config.py +3 -4
@@ -1,5 +1,4 @@ import re, os, sys, StringIO -from autotest_lib.client.common_lib import error """ KVM configuration file utility functions.
@@ -356,7 +355,7 @@ class config: # (inside an exception or inside subvariants) if restricted: e_msg = "Using variants in this context is not allowed" - raise error.AutotestError() + raise ValueError(e_msg) if self.debug and not restricted: self.__debug_print(indented_line, "Entering variants block (%d dicts in"
@@ -401,7 +400,7 @@ class config: words[1]) if not os.path.exists(filename): e_msg = "Cannot include %s -- file not found" % filename - raise error.AutotestError(e_msg) + raise IOError(e_msg) new_file = open(filename, "r") list = self.parse(new_file, list, restricted) new_file.close()
@@ -409,7 +408,7 @@ class config: self.__debug_print("", "Leaving file %s" % words[1]) else: e_msg = "Cannot include anything because no file is open" - raise error.AutotestError(e_msg) + raise ValueError(e_msg) # Parse multi-line exceptions # (the block is parsed for each dict separately)
Signature · 1 line
1.6.2.2
PATCH 2/3 Fixing bad line breaks
During the conversion of logging statements, some bad line continuation were introduced. This patch fixes the mistakes.
Signed-off-by Lucas Meneghel Rodrigues <[email protected]>
--- client/tests/kvm/kvm_tests.py | 12 ++++++------ client/tests/kvm/make_html_report.py | 5 ++--- 2 files changed, 8 insertions(+), 9 deletions(-)
client/tests/kvm/kvm_tests.py +6 -6
@@ -274,8 +274,8 @@ def run_autotest(test, params, env): copy = True # Perform the copy if copy: - logging.info("Copying %s.tar.bz2 to guest (file is missing or has a" - " different size)..." % test_name) + logging.info("Copying %s.tar.bz2 to guest \ + (file is missing or has a different size)..." % test_name) if not vm.scp_to_remote(tarred_test_path, ""): raise error.TestFail("Could not copy %s.tar.bz2 to guest" % test_name)
@@ -291,8 +291,8 @@ def run_autotest(test, params, env): # Extract <test_name>.tar.bz2 into autotest/tests logging.info("Extracting %s.tar.bz2..." % test_name) - status = session.get_command_status("tar xvfj %s.tar.bz2 -C " - "autotest/tests" % test_name) + status = session.get_command_status("tar xvfj %s.tar.bz2 -C \ + autotest/tests" % test_name) if status != 0: raise error.TestFail("Could not extract %s.tar.bz2" % test_name)
@@ -321,8 +321,8 @@ def run_autotest(test, params, env): status_fail = False if result_list == []: status_fail = True - message_fail = "Test '%s' did not produce any recognizable" - " results" % test_name + message_fail = "Test '%s' did not produce any recognizable \ + results" % test_name for result in result_list: logging.info(str(result)) if result[1] == "FAIL":
client/tests/kvm/make_html_report.py +2 -3
@@ -1442,9 +1442,8 @@ return true; stat_str = 'No test cases executed' if total_executed>0: failed_perct = int(float(total_failed)/float(total_executed)*100) - stat_str = 'From %d tests executed, ' - '%d have passed (%d%s)' % (total_executed, total_passed,failed_perct, - '% failures') + stat_str = 'From %d tests executed, %d have passed (%d%% failures)' % \ + (total_executed, total_passed, failed_perct) kvm_ver_str = metadata['kvmver']
Signature · 1 line
1.6.2.2
PATCH 3/3 Fix bad logging calls
During the conversion of kvm autotest to upstream coding standards, some bad logging calls were left behind. This patch fixes them.
Signed-off-by Lucas Meneghel Rodrigues <[email protected]>
--- client/tests/kvm/kvm_utils.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
client/tests/kvm/kvm_utils.py +3 -3
@@ -304,7 +304,7 @@ class kvm_spawn: # Print some debugging info if match == None and self.poll() != 0: - logging.debug("Timeout elapsed or process terminated. Output:", + logging.debug("Timeout elapsed or process terminated. Output: %s", format_str_for_message(data.strip())) return (match, data)
@@ -465,8 +465,8 @@ class kvm_spawn: # Print some debugging info if status != 0: - logging.debug("Command failed; status: %d, output:" % status \ - + format_str_for_message(output.strip())) + logging.debug("Command failed; status: %d, output: %s", status, + format_str_for_message(output.strip())) return (status, output)
Signature · 1 line
1.6.2.2