From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 736A3A04AF;
Fri, 21 Aug 2020 11:15:43 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 5B0471C112;
Fri, 21 Aug 2020 11:15:14 +0200 (CEST)
Received: from mga01.intel.com (mga01.intel.com [192.55.52.88])
by dpdk.org (Postfix) with ESMTP id 0FB9F1C0D5
for <dev@dpdk.org>; Fri, 21 Aug 2020 11:15:10 +0200 (CEST)
IronPort-SDR: VPMhcClRLJks7tICy/GE4CH6wQB/k6ZbWy/KbEdLlcAvtBwsCAF+DCBh217sPOgBmokt+vdIFu
uSamyLn5i9HQ==
X-IronPort-AV: E=McAfee;i="6000,8403,9719"; a="173544559"
X-IronPort-AV: E=Sophos;i="5.76,335,1592895600"; d="scan'208";a="173544559"
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from fmsmga005.fm.intel.com ([10.253.24.32])
by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
21 Aug 2020 02:15:10 -0700
IronPort-SDR: 1tl1pjPLsnksgbWixaTJtKK5govcfjaTPX9dWfbXKc/Nofi9rjvSFnvjS8Hhn0JzIMaQKWHhBG
898gjXK9a1AA==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.76,335,1592895600"; d="scan'208";a="498468661"
Received: from silpixa00389033.ir.intel.com (HELO
silpixa00389033.ger.corp.intel.com) ([10.237.223.171])
by fmsmga005.fm.intel.com with ESMTP; 21 Aug 2020 02:15:09 -0700
From: Louise Kilheeney <louise.kilheeney@intel.com>
To: dev@dpdk.org
Cc: robin.jarry@6wind.com, anatoly.burakov@intel.com,
bruce.richardson@intel.com, Louise Kilheeney <louise.kilheeney@intel.com>,
Olivier Matz <olivier.matz@6wind.com>
Date: Fri, 21 Aug 2020 10:14:48 +0100
Message-Id: <20200821091452.2482-6-louise.kilheeney@intel.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20200821091452.2482-1-louise.kilheeney@intel.com>
References: <20200522132320.26373-1-louise.kilheeney@intel.com>
<20200821091452.2482-1-louise.kilheeney@intel.com>
Subject: [dpdk-dev] [PATCH v5 5/9] 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 <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Changed script to explicitly use python3 only to avoid
maintaining python 2 and removed deprecation notice.
Cc: Olivier Matz <olivier.matz@6wind.com>
Signed-off-by: Louise Kilheeney <louise.kilheeney@intel.com>
---
v5: fixed python3 issue casuing script to fail
---
app/test-cmdline/cmdline_test.py | 9 ++-------
app/test-cmdline/cmdline_test_data.py | 1 +
mk/rte.sdktest.mk | 2 +-
3 files changed, 4 insertions(+), 8 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
diff --git a/mk/rte.sdktest.mk b/mk/rte.sdktest.mk
index 803018ba3a..ad7ef138f0 100644
--- a/mk/rte.sdktest.mk
+++ b/mk/rte.sdktest.mk
@@ -63,7 +63,7 @@ coverage:
@mkdir -p $(AUTOTEST_DIR) ; \
cd $(AUTOTEST_DIR) ; \
if [ -f $(RTE_OUTPUT)/app/test ]; then \
- python $(RTE_SDK)/test/cmdline_test/cmdline_test.py \
+ python3 $(RTE_SDK)/test/cmdline_test/cmdline_test.py \
$(RTE_OUTPUT)/app/cmdline_test; \
ulimit -S -n 100 ; \
python $(RTE_SDK)/app/test/autotest.py \
--
2.17.1