From patchwork Mon May 17 13:29:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 100122 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4HDUwTs008505 for ; Mon, 17 May 2010 13:30:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755351Ab0EQNa0 (ORCPT ); Mon, 17 May 2010 09:30:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32904 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751735Ab0EQNaW (ORCPT ); Mon, 17 May 2010 09:30:22 -0400 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 o4HDUK2H018188 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 17 May 2010 09:30:20 -0400 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 o4HDUJtq030176; Mon, 17 May 2010 09:30:20 -0400 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 o4HDUGA3029225; Mon, 17 May 2010 09:30:18 -0400 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH] KVM test: make use of tcpdump optional Date: Mon, 17 May 2010 16:29:34 +0300 Message-Id: <1274102975-32453-2-git-send-email-mgoldish@redhat.com> In-Reply-To: <1274102975-32453-1-git-send-email-mgoldish@redhat.com> References: <1274102975-32453-1-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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 17 May 2010 13:30:59 +0000 (UTC) diff --git a/client/tests/kvm/kvm_preprocessing.py b/client/tests/kvm/kvm_preprocessing.py index 50db65c..e11207a 100644 --- a/client/tests/kvm/kvm_preprocessing.py +++ b/client/tests/kvm/kvm_preprocessing.py @@ -196,7 +196,7 @@ def preprocess(test, params, env): if "tcpdump" in env and not env["tcpdump"].is_alive(): env["tcpdump"].close() del env["tcpdump"] - if "tcpdump" not in env: + if "tcpdump" not in env and params.get("run_tcpdump", "yes") == "yes": command = "/usr/sbin/tcpdump -npvi any 'dst port 68'" logging.debug("Starting tcpdump (%s)...", command) env["tcpdump"] = kvm_subprocess.kvm_tail( diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index c9dfd0b..1276267 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -46,6 +46,7 @@ nic_mode = user #nic_mode = tap nic_script = scripts/qemu-ifup address_index = 0 +run_tcpdump = yes # Misc run_kvm_stat = yes