git: 4e860bd5da14 - main - pf tests: make killstate:match more robust

[Kristof Provost]

The branch main has been updated by kp:

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

commit 4e860bd5da1423aac9aed0541c484ebf9c1d1621
Author:     Kristof Provost <kp at FreeBSD.org>
AuthorDate: 2021-07-27 13:31:00 +0000
Commit:     Kristof Provost <kp at FreeBSD.org>
CommitDate: 2021-07-27 13:32:48 +0000

    pf tests: make killstate:match more robust
    
    Only lists the states relevant to the connection we're killing.
    Sometimes there are IPv6 related states (due to the usual IPv6
    background traffic of router solicitations, DAD, ...) that causes us to
    think we failed to kill the state, which in turn caused the test to fail
    intermittently.
    
    MFC after:      3 days
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 tests/sys/netpfil/pf/killstate.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/sys/netpfil/pf/killstate.sh b/tests/sys/netpfil/pf/killstate.sh
index f53ede8c7578..e140ee4d144d 100644
--- a/tests/sys/netpfil/pf/killstate.sh
+++ b/tests/sys/netpfil/pf/killstate.sh
@@ -426,7 +426,7 @@ match_body()
 	wait_for_state alcatraz 192.0.2.1
 
 	# Expect two states
-	states=$(jexec alcatraz pfctl -s s | wc -l)
+	states=$(jexec alcatraz pfctl -s s | grep 192.0.2.1 | wc -l)
 	if [ $states -ne 2 ] ;
 	then
 		atf_fail "Expected two states, found $states"
@@ -434,7 +434,7 @@ match_body()
 
 	# If we don't kill the matching NAT state one should be left
 	jexec alcatraz pfctl -k 192.0.2.1
-	states=$(jexec alcatraz pfctl -s s | wc -l)
+	states=$(jexec alcatraz pfctl -s s | grep 192.0.2.1 | wc -l)
 	if [ $states -ne 1 ] ;
 	then
 		atf_fail "Expected one states, found $states"
@@ -448,7 +448,7 @@ match_body()
 
 	# Kill matching states, expect all of them to be gone
 	jexec alcatraz pfctl -M -k 192.0.2.1
-	states=$(jexec alcatraz pfctl -s s | wc -l)
+	states=$(jexec alcatraz pfctl -s s | grep 192.0.2.1 | wc -l)
 	if [ $states -ne 0 ] ;
 	then
 		atf_fail "Expected zero states, found $states"