faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test: support ss as netstat replacement

Browse source 
netstat is considered obsolete on Linux. It is replaced by ss from
iproute. Support both tools for the test port selection.
This commit is contained in:
Miroslav Lichvar 2021-01-13 17:01:01 +01:00
parent 624b76e86e
commit 82ddc6a883
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
test/system/test.common
View file

@ -89,7 +89,13 @@ chronyc=$(command -v chronyc)
[ -x "$chronyd" ] || test_skip "chronyd not found" [ -x "$chronyd" ] || test_skip "chronyd not found"
[ -x "$chronyc" ] || test_skip "chronyc not found" [ -x "$chronyc" ] || test_skip "chronyc not found"
netstat -aln > /dev/null 2> /dev/null || test_skip "missing netstat" if netstat -aln > /dev/null 2> /dev/null; then
port_list_command="netstat -aln"
elif ss -atun > /dev/null 2> /dev/null; then
port_list_command="ss -atun"
else
test_skip "missing netstat or ss"
fi
# Default test testings # Default test testings
default_minimal_config=0 default_minimal_config=0
@ -180,7 +186,7 @@ get_free_port() {
while true; do while true; do
port=$((RANDOM % 10000 + 10000)) port=$((RANDOM % 10000 + 10000))
netstat -aln | grep -q '^\(tcp\|udp\).*[:.]'"$port " && continue $port_list_command | grep -q '^\(tcp\|udp\).*[:.]'"$port " && continue
break break
done done