From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 36F88A04CC; Mon, 21 Sep 2020 13:51:24 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EEC181D9AA; Mon, 21 Sep 2020 13:50:50 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 77F061D917 for ; Mon, 21 Sep 2020 13:50:44 +0200 (CEST) IronPort-SDR: /TFr5xgayPEaU9gvq+N4PEN+nLteKwFdzfVfQt9wqhPGxE+2OqYov42yG3tXSoaMq9Z2qNje2G nGXelHMgzQ9w== X-IronPort-AV: E=McAfee;i="6000,8403,9750"; a="224504302" X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="224504302" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2020 04:50:44 -0700 IronPort-SDR: SxWjXO6lsz7shgwDJv3+Jh2L0wkri0YbkH/qMzxpX6Q937bcSyIfz2cKwWyA3FWaAQCDEDcLml vQ9tX8+dfQmA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,286,1596524400"; d="scan'208";a="348060204" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by orsmga007.jf.intel.com with ESMTP; 21 Sep 2020 04:50:42 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, anatoly.burakov@intel.com, robin.jarry@6wind.com, david.marchard@redhat.com, Kevin Laatz , Olivier Matz , Louise Kilheeney Date: Mon, 21 Sep 2020 12:46:29 +0100 Message-Id: <20200921114634.220328-6-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921114634.220328-1-kevin.laatz@intel.com> References: <20200821091452.2482-1-louise.kilheeney@intel.com> <20200921114634.220328-1-kevin.laatz@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v6 05/10] app/test-cmdline: support python3 only X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Changed script to explicitly use python3 only to avoid maintaining python 2 and removed deprecation notice. Cc: Olivier Matz Signed-off-by: Louise Kilheeney Signed-off-by: Kevin Laatz Reviewed-by: Bruce Richardson --- v5: - fixed python3 issue causing script to fail. Divisions without the typecast lead to a floating point result, which was messing up the loop. v6: - Removed changes to mk/rte.sdktest.mk since it no longer exists. --- app/test-cmdline/cmdline_test.py | 9 ++------- app/test-cmdline/cmdline_test_data.py | 1 + 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/test-cmdline/cmdline_test.py b/app/test-cmdline/cmdline_test.py index 954428e2bf..074fed7e7f 100755 --- a/app/test-cmdline/cmdline_test.py +++ b/app/test-cmdline/cmdline_test.py @@ -1,9 +1,8 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation # Script that runs cmdline_test app and feeds keystrokes into it. -from __future__ import print_function import cmdline_test_data import os import pexpect @@ -19,10 +18,6 @@ def runTest(child, test): return 0 child.expect(test["Result"], 1) -if sys.version_info.major < 3: - print("WARNING: Python 2 is deprecated for use in DPDK, and will not work in future releases.", file=sys.stderr) - print("Please use Python 3 instead", file=sys.stderr) - # # history test is a special case # @@ -43,7 +38,7 @@ def runHistoryTest(child): i = 0 # fill the history with numbers - while i < history_size / 10: + while i < int(history_size / 10): # add 1 to prevent from parsing as octals child.send("1" + str(i).zfill(8) + cmdline_test_data.ENTER) # the app will simply print out the number diff --git a/app/test-cmdline/cmdline_test_data.py b/app/test-cmdline/cmdline_test_data.py index 114d2cb6a0..2d9b3262a6 100644 --- a/app/test-cmdline/cmdline_test_data.py +++ b/app/test-cmdline/cmdline_test_data.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -- 2.25.1