git: 4c7c29a020c5 - stable/14 - ping: tests: Align with Scapy defaults

The branch stable/14 has been updated by jlduran:

URL: https://cgit.FreeBSD.org/src/commit/?id=4c7c29a020c5235eca369c89b9cc750a1d4e4656

commit 4c7c29a020c5235eca369c89b9cc750a1d4e4656
Author:     Jose Luis Duran <jlduran@FreeBSD.org>
AuthorDate: 2024-11-05 02:48:34 +0000
Commit:     Jose Luis Duran <jlduran@FreeBSD.org>
CommitDate: 2024-11-14 03:23:00 +0000

    ping: tests: Align with Scapy defaults
    
    Align some of pinger() defaults with Scapy to facilitate debugging when
    printing packets.
    
    No functional change intended.
    
    Reviewed by:    emaste, kp
    Approved by:    emaste (mentor)
    Differential Revision:  https://reviews.freebsd.org/D47159
    
    (cherry picked from commit 4859030ef193688153f490915794ae9ab77f012b)
---
 sbin/ping/tests/test_ping.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sbin/ping/tests/test_ping.py b/sbin/ping/tests/test_ping.py
index 90df07d0e5b9..cf2e46a146c8 100644
--- a/sbin/ping/tests/test_ping.py
+++ b/sbin/ping/tests/test_ping.py
@@ -63,14 +63,14 @@ def build_response_packet(echo, ip, icmp, oip_ihl, special):
     if icmp.type in icmp_id_seq_types:
         pkt = ip / icmp / load
     else:
-        ip.options = ""
+        del ip.options
         pkt = ip / icmp / oip / oicmp / load
     return pkt
 
 
 def generate_ip_options(opts):
     if not opts:
-        return ""
+        return []
 
     routers = [
         "192.0.2.10",
@@ -118,7 +118,7 @@ def generate_ip_options(opts):
         ToolsHelper.set_sysctl("net.inet.ip.process_options", 0)
         options = b"\x9f" * 40
     else:
-        options = ""
+        options = []
     return options
 
 
@@ -134,7 +134,7 @@ def pinger(
     icmp_code: sc.scapy.fields.MultiEnumField,
     # IP arguments
     ihl: Optional[sc.scapy.fields.BitField] = None,
-    flags: Optional[sc.scapy.fields.FlagsField] = None,
+    flags: Optional[sc.scapy.fields.FlagsField] = 0,
     opts: Optional[str] = None,
     oip_ihl: Optional[sc.scapy.fields.BitField] = None,
     special: Optional[str] = None,
@@ -169,7 +169,7 @@ def pinger(
 
     :keyword ihl: Internet Header Length, defaults to None
     :type ihl: class:`scapy.fields.BitField`, optional
-    :keyword flags: IP flags - one of `DF`, `MF` or `evil`, defaults to None
+    :keyword flags: IP flags - one of `DF`, `MF` or `evil`, defaults to 0
     :type flags: class:`scapy.fields.FlagsField`, optional
     :keyword opts: Include IP options - one of `EOL`, `NOP`, `NOP-40`, `unk`,
         `unk-40`, `RR`, `RR-same`, `RR-trunc`, `LSRR`, `LSRR-trunc`, `SSRR` or