Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-10 10:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/topic/timw/2258-skip-dns-tests'

Browse source 
* origin/topic/timw/2258-skip-dns-tests:
  GH-2258: Add skip decorator to DNS unit tests
This commit is contained in:
Tim Wojtulewicz 2022-07-14 08:58:01 -07:00
commit cae104d135
4 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
5.1.0-dev.252 | 2022-07-14 08:58:01 -0700
* GH-2258: Add skip decorator to DNS unit tests (Tim Wojtulewicz, Corelight)
5.1.0-dev.250 | 2022-07-14 08:57:38 -0700 5.1.0-dev.250 | 2022-07-14 08:57:38 -0700
* GH-2261: Fix type used for analyzer_confirmation/violation events (Tim Wojtulewicz, Corelight) * GH-2261: Fix type used for analyzer_confirmation/violation events (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
5.1.0-dev.250 5.1.0-dev.252

2
ci/test.sh
View file

@ -39,7 +39,7 @@ function run_unit_tests {
banner "Running unit tests" banner "Running unit tests"
pushd build pushd build
(. ./zeek-path-dev.sh && zeek --test) || result=1 (. ./zeek-path-dev.sh && zeek --test --no-skip) || result=1
popd popd
return 0 return 0
} }

22
src/DNS_Mgr.cc
View file

@ -1540,6 +1540,12 @@ TableValPtr DNS_Mgr::empty_addr_set()
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////
// Unit testing coverage for the DNS_Mgr code, including making actual DNS requests to
// test responses and timeouts. Note that all of these tests are marked with the skip
// decorator, since they take some time to run and this slows down local developement. To
// run them manually, pass the --no-skip flag when running tests. These tests are
// run automatically as part of CI builds.
static std::vector<IPAddr> get_result_addresses(TableValPtr addrs) static std::vector<IPAddr> get_result_addresses(TableValPtr addrs)
{ {
std::vector<IPAddr> results; std::vector<IPAddr> results;
@ -1605,7 +1611,7 @@ void TestDNS_Mgr::Process()
IssueAsyncRequests(); IssueAsyncRequests();
} }
TEST_CASE("dns_mgr priming") TEST_CASE("dns_mgr priming" * doctest::skip(true))
{ {
char prefix[] = "/tmp/zeek-unit-test-XXXXXX"; char prefix[] = "/tmp/zeek-unit-test-XXXXXX";
auto tmpdir = mkdtemp(prefix); auto tmpdir = mkdtemp(prefix);
@ -1654,7 +1660,7 @@ TEST_CASE("dns_mgr priming")
rmdir(tmpdir); rmdir(tmpdir);
} }
TEST_CASE("dns_mgr alternate server") TEST_CASE("dns_mgr alternate server" * doctest::skip(true))
{ {
char* old_server = getenv("ZEEK_DNS_RESOLVER"); char* old_server = getenv("ZEEK_DNS_RESOLVER");
@ -1683,7 +1689,7 @@ TEST_CASE("dns_mgr alternate server")
unsetenv("ZEEK_DNS_RESOLVER"); unsetenv("ZEEK_DNS_RESOLVER");
} }
TEST_CASE("dns_mgr default mode") TEST_CASE("dns_mgr default mode" * doctest::skip(true))
{ {
TestDNS_Mgr mgr(DNS_DEFAULT); TestDNS_Mgr mgr(DNS_DEFAULT);
mgr.InitPostScript(); mgr.InitPostScript();
@ -1715,7 +1721,7 @@ TEST_CASE("dns_mgr default mode")
CHECK(strcmp(addr_result->CheckString(), "240.0.0.0") == 0); CHECK(strcmp(addr_result->CheckString(), "240.0.0.0") == 0);
} }
TEST_CASE("dns_mgr async host") TEST_CASE("dns_mgr async host" * doctest::skip(true))
{ {
TestDNS_Mgr mgr(DNS_DEFAULT); TestDNS_Mgr mgr(DNS_DEFAULT);
mgr.InitPostScript(); mgr.InitPostScript();
@ -1746,7 +1752,7 @@ TEST_CASE("dns_mgr async host")
mgr.Flush(); mgr.Flush();
} }
TEST_CASE("dns_mgr async addr") TEST_CASE("dns_mgr async addr" * doctest::skip(true))
{ {
TestDNS_Mgr mgr(DNS_DEFAULT); TestDNS_Mgr mgr(DNS_DEFAULT);
mgr.InitPostScript(); mgr.InitPostScript();
@ -1772,7 +1778,7 @@ TEST_CASE("dns_mgr async addr")
mgr.Flush(); mgr.Flush();
} }
TEST_CASE("dns_mgr async text") TEST_CASE("dns_mgr async text" * doctest::skip(true))
{ {
TestDNS_Mgr mgr(DNS_DEFAULT); TestDNS_Mgr mgr(DNS_DEFAULT);
mgr.InitPostScript(); mgr.InitPostScript();
@ -1798,7 +1804,7 @@ TEST_CASE("dns_mgr async text")
mgr.Flush(); mgr.Flush();
} }
TEST_CASE("dns_mgr timeouts") TEST_CASE("dns_mgr timeouts" * doctest::skip(true))
{ {
char* old_server = getenv("ZEEK_DNS_RESOLVER"); char* old_server = getenv("ZEEK_DNS_RESOLVER");
@ -1824,7 +1830,7 @@ TEST_CASE("dns_mgr timeouts")
unsetenv("ZEEK_DNS_RESOLVER"); unsetenv("ZEEK_DNS_RESOLVER");
} }
TEST_CASE("dns_mgr async timeouts") TEST_CASE("dns_mgr async timeouts" * doctest::skip(true))
{ {
char* old_server = getenv("ZEEK_DNS_RESOLVER"); char* old_server = getenv("ZEEK_DNS_RESOLVER");