From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: [PATCH KVM-AUTOTEST 2/2] Convert images to JPEG using PIL instead of an external program Date: Wed, 12 Aug 2009 12:34:45 +0300 Message-ID: <1250069685-17727-3-git-send-email-avi@redhat.com> References: <1250069685-17727-1-git-send-email-avi@redhat.com> Cc: kvm@vger.kernel.org To: Lucas Meneghel Rodrigues Return-path: Received: from mx2.redhat.com ([66.187.237.31]:40653 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755034AbZHLJer (ORCPT ); Wed, 12 Aug 2009 05:34:47 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7C9Yme1028536 for ; Wed, 12 Aug 2009 05:34:48 -0400 In-Reply-To: <1250069685-17727-1-git-send-email-avi@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: This is faster since we don't need to fork/exec/wait for an external program each time. Signed-off-by: Avi Kivity --- client/tests/kvm/kvm_guest_wizard.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/tests/kvm/kvm_guest_wizard.py b/client/tests/kvm/kvm_guest_wizard.py index 73b830e..f9e5476 100644 --- a/client/tests/kvm/kvm_guest_wizard.py +++ b/client/tests/kvm/kvm_guest_wizard.py @@ -1,6 +1,7 @@ import os, time, md5, re, shutil, logging from autotest_lib.client.common_lib import utils, error import kvm_utils, ppm_utils, kvm_subprocess +import PIL.Image """ Utilities to perform automatic guest installation using step files. @@ -110,9 +111,8 @@ def barrier_2(vm, words, params, debug_dir, data_scrdump_filename, history_scrdump_filename = os.path.join(history_dir, "scrdump-step_%s-%s.jpg" % (current_step_num, time.strftime("%Y%m%d-%H%M%S"))) - kvm_subprocess.run_fg("convert -quality 30 %s %s" % - (scrdump_filename, history_scrdump_filename), - logging.debug, "(convert) ", timeout=30) + image = PIL.Image.open(scrdump_filename) + image.save(history_scrdump_filename, format = 'JPEG', quality = 30) # Compare md5sum of barrier region with the expected md5sum calced_md5sum = ppm_utils.get_region_md5sum(w, h, data, x1, y1, dx, dy, -- 1.6.3.3