From b951ad84ab542aaebb646bf61130618b5fef8bda Mon Sep 17 00:00:00 2001 From: Paul Vinciguerra Date: Tue, 8 Jan 2019 21:36:39 -0800 Subject: Simplify test/util.py:ppp. Change-Id: I10596335c7e8f51afc4bcee75132b7a25ebf2a4e Signed-off-by: Paul Vinciguerra --- test/util.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'test/util.py') diff --git a/test/util.py b/test/util.py index 9652b803f1d..cf45c85a5f4 100644 --- a/test/util.py +++ b/test/util.py @@ -19,15 +19,9 @@ from vpp_papi import mac_pton def ppp(headline, packet): """ Return string containing the output of scapy packet.show() call. """ - o = BytesIO() - old_stdout = sys.stdout - sys.stdout = o - print(headline) - hexdump(packet) - print("") - packet.show() - sys.stdout = old_stdout - return o.getvalue() + return '%s\n%s\n\n%s\n' % (headline, + hexdump(packet, dump=True), + packet.show(dump=True)) def ppc(headline, capture, limit=10): -- cgit 1.2.3-korg