diff options
| author | Ben Pfaff <blp@ovn.org> | 2019-12-04 15:06:10 -0800 |
|---|---|---|
| committer | William Tu <u9012063@gmail.com> | 2019-12-12 10:16:14 -0800 |
| commit | 2235035119ed4220a6eb59f1614bf896c5c771c0 (patch) | |
| tree | 1147a222259199cc0d93b1f4a2e8ad2f7c839fdb /tests/ofproto.at | |
| parent | e6eef11145949bffb57160c5c709930791b5f2b4 (diff) | |
| download | openvswitch-2235035119ed4220a6eb59f1614bf896c5c771c0.tar.gz | |
tests: Improve logging for async message control test.
The "ofproto - asynchronous message control (OpenFlow 1.4)" test fails
from time to time when I'm running tests in parallel locally. So far,
I've not been able to determine the root cause, but logging the
difference between expected and actual output should help.
Signed-off-by: Ben Pfaff <blp@ovn.org>
Signed-off-by: William Tu <u9012063@gmail.com>
Diffstat (limited to 'tests/ofproto.at')
| -rw-r--r-- | tests/ofproto.at | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/tests/ofproto.at b/tests/ofproto.at index d5a13d0cf..2e6f4cbfe 100644 --- a/tests/ofproto.at +++ b/tests/ofproto.at @@ -3579,13 +3579,18 @@ table_desc:- AT_FAIL_IF([test X"$1" != X]) - OVS_WAIT_UNTIL([test `wc -l < "monitor.log"` -ge `wc -l < "expout"`]) + normalize_log () { + sed ' +s/ (xid=0x[[0-9a-fA-F]]*)// +s/ *duration.*// +s/00:0.$/00:0x/' < monitor.log + } + + OVS_WAIT_UNTIL([test `wc -l < "monitor.log"` -ge `wc -l < "expout"`], + [normalize_log | diff -u - expout]) AT_CHECK( - [[sed ' -s/ (xid=0x[0-9a-fA-F]*)// -s/ *duration.*// -s/00:0.$/00:0x/' < monitor.log]], + [normalize_log], [0], [expout]) } |