From patchwork Thu Nov 5 10:01:09 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 57864 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA5A3meR016988 for ; Thu, 5 Nov 2009 10:03:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753342AbZKEKDm (ORCPT ); Thu, 5 Nov 2009 05:03:42 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751252AbZKEKDm (ORCPT ); Thu, 5 Nov 2009 05:03:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51833 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751165AbZKEKDk (ORCPT ); Thu, 5 Nov 2009 05:03:40 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nA5A3jT1020146; Thu, 5 Nov 2009 05:03:45 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nA5A3iUM017248; Thu, 5 Nov 2009 05:03:45 -0500 Received: from localhost.localdomain (dhcp-1-188.tlv.redhat.com [10.35.1.188]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id nA5A3aFg017064; Thu, 5 Nov 2009 05:03:43 -0500 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 4/7] KVM test: kvm_vm.py: fix typos in the code that compares -cdrom hashes Date: Thu, 5 Nov 2009 12:01:09 +0200 Message-Id: <1257415272-9423-4-git-send-email-mgoldish@redhat.com> In-Reply-To: <1257415272-9423-3-git-send-email-mgoldish@redhat.com> References: <1257415272-9423-1-git-send-email-mgoldish@redhat.com> <1257415272-9423-2-git-send-email-mgoldish@redhat.com> <1257415272-9423-3-git-send-email-mgoldish@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py index ccf8fa9..5781dbc 100755 --- a/client/tests/kvm/kvm_vm.py +++ b/client/tests/kvm/kvm_vm.py @@ -347,14 +347,14 @@ class VM: elif params.get("md5sum"): logging.debug("Comparing expected MD5 sum with MD5 sum of ISO " "file...") - actual_hash = kvm_utils.md5sum_file(iso, method="md5") + actual_hash = kvm_utils.hash_file(iso, method="md5") expected_hash = params.get("md5sum") compare = True elif params.get("sha1sum"): logging.debug("Comparing expected SHA1 sum with SHA1 sum of " "ISO file...") - actual_hash = kvm_utils.md5sum_file(iso, method="sha1") - expected_hash = params.get("md5sum") + actual_hash = kvm_utils.hash_file(iso, method="sha1") + expected_hash = params.get("sha1sum") compare = True if compare: if actual_hash == expected_hash: