diff --git a/.gitignore b/.gitignore index 826503f5c5..7f57500c84 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,9 @@ pcapkit-*-tempdir/ pcapkit-temp.html +# Guard the pre-rename path too: worktrees and older checkouts still hold +# generated captures at examples/sample/, and nothing should track them. +examples/sample/ examples/captures/* !examples/captures/out.json !examples/captures/out.plist diff --git a/MANIFEST.in b/MANIFEST.in index e59266219d..55cbf739c0 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -8,7 +8,6 @@ prune .github prune .venv prune docs prune examples/captures -prune examples/sample prune temp prune test diff --git a/examples/sample/arp.pcap b/examples/sample/arp.pcap deleted file mode 100644 index 571998cd84..0000000000 Binary files a/examples/sample/arp.pcap and /dev/null differ diff --git a/examples/sample/dhcp_big_endian.pcapng b/examples/sample/dhcp_big_endian.pcapng deleted file mode 100644 index 464a206ce4..0000000000 Binary files a/examples/sample/dhcp_big_endian.pcapng and /dev/null differ diff --git a/examples/sample/http.pcap b/examples/sample/http.pcap deleted file mode 100644 index b7ba7a8585..0000000000 Binary files a/examples/sample/http.pcap and /dev/null differ diff --git a/examples/sample/ipv4.pcap b/examples/sample/ipv4.pcap deleted file mode 100644 index 0dad7de37b..0000000000 Binary files a/examples/sample/ipv4.pcap and /dev/null differ diff --git a/examples/sample/ipv6.pcap b/examples/sample/ipv6.pcap deleted file mode 100644 index e50839e46e..0000000000 Binary files a/examples/sample/ipv6.pcap and /dev/null differ diff --git a/examples/sample/stream.pcap b/examples/sample/stream.pcap deleted file mode 100644 index 02cba7092a..0000000000 Binary files a/examples/sample/stream.pcap and /dev/null differ diff --git a/examples/sample/tcp.pcap b/examples/sample/tcp.pcap deleted file mode 100644 index e252a66f37..0000000000 Binary files a/examples/sample/tcp.pcap and /dev/null differ diff --git a/tests/protocols/internet/test_ipv6_extension_runtime.py b/tests/protocols/internet/test_ipv6_extension_runtime.py index 75fc79329f..bb9c513ae4 100644 --- a/tests/protocols/internet/test_ipv6_extension_runtime.py +++ b/tests/protocols/internet/test_ipv6_extension_runtime.py @@ -29,7 +29,7 @@ UDP_HEADER = (UDP_SRCPORT.to_bytes(2, 'big') + UDP_DSTPORT.to_bytes(2, 'big') + (8 + len(UDP_BODY)).to_bytes(2, 'big') + b'\x00\x00') -#: Fragment identification, matching the one in ``examples/sample/ipv6.pcap``. +#: Fragment identification, matching the one in ``examples/captures/ipv6.pcap``. FRAG_ID = 110308 @@ -131,7 +131,7 @@ class IPv6ExtensionPayloadOffsetTests(unittest.TestCase): """The next layer is read from after the *last* extension header. The datagrams here are built from bytes rather than read out of - ``examples/sample/``: no committed capture carries more than one IPv6 + ``examples/captures/``: no committed capture carries more than one IPv6 extension header, and the captures are pinned byte-for-byte by the rest of the suite, so a chain of several headers cannot be obtained from them. Parsing goes through :class:`~pcapkit.protocols.internet.ipv6.IPv6`