From patchwork Wed May 12 16:12:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tu, Lijuan" X-Patchwork-Id: 93190 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B8527A0C42; Wed, 12 May 2021 10:14:31 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 82E1C4003F; Wed, 12 May 2021 10:14:31 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id EA8B64003E for ; Wed, 12 May 2021 10:14:29 +0200 (CEST) IronPort-SDR: +f7+x43op1bSmlm8e605ez5aS1dtB9Ni6OqoK9jFbvXYwPbXQTlpybnte97/kolRXw5XnkomsA DoebPaXFWMMA== X-IronPort-AV: E=McAfee;i="6200,9189,9981"; a="187076007" X-IronPort-AV: E=Sophos;i="5.82,293,1613462400"; d="scan'208";a="187076007" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 May 2021 01:14:26 -0700 IronPort-SDR: JTOifb97juSrdmhu0B/fj7Pf5F6wo5nY/e+/DPSQ+oUUp0d5OHD2TTf1wdJsi2ZPB2pc1QWloL 8iEVUbkBXBJA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,293,1613462400"; d="scan'208";a="625210519" Received: from unknown (HELO dpdk-lijuan.sh.intel.com) ([10.67.119.192]) by fmsmga005.fm.intel.com with ESMTP; 12 May 2021 01:14:24 -0700 From: Lijuan Tu To: ohilyard@iol.unh.edu, dliu@iol.unh.edu Cc: dts@dpdk.org, Lijuan Tu Date: Thu, 13 May 2021 00:12:01 +0800 Message-Id: <1620835921-182513-1-git-send-email-lijuan.tu@intel.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dts] [PATCH] Revert "Strip prompt by default in send_expect" X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" This reverts commit f498f50a62e30f6f8fb9c4e1a759e3d35861b978. As it casued some cases failed: * flow_classify_softnic * test_ipv4_acl_jump * test_ipv4_acl_table * test_ipv6_hash_jump * unit_tests_loopback * test_link_mode * test_loopback_mode * distributor * maximum_workers --- framework/crb.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/framework/crb.py b/framework/crb.py index 3964e21..e7c1cc1 100644 --- a/framework/crb.py +++ b/framework/crb.py @@ -79,19 +79,12 @@ class Crb(object): self.alt_session = None def send_expect(self, cmds, expected, timeout=TIMEOUT, - alt_session=False, verify=False, trim_whitespace=True): + alt_session=False, verify=False): """ Send commands to crb and return string before expected string. If there's no expected string found before timeout, TimeoutException will be raised. - - By default, it will trim the whitespace from the expected string. This - behavior can be turned off via the trim_whitespace argument. """ - - if trim_whitespace: - expected = expected.strip() - # sometimes there will be no alt_session like VM dut if alt_session and self.alt_session: return self.alt_session.session.send_expect(cmds, expected,