This fixes the flake8 error on pyhton version older than 3.6
as ModuleNotFoundError in not available before 3.6 and that is now
replaced to ImportError which is present in earlier versions.
../../tests/mfex_fuzzy.py:5:8: F821 undefined name 'ModuleNotFoundError'
2653Makefile:5826: recipe for target 'flake8-check' failed
Fixes: 50be6715c0 ("test/sytem-dpdk: Add unit test for mfex autovalidator")
Signed-off-by: kumar Amber <[email protected]>
--
v2:
- remove try and catch
- change pip3 to import to skip the fuzzy tests.
--
---
tests/mfex_fuzzy.py | 7 ++-----
tests/system-dpdk.at | 2 +-
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/tests/mfex_fuzzy.py b/tests/mfex_fuzzy.py
index 5b056bb48..73e39d9de 100755
--- a/tests/mfex_fuzzy.py
+++ b/tests/mfex_fuzzy.py
@@ -1,9 +1,6 @@
#!/usr/bin/python3
-try:
- from scapy.all import RandMAC, RandIP, PcapWriter, RandIP6, RandShort, fuzz
- from scapy.all import IPv6, Dot1Q, IP, Ether, UDP, TCP
-except ModuleNotFoundError as err:
- print(err + ": Scapy")
+from scapy.all import RandMAC, RandIP, PcapWriter, RandIP6, RandShort, fuzz
+from scapy.all import IPv6, Dot1Q, IP, Ether, UDP, TCP
import sys
path = str(sys.argv[1]) + "/pcap/fuzzy.pcap"
diff --git a/tests/system-dpdk.at b/tests/system-dpdk.at
index 7091a58ad..e0e750fde 100644
--- a/tests/system-dpdk.at
+++ b/tests/system-dpdk.at
@@ -263,7 +263,7 @@ dnl
--------------------------------------------------------------------------
dnl Add standard DPDK PHY port
AT_SETUP([OVS-DPDK - MFEX Autovalidator Fuzzy])
AT_KEYWORDS([dpdk])
-AT_SKIP_IF([! pip3 list | grep scapy], [], [])
+AT_SKIP_IF([! $PYTHON3 -c "import scapy"], [], [])
AT_CHECK([$PYTHON3 $srcdir/mfex_fuzzy.py $srcdir], [], [stdout])
OVS_DPDK_START()
--
2.25.1
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
