From c251245538169c0e1053065e59c60e6bc4d995d4 Mon Sep 17 00:00:00 2001 From: Daniel Thayer Date: Mon, 7 Aug 2017 16:10:46 -0500 Subject: [PATCH] Fix a netcontrol test that often fails The catch-and-release.bro test was failing whenever three conditions were all true: sorting the netcontrol.log before comparing to the baseline, the presence of LC_ALL=C in btest.cfg changes the sort order, and sometimes the timestamp increases slightly beginning with one of the rule_id == 5 lines. As a result of these three conditions, the sorted order of the lines with rule_id of 5 were different than the baseline. Fixed by not sorting netcontrol.log, as this doesn't seem necessary. --- .../scripts/base/frameworks/netcontrol/catch-and-release.bro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/btest/scripts/base/frameworks/netcontrol/catch-and-release.bro b/testing/btest/scripts/base/frameworks/netcontrol/catch-and-release.bro index c48b3b3551..29c56c2535 100644 --- a/testing/btest/scripts/base/frameworks/netcontrol/catch-and-release.bro +++ b/testing/btest/scripts/base/frameworks/netcontrol/catch-and-release.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: bro -r $TRACES/tls/ecdhe.pcap %INPUT -# @TEST-EXEC: TEST_DIFF_CANONIFIER='grep -v ^# | $SCRIPTS/diff-sort | $SCRIPTS/diff-remove-timestamps' btest-diff netcontrol.log +# @TEST-EXEC: TEST_DIFF_CANONIFIER='grep -v ^# | $SCRIPTS/diff-remove-timestamps' btest-diff netcontrol.log # @TEST-EXEC: btest-diff netcontrol_catch_release.log @load base/frameworks/netcontrol