Page MenuHomeFreeBSD
Files F144386510

D38053.id115140.diff
No OneTemporary
Actions

D38053.id115140.diff
View Options

diff --git a/sbin/ping/tests/Makefile b/sbin/ping/tests/Makefile
--- a/sbin/ping/tests/Makefile
+++ b/sbin/ping/tests/Makefile
@@ -5,6 +5,7 @@
PACKAGE= tests
+ATF_TESTS_PYTEST+= test_ping.py
ATF_TESTS_SH+= ping_test
# Exclusive because each injection test case uses the same IP addresses
TEST_METADATA.ping_test+= is_exclusive="true"
diff --git a/sbin/ping/tests/test_ping.py b/sbin/ping/tests/test_ping.py
new file mode 100644
--- /dev/null
+++ b/sbin/ping/tests/test_ping.py
@@ -0,0 +1,476 @@
+import pytest
+
+import re
+import types
+import subprocess
+
+from atf_python.sys.net.vnet import SingleVnetTestTemplate
+from typing import List
+
+
+def generate_test_ids(args):
+ """Replace spaces, hyphens, dots, and colons with underscores."""
+ return ("_").join(
+ args.replace(" -", "_")
+ .replace("-", "_")
+ .replace(".", "_")
+ .replace(":", "_")
+ .split()
+ )
+
+
+def redact(output):
+ """Redact some elements of ping's output."""
+ patterns_tuple = [
+ ("localhost \([0-9]{1,3}(\.[0-9]{1,3}){3}\)", "localhost"),
+ ("from [0-9]{1,3}(\.[0-9]{1,3}){3}", "from"),
+ ("hlim=[0-9]*", "hlim="),
+ ("ttl=[0-9]*", "ttl="),
+ ("time=[0-9.-]*", "time="),
+ ("[0-9\.]+/[0-9.]+", "/"),
+ ]
+ for pattern, repl in patterns_tuple:
+ output = re.sub(pattern, repl, output)
+ return output
+
+
+# XXX Better name?
+# XXX Or add args and use subprocess.CompletedProcess instead?
+class ExpectedProcess(object):
+ """An expected ping output.
+
+ Attributes:
+ returncode: The exit code of the process, negative for signals.
+ stdout: The standard output ('' if none).
+ stderr: The standard error ('' if none).
+ """
+
+ def __init__(self, returncode, stdout="", stderr=""):
+ self.returncode = returncode
+ self.stdout = stdout
+ self.stderr = stderr
+
+ def __repr__(self):
+ args = ["returncode={!r}".format(self.returncode)]
+ if self.stdout is not None:
+ args.append("stdout={!r}".format(self.stdout))
+ if self.stderr is not None:
+ args.append("stderr={!r}".format(self.stderr))
+ return "{}({})".format(type(self).__name__, ", ".join(args))
+
+ __class_getitem__ = classmethod(types.GenericAlias)
+
+
+class TestPing(SingleVnetTestTemplate):
+ # XXX ping_test.sh has require_ipv4/require_ipv6 methods.
+ # These checks, in my opinion, should be done by atf-python,
+ # as we should focus only on writing tests.
+ IPV6_PREFIXES: List[str] = ["2001:db8::1/64"]
+ IPV4_PREFIXES: List[str] = ["192.0.2.1/24"]
+
+ # Each test in testdata is a tuple (args, ExpectedProcess())
+ testdata = [
+ (
+ "-4 -c1 -s56 -t1 localhost",
+ ExpectedProcess(
+ 0,
+ stdout="""\
+PING localhost: 56 data bytes
+64 bytes from: icmp_seq=0 ttl= time= ms
+
+--- localhost ping statistics ---
+1 packets transmitted, 1 packets received, 0.0% packet loss
+round-trip min/avg/max/stddev = /// ms
+""",
+ ),
+ ),
+ (
+ "-6 -c1 -s8 -t1 localhost",
+ ExpectedProcess(
+ 0,
+ stdout="""\
+PING6(56=40+8+8 bytes) ::1 --> ::1
+16 bytes from ::1, icmp_seq=0 hlim= time= ms
+
+--- localhost ping6 statistics ---
+1 packets transmitted, 1 packets received, 0.0% packet loss
+round-trip min/avg/max/std-dev = /// ms
+""",
+ ),
+ ),
+ (
+ "-A -c1 192.0.2.1",
+ ExpectedProcess(
+ 0,
+ stdout="""\
+PING 192.0.2.1 (192.0.2.1): 56 data bytes
+64 bytes from: icmp_seq=0 ttl= time= ms
+
+--- 192.0.2.1 ping statistics ---
+1 packets transmitted, 1 packets received, 0.0% packet loss
+round-trip min/avg/max/stddev = /// ms
+""",
+ ),
+ ),
+ (
+ "-A -c1 192.0.2.2",
+ ExpectedProcess(
+ 2,
+ stdout="""\
+\x07PING 192.0.2.2 (192.0.2.2): 56 data bytes
+Request timeout for icmp_seq 0
+
+--- 192.0.2.2 ping statistics ---
+1 packets transmitted, 0 packets received, 100.0% packet loss
+""",
+ ),
+ ),
+ (
+ "-A -c1 2001:db8::1",
+ ExpectedProcess(
+ 0,
+ stdout="""\
+PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1
+16 bytes from 2001:db8::1, icmp_seq=0 hlim= time= ms
+
+--- 2001:db8::1 ping6 statistics ---
+1 packets transmitted, 1 packets received, 0.0% packet loss
+round-trip min/avg/max/std-dev = /// ms
+""",
+ ),
+ ),
+ (
+ "-A -c1 2001:db8::2",
+ ExpectedProcess(
+ 2,
+ stdout="""\
+\x07PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2
+Request timeout for icmp_seq=0
+
+--- 2001:db8::2 ping6 statistics ---
+1 packets transmitted, 0 packets received, 100.0% packet loss
+""",
+ ),
+ ),
+ (
+ "-A -c3 192.0.2.1",
+ ExpectedProcess(
+ 0,
+ stdout="""\
+PING 192.0.2.1 (192.0.2.1): 56 data bytes
+64 bytes from: icmp_seq=0 ttl= time= ms
+64 bytes from: icmp_seq=1 ttl= time= ms
+64 bytes from: icmp_seq=2 ttl= time= ms
+
+--- 192.0.2.1 ping statistics ---
+3 packets transmitted, 3 packets received, 0.0% packet loss
+round-trip min/avg/max/stddev = /// ms
+""",
+ ),
+ ),
+ (
+ "-A -c3 192.0.2.2",
+ ExpectedProcess(
+ 2,
+ stdout="""\
+\x07PING 192.0.2.2 (192.0.2.2): 56 data bytes
+Request timeout for icmp_seq 0
+\x07Request timeout for icmp_seq 1
+\x07Request timeout for icmp_seq 2
+
+--- 192.0.2.2 ping statistics ---
+3 packets transmitted, 0 packets received, 100.0% packet loss
+""",
+ ),
+ ),
+ (
+ "-A -c3 2001:db8::1",
+ ExpectedProcess(
+ 0,
+ stdout="""\
+PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1
+16 bytes from 2001:db8::1, icmp_seq=0 hlim= time= ms
+16 bytes from 2001:db8::1, icmp_seq=1 hlim= time= ms
+16 bytes from 2001:db8::1, icmp_seq=2 hlim= time= ms
+
+--- 2001:db8::1 ping6 statistics ---
+3 packets transmitted, 3 packets received, 0.0% packet loss
+round-trip min/avg/max/std-dev = /// ms
+""",
+ ),
+ ),
+ (
+ "-A -c3 2001:db8::2",
+ ExpectedProcess(
+ 2,
+ stdout="""\
+\x07PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2
+Request timeout for icmp_seq=0
+\x07Request timeout for icmp_seq=1
+\x07Request timeout for icmp_seq=2
+
+--- 2001:db8::2 ping6 statistics ---
+3 packets transmitted, 0 packets received, 100.0% packet loss
+""",
+ ),
+ ),
+ (
+ "-c1 192.0.2.1",
+ ExpectedProcess(
+ 0,
+ stdout="""\
+PING 192.0.2.1 (192.0.2.1): 56 data bytes
+64 bytes from: icmp_seq=0 ttl= time= ms
+
+--- 192.0.2.1 ping statistics ---
+1 packets transmitted, 1 packets received, 0.0% packet loss
+round-trip min/avg/max/stddev = /// ms
+""",
+ ),
+ ),
+ (
+ "-c1 192.0.2.2",
+ ExpectedProcess(
+ 2,
+ stdout="""\
+PING 192.0.2.2 (192.0.2.2): 56 data bytes
+Request timeout for icmp_seq 0
+
+--- 192.0.2.2 ping statistics ---
+1 packets transmitted, 0 packets received, 100.0% packet loss
+""",
+ ),
+ ),
+ (
+ "-c1 2001:db8::1",
+ ExpectedProcess(
+ 0,
+ stdout="""\
+PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1
+16 bytes from 2001:db8::1, icmp_seq=0 hlim= time= ms
+
+--- 2001:db8::1 ping6 statistics ---
+1 packets transmitted, 1 packets received, 0.0% packet loss
+round-trip min/avg/max/std-dev = /// ms
+""",
+ ),
+ ),
+ (
+ "-c1 2001:db8::2",
+ ExpectedProcess(
+ 2,
+ stdout="""\
+PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2
+Request timeout for icmp_seq=0
+
+--- 2001:db8::2 ping6 statistics ---
+1 packets transmitted, 0 packets received, 100.0% packet loss
+""",
+ ),
+ ),
+ (
+ "-c1 -S127.0.0.1 -s56 -t1 localhost",
+ ExpectedProcess(
+ 0,
+ stdout="""\
+PING localhost from: 56 data bytes
+64 bytes from: icmp_seq=0 ttl= time= ms
+
+--- localhost ping statistics ---
+1 packets transmitted, 1 packets received, 0.0% packet loss
+round-trip min/avg/max/stddev = /// ms
+""",
+ ),
+ ),
+ (
+ "-c1 -S::1 -s8 -t1 localhost",
+ ExpectedProcess(
+ 0,
+ stdout="""\
+PING6(56=40+8+8 bytes) ::1 --> ::1
+16 bytes from ::1, icmp_seq=0 hlim= time= ms
+
+--- localhost ping6 statistics ---
+1 packets transmitted, 1 packets received, 0.0% packet loss
+round-trip min/avg/max/std-dev = /// ms
+""",
+ ),
+ ),
+ (
+ "-c3 192.0.2.1",
+ ExpectedProcess(
+ 0,
+ stdout="""\
+PING 192.0.2.1 (192.0.2.1): 56 data bytes
+64 bytes from: icmp_seq=0 ttl= time= ms
+64 bytes from: icmp_seq=1 ttl= time= ms
+64 bytes from: icmp_seq=2 ttl= time= ms
+
+--- 192.0.2.1 ping statistics ---
+3 packets transmitted, 3 packets received, 0.0% packet loss
+round-trip min/avg/max/stddev = /// ms
+""",
+ ),
+ ),
+ (
+ "-c3 192.0.2.2",
+ ExpectedProcess(
+ 2,
+ stdout="""\
+PING 192.0.2.2 (192.0.2.2): 56 data bytes
+Request timeout for icmp_seq 0
+Request timeout for icmp_seq 1
+Request timeout for icmp_seq 2
+
+--- 192.0.2.2 ping statistics ---
+3 packets transmitted, 0 packets received, 100.0% packet loss
+""",
+ ),
+ ),
+ (
+ "-c3 2001:db8::1",
+ ExpectedProcess(
+ 0,
+ stdout="""\
+PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1
+16 bytes from 2001:db8::1, icmp_seq=0 hlim= time= ms
+16 bytes from 2001:db8::1, icmp_seq=1 hlim= time= ms
+16 bytes from 2001:db8::1, icmp_seq=2 hlim= time= ms
+
+--- 2001:db8::1 ping6 statistics ---
+3 packets transmitted, 3 packets received, 0.0% packet loss
+round-trip min/avg/max/std-dev = /// ms
+""",
+ ),
+ ),
+ (
+ "-c3 2001:db8::2",
+ ExpectedProcess(
+ 2,
+ stdout="""\
+PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2
+Request timeout for icmp_seq=0
+Request timeout for icmp_seq=1
+Request timeout for icmp_seq=2
+
+--- 2001:db8::2 ping6 statistics ---
+3 packets transmitted, 0 packets received, 100.0% packet loss
+""",
+ ),
+ ),
+ (
+ "-q -c1 192.0.2.1",
+ ExpectedProcess(
+ 0,
+ stdout="""\
+PING 192.0.2.1 (192.0.2.1): 56 data bytes
+
+--- 192.0.2.1 ping statistics ---
+1 packets transmitted, 1 packets received, 0.0% packet loss
+round-trip min/avg/max/stddev = /// ms
+""",
+ ),
+ ),
+ (
+ "-q -c1 192.0.2.2",
+ ExpectedProcess(
+ 2,
+ stdout="""\
+PING 192.0.2.2 (192.0.2.2): 56 data bytes
+
+--- 192.0.2.2 ping statistics ---
+1 packets transmitted, 0 packets received, 100.0% packet loss
+""",
+ ),
+ ),
+ (
+ "-q -c1 2001:db8::1",
+ ExpectedProcess(
+ 0,
+ stdout="""\
+PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1
+
+--- 2001:db8::1 ping6 statistics ---
+1 packets transmitted, 1 packets received, 0.0% packet loss
+round-trip min/avg/max/std-dev = /// ms
+""",
+ ),
+ ),
+ (
+ "-q -c1 2001:db8::2",
+ ExpectedProcess(
+ 2,
+ stdout="""\
+PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2
+
+--- 2001:db8::2 ping6 statistics ---
+1 packets transmitted, 0 packets received, 100.0% packet loss
+""",
+ ),
+ ),
+ (
+ "-q -c3 192.0.2.1",
+ ExpectedProcess(
+ 0,
+ stdout="""\
+PING 192.0.2.1 (192.0.2.1): 56 data bytes
+
+--- 192.0.2.1 ping statistics ---
+3 packets transmitted, 3 packets received, 0.0% packet loss
+round-trip min/avg/max/stddev = /// ms
+""",
+ ),
+ ),
+ (
+ "-q -c3 192.0.2.2",
+ ExpectedProcess(
+ 2,
+ stdout="""\
+PING 192.0.2.2 (192.0.2.2): 56 data bytes
+
+--- 192.0.2.2 ping statistics ---
+3 packets transmitted, 0 packets received, 100.0% packet loss
+""",
+ ),
+ ),
+ (
+ "-q -c3 2001:db8::1",
+ ExpectedProcess(
+ 0,
+ stdout="""\
+PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::1
+
+--- 2001:db8::1 ping6 statistics ---
+3 packets transmitted, 3 packets received, 0.0% packet loss
+round-trip min/avg/max/std-dev = /// ms
+""",
+ ),
+ ),
+ (
+ "-q -c3 2001:db8::2",
+ ExpectedProcess(
+ 2,
+ stdout="""\
+PING6(56=40+8+8 bytes) 2001:db8::1 --> 2001:db8::2
+
+--- 2001:db8::2 ping6 statistics ---
+3 packets transmitted, 0 packets received, 100.0% packet loss
+""",
+ ),
+ ),
+ (
+ "-Wx localhost",
+ ExpectedProcess(64, stderr="ping: invalid timing interval: `x'\n"),
+ ),
+ ]
+ test_ids = [generate_test_ids(test[0]) for test in testdata]
+
+ @pytest.mark.parametrize("args, expected", testdata, ids=test_ids)
+ def test_ping(self, args, expected):
+ """Test ping"""
+ ping = subprocess.run(
+ f"ping {args}".split(), capture_output=True, timeout=15, text=True
+ )
+ assert ping.returncode == expected.returncode
+ assert redact(ping.stdout) == expected.stdout
+ assert ping.stderr == expected.stderr

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 9, 4:30 AM (20 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28537264
Default Alt Text
D38053.id115140.diff (13 KB)

Event Timeline