From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
To: dev <dev@dpdk.org>
Cc: Luca Boccassi <bluca@debian.org>,
Christian Ehrhardt <christian.ehrhardt@canonical.com>
Subject: [dpdk-dev] [PATCH] autotest: fix for pure python3 environments
Date: Thu, 7 May 2020 09:26:29 +0200 [thread overview]
Message-ID: <20200507072629.2374881-1-christian.ehrhardt@canonical.com> (raw)
Without this fix in a pure python3 environment this will run into
issues like:
ModuleNotFoundError: No module named 'StringIO'
or later string encoding issues on check_output.
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
app/test/autotest_runner.py | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/app/test/autotest_runner.py b/app/test/autotest_runner.py
index 95e74c760d..dfa5f2b2dd 100644
--- a/app/test/autotest_runner.py
+++ b/app/test/autotest_runner.py
@@ -4,7 +4,7 @@
# The main logic behind running autotests in parallel
from __future__ import print_function
-import StringIO
+import io
import csv
from multiprocessing import Pool, Queue
import pexpect
@@ -45,11 +45,9 @@ def get_numa_nodes():
def first_cpu_on_node(node_nr):
cpu_path = glob.glob("/sys/devices/system/node/node%d/cpu*" % node_nr)
r = re.compile(r"cpu(\d+)")
- cpu_name = filter(None,
- map(r.match,
- map(os.path.basename, cpu_path)
- )
- )
+ cpu_name = [_f for _f in map(r.match,
+ list(map(os.path.basename, cpu_path))
+ ) if _f]
# for compatibility between python 3 and 2 we need to make interable out
# of filter return as it returns list in python 2 and a generator in 3
m = next(iter(cpu_name))
@@ -78,7 +76,7 @@ def pool_init(queue, result_queue):
cmdline = "%s %s" % (cmdline, prefix_cmdline)
# prepare logging of init
- startuplog = StringIO.StringIO()
+ startuplog = io.StringIO()
# run test app
try:
@@ -138,7 +136,7 @@ def run_test(target, test):
# create log buffer for each test
# in multiprocessing environment, the logging would be
# interleaved and will create a mess, hence the buffering
- logfile = StringIO.StringIO()
+ logfile = io.StringIO()
pool_child.logfile = logfile
# make a note when the test started
@@ -210,7 +208,7 @@ def __init__(self, cmdline, target, blacklist, whitelist, n_processes):
# parse the binary for available test commands
binary = cmdline.split()[0]
stripped = 'not stripped' not in \
- subprocess.check_output(['file', binary])
+ subprocess.check_output(['file', binary]).decode('utf-8')
if not stripped:
symbols = subprocess.check_output(['nm', binary]).decode('utf-8')
self.avail_cmds = re.findall('test_register_(\w+)', symbols)
--
2.26.0
next reply other threads:[~2020-05-07 7:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-07 7:26 Christian Ehrhardt [this message]
2020-05-07 9:36 ` Luca Boccassi
2020-05-07 11:25 ` Bruce Richardson
2020-06-04 14:43 ` Christian Ehrhardt
2020-06-04 16:22 ` Bruce Richardson
2020-05-07 9:43 ` Robin Jarry
2020-06-04 16:25 ` Bruce Richardson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200507072629.2374881-1-christian.ehrhardt@canonical.com \
--to=christian.ehrhardt@canonical.com \
--cc=bluca@debian.org \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).