From patchwork Fri Jan 7 18:48:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 465001 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p07Im5pJ012313 for ; Fri, 7 Jan 2011 18:48:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752870Ab1AGSr5 (ORCPT ); Fri, 7 Jan 2011 13:47:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:23801 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751696Ab1AGSrz (ORCPT ); Fri, 7 Jan 2011 13:47:55 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p07IltcU006820 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 7 Jan 2011 13:47:55 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p07IlsrG026952; Fri, 7 Jan 2011 13:47:54 -0500 Received: from moof.tlv.redhat.com (dhcp-1-185.tlv.redhat.com [10.35.1.185]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id p07IlkZM032671; Fri, 7 Jan 2011 13:47:53 -0500 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH v3 06/11] KVM test: use error.context() in migration_with_file_transfer Date: Fri, 7 Jan 2011 20:48:06 +0200 Message-Id: <1294426091-16704-6-git-send-email-mgoldish@redhat.com> In-Reply-To: <1294426091-16704-1-git-send-email-mgoldish@redhat.com> References: <1294426091-16704-1-git-send-email-mgoldish@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 07 Jan 2011 18:48:07 +0000 (UTC) diff --git a/client/tests/kvm/tests/migration_with_file_transfer.py b/client/tests/kvm/tests/migration_with_file_transfer.py index 27c1fe1..8a2cc77 100644 --- a/client/tests/kvm/tests/migration_with_file_transfer.py +++ b/client/tests/kvm/tests/migration_with_file_transfer.py @@ -4,6 +4,7 @@ from autotest_lib.client.bin import utils as client_utils import kvm_subprocess, kvm_test_utils, kvm_utils +@error.context_aware def run_migration_with_file_transfer(test, params, env): """ KVM migration test: @@ -47,24 +48,29 @@ def run_migration_with_file_transfer(test, params, env): finally: bg.join() - logging.info("Transferring file from host to guest") + error.context("transferring file to guest while migrating", + logging.info) bg = kvm_utils.Thread(vm.copy_files_to, (host_path, guest_path, 0, transfer_timeout)) run_and_migrate(bg) - logging.info("Transferring file back from guest to host") + error.context("transferring file back to host while migrating", + logging.info) bg = kvm_utils.Thread(vm.copy_files_from, (guest_path, host_path_returned, 0, transfer_timeout)) run_and_migrate(bg) - # Make sure the returned file is indentical to the original one + # Make sure the returned file is identical to the original one + error.context("comparing hashes", logging.info) orig_hash = client_utils.hash_file(host_path) returned_hash = client_utils.hash_file(host_path_returned) if orig_hash != returned_hash: raise error.TestFail("Returned file hash (%s) differs from " "original one (%s)" % (returned_hash, orig_hash)) + error.context() + finally: session.close() if os.path.isfile(host_path):