From eef669f04882c3420d269b84c449f63f00e11bd9 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Thu, 6 Jun 2019 11:56:58 -0700 Subject: [PATCH] Improve sqlite logging unit tests By using a consistent timestamp. That avoids rare chances of sqlite output from rounding the current time into such a form that happens to bypass the timestamp canonifier script (whenever it happened to land on a whole or tenth second). --- CHANGES | 4 ++++ VERSION | 2 +- .../btest/scripts/base/frameworks/logging/sqlite/error.zeek | 2 +- .../base/frameworks/logging/sqlite/simultaneous-writes.zeek | 2 +- .../btest/scripts/base/frameworks/logging/sqlite/types.zeek | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 49e9bfe968..2c4ef212e5 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.6-379 | 2019-06-06 11:56:58 -0700 + + * Improve sqlite logging unit tests (Jon Siwek, Corelight) + 2.6-378 | 2019-06-05 16:23:04 -0700 * Rename BRO_DEPRECATED macro to ZEEK_DEPRECATED (Jon Siwek, Corelight) diff --git a/VERSION b/VERSION index 459107e51a..a822f05e60 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6-378 +2.6-379 diff --git a/testing/btest/scripts/base/frameworks/logging/sqlite/error.zeek b/testing/btest/scripts/base/frameworks/logging/sqlite/error.zeek index ea52826a13..e913fbc544 100644 --- a/testing/btest/scripts/base/frameworks/logging/sqlite/error.zeek +++ b/testing/btest/scripts/base/frameworks/logging/sqlite/error.zeek @@ -93,7 +93,7 @@ event zeek_init() $sn=10.0.0.1/24, $a=1.2.3.4, $d=3.14, - $t=network_time(), + $t=double_to_time(1559847346.10295), $iv=100secs, $s="hurz", $sc=set(1,2,3,4), diff --git a/testing/btest/scripts/base/frameworks/logging/sqlite/simultaneous-writes.zeek b/testing/btest/scripts/base/frameworks/logging/sqlite/simultaneous-writes.zeek index e717954a61..f685dfa26f 100644 --- a/testing/btest/scripts/base/frameworks/logging/sqlite/simultaneous-writes.zeek +++ b/testing/btest/scripts/base/frameworks/logging/sqlite/simultaneous-writes.zeek @@ -73,7 +73,7 @@ event zeek_init() $sn=10.0.0.1/24, $a=1.2.3.4, $d=3.14, - $t=network_time(), + $t=double_to_time(1559847346.10295), $iv=100secs, $s="hurz", $sc=set(1,2,3,4), diff --git a/testing/btest/scripts/base/frameworks/logging/sqlite/types.zeek b/testing/btest/scripts/base/frameworks/logging/sqlite/types.zeek index 783fd2603b..751517a9b9 100644 --- a/testing/btest/scripts/base/frameworks/logging/sqlite/types.zeek +++ b/testing/btest/scripts/base/frameworks/logging/sqlite/types.zeek @@ -65,7 +65,7 @@ event zeek_init() $sn=10.0.0.1/24, $a=1.2.3.4, $d=3.14, - $t=network_time(), + $t=double_to_time(1559847346.10295), $iv=100secs, $s="hurz", $sc=set(1,2,3,4),