From b96b1593d88d1884ce821258e5823cd8fb4d413f Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Thu, 6 Aug 2020 19:42:37 -0700 Subject: [PATCH] Sort output of a few SumStats cluster tests The order of $epoch_result() function calls among all keys within a single epoch isn't consequential. --- .../btest/scripts/base/frameworks/sumstats/basic-cluster.zeek | 2 +- .../btest/scripts/base/frameworks/sumstats/sample-cluster.zeek | 2 +- .../btest/scripts/base/frameworks/sumstats/topk-cluster.zeek | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.zeek b/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.zeek index 28a5809eb5..73ec48ac8e 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.zeek @@ -7,7 +7,7 @@ # @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT # @TEST-EXEC: btest-bg-wait 15 -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { diff --git a/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek b/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek index ca0ca3da82..38a2738329 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek @@ -6,7 +6,7 @@ # @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT # @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT # @TEST-EXEC: btest-bg-wait 45 -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { diff --git a/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek b/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek index acf567bd56..2a73fc6ba7 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek @@ -7,7 +7,7 @@ # @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT # @TEST-EXEC: btest-bg-wait 45 -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout # @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = {