From: Michael Goldish <[email protected]> No need to print the reason in the test itself -- kvm_runtest_2.py takes care of this now.
Specifically, replace blocks such as: message = "Error message" kvm_log.error(message) raise error.TestFail, message with: raise error.TestFail, "Error message" Signed-off-by: Michael Goldish <[email protected]> diff --git a/client/tests/kvm_runtest_2/kvm_tests.py b/client/tests/kvm_runtest_2/kvm_tests.py index e743b74..8825884 100644 --- a/client/tests/kvm_runtest_2/kvm_tests.py +++ b/client/tests/kvm_runtest_2/kvm_tests.py @@ -12,21 +12,15 @@ import scan_results def run_boot(test, params, env): vm = kvm_utils.env_get_vm(env, params.get("main_vm")) if not vm: - message = "VM object not found in environment" - kvm_log.error(message) - raise error.TestError, message + raise error.TestError, "VM object not found in environment" if not vm.is_alive(): - message = "VM seems to be dead; Test requires a living VM" - kvm_log.error(message) - raise error.TestError, message + raise error.TestError, "VM seems to be dead; Test requires a living VM" kvm_log.info("Waiting for guest to be up...") session = kvm_utils.wait_for(vm.ssh_login, 240, 0, 2) if not session: - message = "Could not log into guest" - kvm_log.error(message) - raise error.TestFail, message + raise error.TestFail, "Could not log into guest" kvm_log.info("Logged in") @@ -35,9 +29,7 @@ def run_boot(test, params, env): kvm_log.info("Reboot command sent; waiting for guest to go down...") if not kvm_utils.wait_for(lambda: not session.is_responsive(), 120, 0, 1): - message = "Guest refuses to go down" - kvm_log.error(message) - raise error.TestFail, message + raise error.TestFail, "Guest refuses to go down" session.close() @@ -45,9 +37,7 @@ def run_boot(test, params, env): session = kvm_utils.wait_for(vm.ssh_login, 120, 0, 2) if not session: - message = "Could not log into guest after reboot" - kvm_log.error(message) - raise error.TestFail, message + raise error.TestFail, "Could not log into guest after reboot" kvm_log.info("Guest is up again") @@ -58,24 +48,16 @@ def run_migration(test, params, env): src_vm_name = params.get("migration_src") vm = kvm_utils.env_get_vm(env, src_vm_name) if not vm: - message = "VM '%s' not found in environment" % src_vm_name - kvm_log.error(message) - raise error.TestError, message + raise error.TestError, "VM '%s' not found in environment" % src_vm_name if not vm.is_alive(): - message = "VM '%s' seems to be dead; Test requires a living VM" % src_vm_name - kvm_log.error(message) - raise error.TestError, message + raise error.TestError, "VM '%s' seems to be dead; Test requires a living VM" % src_vm_name dest_vm_name = params.get("migration_dst") dest_vm = kvm_utils.env_get_vm(env, dest_vm_name) if not dest_vm: - message = "VM '%s' not found in environment" % dest_vm_name - kvm_log.error(message) - raise error.TestError, message + raise error.TestError, "VM '%s' not found in environment" % dest_vm_name if not dest_vm.is_alive(): - message = "VM '%s' seems to be dead; Test requires a living VM" % dest_vm_name - kvm_log.error(message) - raise error.TestError, message + raise error.TestError, "VM '%s' seems to be dead; Test requires a living VM" % dest_vm_name pre_scrdump_filename = os.path.join(test.debugdir, "migration_pre.ppm") post_scrdump_filename = os.path.join(test.debugdir, "migration_post.ppm") @@ -83,18 +65,14 @@ def run_migration(test, params, env): # See if migration is supported s, o = vm.send_monitor_cmd("help info") if not "info migrate" in o: - message = "Migration is not supported" - kvm_log.error(message) - raise error.TestError, message + raise error.TestError, "Migration is not supported" # Log into guest and get the output of migration_test_command kvm_log.info("Waiting for guest to be up...") session = kvm_utils.wait_for(vm.ssh_login, 240, 0, 2) if not session: - message = "Could not log into guest" - kvm_log.error(message) - raise error.TestFail, message + raise error.TestFail, "Could not log into guest" kvm_log.info("Logged in") @@ -110,9 +88,8 @@ def run_migration(test, params, env): # Migrate s, o = vm.send_monitor_cmd(cmd) if s: - message = "Migration command failed" - kvm_log.error(message + "\n(command: '%r', output: '%r')" % (cmd, o)) - raise error.TestFail, message + kvm_log.error("Migration command failed (command: %r, output: %r)" % (cmd, o)) + raise error.TestFail, "Migration command failed" # Define some helper functions def mig_finished(): @@ -137,9 +114,7 @@ def run_migration(test, params, env): # Wait for migration to finish if not kvm_utils.wait_for(mig_finished, 90, 2, 2, "Waiting for migration to finish..."): - message = "Timeout elapsed while waiting for migration to finish" - kvm_log.error(message) - raise error.TestFail, message + raise error.TestFail, "Timeout elapsed while waiting for migration to finish" # Report migration status if mig_succeeded(): @@ -149,7 +124,6 @@ def run_migration(test, params, env): message = "Migration failed" else: message = "Migration ended with unknown status" - kvm_log.error(message) raise error.TestFail, message # Get 'post' screendump @@ -180,9 +154,7 @@ def run_migration(test, params, env): session = dest_vm.ssh_login() if not session: - message = "Could not log into guest after migration" - kvm_log.error(message) - raise error.TestFail, message + raise error.TestFail, "Could not log into guest after migration" kvm_log.info("Logged in after migration") @@ -193,29 +165,21 @@ def run_migration(test, params, env): # Compare output to reference output if output != reference_output: - message = "Command output before and after migration differs" - kvm_log.error(message) - raise error.TestFail, message + raise error.TestFail, "Command output before and after migration differs" def run_autotest(test, params, env): vm = kvm_utils.env_get_vm(env, params.get("main_vm")) if not vm: - message = "VM object not found in environment" - kvm_log.error(message) - raise error.TestError, message + raise error.TestError, "VM object not found in environment" if not vm.is_alive(): - message = "VM seems to be dead; Test requires a living VM" - kvm_log.error(message) - raise error.TestError, message + raise error.TestError, "VM seems to be dead; Test requires a living VM" kvm_log.info("Logging into guest...") session = kvm_utils.wait_for(vm.ssh_login, 240, 0, 2) if not session: - message = "Could not log into guest" - kvm_log.error(message) - raise error.TestFail, message + raise error.TestFail, "Could not log into guest" kvm_log.info("Logged in") @@ -257,9 +221,7 @@ def run_autotest(test, params, env): if copy: kvm_log.info("Copying autotest.tar.bz2 to guest (file is missing or has a different size)...") if not vm.scp_to_remote(tarred_autotest_path, ""): - message = "Could not copy autotest.tar.bz2 to guest" - kvm_log.error(message) - raise error.TestError, message + raise error.TestFail, "Could not copy autotest.tar.bz2 to guest" # Check if we need to copy <test_name>.tar.bz2 copy = False @@ -274,17 +236,13 @@ def run_autotest(test, params, env): if copy: kvm_log.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, ""): - message = "Could not copy %s.tar.bz2 to guest" % test_name - kvm_log.error(message) - raise error.TestError, message + raise error.TestFail, "Could not copy %s.tar.bz2 to guest" % test_name # Extract autotest.tar.bz2 kvm_log.info("Extracting autotest.tar.bz2...") status = session.get_command_status("tar xvfj autotest.tar.bz2") if status != 0: - message = "Could not extract autotest.tar.bz2" - kvm_log.error(message) - raise error.TestError, message + raise error.TestFail, "Could not extract autotest.tar.bz2" # mkdir autotest/tests session.sendline("mkdir autotest/tests") @@ -293,9 +251,7 @@ def run_autotest(test, params, env): kvm_log.info("Extracting %s.tar.bz2..." % test_name) status = session.get_command_status("tar xvfj %s.tar.bz2 -C autotest/tests" % test_name) if status != 0: - message = "Could not extract %s.tar.bz2" % test_name - kvm_log.error(message) - raise error.TestError, message + raise error.TestFail, "Could not extract %s.tar.bz2" % test_name # Run the test kvm_log.info("Running test '%s'..." % test_name) @@ -307,9 +263,7 @@ def run_autotest(test, params, env): match, output = session.read_up_to_prompt(timeout=test_timeout, print_func=kvm_log.info) kvm_log.info("---------------- End of test output ----------------") if not match: - message = "Timeout elapsed while waiting for test to complete" - kvm_log.error(message) - raise error.TestFail, message + raise error.TestFail, "Timeout elapsed while waiting for test to complete" session.close() @@ -345,10 +299,8 @@ def run_autotest(test, params, env): # Fail the test if necessary if status_fail: - kvm_log.error(message_fail) raise error.TestFail, message_fail elif status_error: - kvm_log.error(message_error) raise error.TestError, message_error @@ -401,21 +353,15 @@ def run_yum_update(test, params, env): def run_linux_s3(test, params, env): vm = kvm_utils.env_get_vm(env, params.get("main_vm")) if not vm: - message = "VM object not found in environment" - kvm_log.error(message) - raise error.TestError, message + raise error.TestError, "VM object not found in environment" if not vm.is_alive(): - message = "VM seems to be dead; Test requires a living VM" - kvm_log.error(message) - raise error.TestError, message + raise error.TestError, "VM seems to be dead; Test requires a living VM" kvm_log.info("Waiting for guest to be up...") session = kvm_utils.wait_for(vm.ssh_login, 240, 0, 2) if not session: - message = "Could not log into guest" - kvm_log.error(message) - raise error.TestFail, message + raise error.TestFail, "Could not log into guest" kvm_log.info("Logged in") kvm_log.info("Checking that VM supports S3") @@ -424,9 +370,7 @@ def run_linux_s3(test, params, env): if status == None: kvm_log.error("Failed to check if S3 exists") elif status != 0: - message = "Guest does not support S3" - kvm_log.error(message) - raise error.TestFail, message + raise error.TestFail, "Guest does not support S3" kvm_log.info("Waiting for a while for X to start") time.sleep(10) @@ -444,9 +388,7 @@ def run_linux_s3(test, params, env): command = "chvt %s && echo mem > /sys/power/state && chvt %s" % (dst_tty, src_tty) status = session.get_command_status(command, timeout=120) if status != 0: - message = "Suspend to mem failed" - kvm_log.error(message) - raise error.TestFail, message + raise error.TestFail, "Suspend to mem failed" kvm_log.info("VM resumed after S3") -- To unsubscribe from this list: send the line "unsubscribe kvm-commits" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
