From 638eb2f8eb32a533e84eb210b97c1276ae407dcb Mon Sep 17 00:00:00 2001 From: Don Appleman Date: Thu, 24 Mar 2011 11:27:21 -0500 Subject: [PATCH] Initial drop of known-hosts unit test, with tracefile and directory structure, as well as c ouple of files pulled from Robin's logging branch. --- testing/btest/.gitignore | 1 + testing/btest/Scripts/diff-canonifier | 5 +++++ testing/btest/Scripts/known-hosts-test | 6 ++++++ testing/btest/btest.cfg | 13 +++++++++++++ testing/btest/random.seed | 17 +++++++++++++++++ testing/btest/traces/wikipedia.trace | Bin 0 -> 27460 bytes 6 files changed, 42 insertions(+) create mode 100644 testing/btest/.gitignore create mode 100755 testing/btest/Scripts/diff-canonifier create mode 100644 testing/btest/Scripts/known-hosts-test create mode 100644 testing/btest/btest.cfg create mode 100644 testing/btest/random.seed create mode 100644 testing/btest/traces/wikipedia.trace diff --git a/testing/btest/.gitignore b/testing/btest/.gitignore new file mode 100644 index 0000000000..d36977dc47 --- /dev/null +++ b/testing/btest/.gitignore @@ -0,0 +1 @@ +.tmp diff --git a/testing/btest/Scripts/diff-canonifier b/testing/btest/Scripts/diff-canonifier new file mode 100755 index 0000000000..2361355491 --- /dev/null +++ b/testing/btest/Scripts/diff-canonifier @@ -0,0 +1,5 @@ +#! /usr/bin/env bash +# +# Replace anything which looks like timestamps with XXXs. + +sed 's/[0-9]\{10\}\.[0-9]\{4,6\}/XXXXXXXXXX.XXXXXX/g' diff --git a/testing/btest/Scripts/known-hosts-test b/testing/btest/Scripts/known-hosts-test new file mode 100644 index 0000000000..162b42e6f3 --- /dev/null +++ b/testing/btest/Scripts/known-hosts-test @@ -0,0 +1,6 @@ + +@TEST-EXEC: bro -r %DIR/../traces/wikipedia.trace known-hosts + +@TEST-EXEC: btest-diff KNOWN_HOSTS +@TEST-EXEC: btest-diff .stderr +@TEST-EXEC: btest-diff .stdout diff --git a/testing/btest/btest.cfg b/testing/btest/btest.cfg new file mode 100644 index 0000000000..d5f669dc92 --- /dev/null +++ b/testing/btest/btest.cfg @@ -0,0 +1,13 @@ + +[btest] +TestDirs = logging Scripts +TmpDir = %(testbase)s/.tmp +BaselineDir = %(testbase)s/Baseline +IgnoreDirs = .svn CVS .tmp +IgnoreFiles = *.tmp *.swp #* *.trace diff-canonifier + +[environment] +BROPATH=`bash -c %(testbase)s/../../build/bro-path-dev` +BRO_SEED_FILE=%(testbase)s/random.seed +PATH=%(testbase)s/../../build/src:%(testbase)s/../../aux/btest:%(default_path)s +TEST_DIFF_CANONIFIER=%(testbase)s/Scripts/diff-canonifier diff --git a/testing/btest/random.seed b/testing/btest/random.seed new file mode 100644 index 0000000000..e70c8f85ef --- /dev/null +++ b/testing/btest/random.seed @@ -0,0 +1,17 @@ +2983378351 +1299727368 +0 +310447 +0 +1409073626 +3975311262 +34130240 +1450515018 +1466150520 +1342286698 +1193956778 +2188527278 +3361989254 +3912865238 +3596260151 +517973768 diff --git a/testing/btest/traces/wikipedia.trace b/testing/btest/traces/wikipedia.trace new file mode 100644 index 0000000000000000000000000000000000000000..68d85e0190b0fbefe12ba1bb066c4d06e987c9cf GIT binary patch literal 27460 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