From patchwork Sun Apr 10 22:49:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 697311 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 p3AMoEoa007566 for ; Sun, 10 Apr 2011 22:50:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753931Ab1DJWuE (ORCPT ); Sun, 10 Apr 2011 18:50:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:65110 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757750Ab1DJWuB (ORCPT ); Sun, 10 Apr 2011 18:50:01 -0400 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.14.4/8.14.4) with ESMTP id p3AMo07i011471 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 10 Apr 2011 18:50:00 -0400 Received: from freedom.redhat.com (vpn-9-90.rdu.redhat.com [10.11.9.90]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p3AMnulc010623; Sun, 10 Apr 2011 18:49:59 -0400 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [PATCH 2/2] KVM test: Turning off debug output for frequently called monitor commands Date: Sun, 10 Apr 2011 19:49:54 -0300 Message-Id: <1302475794-10361-2-git-send-email-lmr@redhat.com> In-Reply-To: <1302475794-10361-1-git-send-email-lmr@redhat.com> References: <1302475794-10361-1-git-send-email-lmr@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]); Sun, 10 Apr 2011 22:50:14 +0000 (UTC) Signed-off-by: Lucas Meneghel Rodrigues --- client/tests/kvm/kvm_monitor.py | 14 +++++++------- client/tests/kvm/kvm_preprocessing.py | 6 +++--- client/tests/kvm/tests/stepmaker.py | 4 ++-- client/tests/kvm/tests/steps.py | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/tests/kvm/kvm_monitor.py b/client/tests/kvm/kvm_monitor.py index 507e8dd..159c575 100644 --- a/client/tests/kvm/kvm_monitor.py +++ b/client/tests/kvm/kvm_monitor.py @@ -176,7 +176,7 @@ class HumanMonitor(Monitor): "Output so far: %r" % o) # Save the output of 'help' for future use - self._help_str = self.cmd("help") + self._help_str = self.cmd("help", debug=False) except MonitorError, e: if suppress_exceptions: @@ -279,7 +279,7 @@ class HumanMonitor(Monitor): """ Make sure the monitor is responsive by sending a command. """ - self.cmd("info status") + self.cmd("info status", debug=False) # Command wrappers @@ -310,14 +310,14 @@ class HumanMonitor(Monitor): return self.info(what) - def screendump(self, filename): + def screendump(self, filename, debug=True): """ Request a screendump. @param filename: Location for the screendump @return: The command's output """ - return self.cmd("screendump %s" % filename) + return self.cmd(command="screendump %s" % filename, debug=debug) def migrate(self, uri, full_copy=False, incremental_copy=False, wait=False): @@ -647,7 +647,7 @@ class QMPMonitor(Monitor): """ Make sure the monitor is responsive by sending a command. """ - self.cmd("query-status") + self.cmd(cmd="query-status", debug=False) def get_events(self): @@ -725,7 +725,7 @@ class QMPMonitor(Monitor): return self.info(what) - def screendump(self, filename): + def screendump(self, filename, debug=True): """ Request a screendump. @@ -733,7 +733,7 @@ class QMPMonitor(Monitor): @return: The response to the command """ args = {"filename": filename} - return self.cmd("screendump", args) + return self.cmd(cmd="screendump", args=args, debug=debug) def migrate(self, uri, full_copy=False, incremental_copy=False, wait=False): diff --git a/client/tests/kvm/kvm_preprocessing.py b/client/tests/kvm/kvm_preprocessing.py index e2cafe9..f679be0 100644 --- a/client/tests/kvm/kvm_preprocessing.py +++ b/client/tests/kvm/kvm_preprocessing.py @@ -85,7 +85,7 @@ def preprocess_vm(test, params, env, name): scrdump_filename = os.path.join(test.debugdir, "pre_%s.ppm" % name) try: if vm.monitor: - vm.monitor.screendump(scrdump_filename) + vm.monitor.screendump(scrdump_filename, debug=False) except kvm_monitor.MonitorError, e: logging.warn(e) @@ -121,7 +121,7 @@ def postprocess_vm(test, params, env, name): scrdump_filename = os.path.join(test.debugdir, "post_%s.ppm" % name) try: if vm.monitor: - vm.monitor.screendump(scrdump_filename) + vm.monitor.screendump(scrdump_filename, debug=False) except kvm_monitor.MonitorError, e: logging.warn(e) @@ -414,7 +414,7 @@ def _take_screendumps(test, params, env): if not vm.is_alive(): continue try: - vm.monitor.screendump(temp_filename) + vm.monitor.screendump(filename=temp_filename, debug=False) except kvm_monitor.MonitorError, e: logging.warn(e) continue diff --git a/client/tests/kvm/tests/stepmaker.py b/client/tests/kvm/tests/stepmaker.py index 5a9acdc..54f0e2b 100755 --- a/client/tests/kvm/tests/stepmaker.py +++ b/client/tests/kvm/tests/stepmaker.py @@ -138,7 +138,7 @@ class StepMaker(stepeditor.StepMakerWindow): os.unlink(self.screendump_filename) try: - self.vm.monitor.screendump(self.screendump_filename) + self.vm.monitor.screendump(self.screendump_filename, debug=False) except kvm_monitor.MonitorError, e: logging.warn(e) else: @@ -292,7 +292,7 @@ class StepMaker(stepeditor.StepMakerWindow): os.unlink(self.screendump_filename) try: - self.vm.monitor.screendump(self.screendump_filename) + self.vm.monitor.screendump(self.screendump_filename, debug=False) except kvm_monitor.MonitorError, e: logging.warn(e) else: diff --git a/client/tests/kvm/tests/steps.py b/client/tests/kvm/tests/steps.py index 91b864d..3ad0143 100644 --- a/client/tests/kvm/tests/steps.py +++ b/client/tests/kvm/tests/steps.py @@ -86,7 +86,7 @@ def barrier_2(vm, words, params, debug_dir, data_scrdump_filename, # Request screendump try: - vm.monitor.screendump(scrdump_filename) + vm.monitor.screendump(scrdump_filename, debug=False) except kvm_monitor.MonitorError, e: logging.warn(e) continue