Skip to content

Commit

Permalink
tests: Skip EDNS test if the scapy version doesn't support it.
Browse files Browse the repository at this point in the history
EDNS0ClientSubnet is quite a recent addition to scapy and not all
distros might already have a new enough version of scapy available.

Fixes: b7fe2c8 ("pinctrl: dns: Ignore additional records.")
Signed-off-by: Dumitru Ceara <dceara@redhat.com>
Acked-by: Ales Musil <amusil@redhat.com>
(cherry picked from commit dbca38f)
  • Loading branch information
dceara committed Mar 8, 2024
1 parent 03db09a commit 2bc6ac5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 6 additions & 0 deletions tests/ovn-macros.at
Original file line number Diff line number Diff line change
Expand Up @@ -874,3 +874,9 @@ m4_define([HOST_HAS_LOW_CORES], [
m4_define([NORTHD_PARALLELIZATION], [
HOST_HAS_LOW_CORES([OVN_NORTHD_PARALLELIZATION_DUMMY], [OVN_NORTHD_PARALLELIZATION_NO_DUMMY])
])

m4_define([OVN_CHECK_SCAPY_EDNS_CLIENT_SUBNET_SUPPORT],
[
AT_SKIP_IF([test $HAVE_SCAPY = no])
AT_SKIP_IF([! echo "from scapy.layers.dns import EDNS0ClientSubnet" | python 2>&1 > /dev/null])
])
2 changes: 1 addition & 1 deletion tests/ovn.at
Original file line number Diff line number Diff line change
Expand Up @@ -10877,7 +10877,7 @@ AT_CLEANUP

OVN_FOR_EACH_NORTHD([
AT_SETUP([dns lookup : EDNS])
AT_SKIP_IF([test $HAVE_SCAPY = no])
OVN_CHECK_SCAPY_EDNS_CLIENT_SUBNET_SUPPORT()
ovn_start

check ovn-nbctl ls-add ls \
Expand Down

0 comments on commit 2bc6ac5

Please sign in to comment.