diff options
author | Miroslav Lichvar <mlichvar@redhat.com> | 2019-06-18 15:41:50 +0200 |
---|---|---|
committer | Vincent Blut <vincent.debian@free.fr> | 2019-08-13 17:57:47 +0200 |
commit | 44bbfc3a761332e46724af409b7a6e584b4b02be (patch) | |
tree | 79501c3f92336ec923f72f6ea7b56583ff6de4fc | |
parent | ed98c7ed3a6df2a400ec1383b18f5780b5924a00 (diff) |
test: update processing of packet logarchive/debian/3.5-3
Two new fields have been added to the packet log, which broke some
of the simulation tests.
Applied-Upstream: https://git.tuxfamily.org/chrony/chrony.git/commit/?id=62d6aed6a64b887c9e3b7f03d9e0db1deaa2696a
Gbp-Pq: Name update_processing_of_packet_log.patch
-rw-r--r-- | test/simulation/test.common | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/simulation/test.common b/test/simulation/test.common index 951a794..8ed6ad9 100644 --- a/test/simulation/test.common +++ b/test/simulation/test.common @@ -391,9 +391,9 @@ check_packet_port() { for i in $(seq 1 $(get_chronyd_nodes)); do test_message 3 0 "node $i:" - grep -E -q " $port [0-9]+\$" tmp/log.packets && \ + grep -E -q "^([0-9e.+-]+ ){5}$port " tmp/log.packets && \ ! grep -E "^[0-9e.+-]+ $i " tmp/log.packets | \ - grep -E -q -v " $port [0-9]+\$" && \ + grep -E -q -v "^([0-9e.+-]+ ){5}$port " && \ test_ok || test_bad [ $? -eq 0 ] || ret=1 done |