tests: added ncache tests, fixed ‘time elapsed’

diff --git a/tests/mock_calls.c b/tests/mock_calls.c
index fe32bd1dff1512c91a006ab43d8232d5432fbb4c..23f31bdfb82155ee8495894f95db3d8186af4af8 100644 (file)
--- a/tests/mock_calls.c
+++ b/tests/mock_calls.c
@@ -98,6 +98,5 @@ int net_connected_socket(int type, const struct sockaddr_storage *dst_addr,
 
 int net_is_connected(int fd)
 {
-       fprintf(stderr, "%s (%d)\n", __func__, fd);
        return true;
 }

diff --git a/tests/test_integration.c b/tests/test_integration.c
index e1bb42f018c94dcf2453b3eaa6afe54f6a6c5c98..4ec116332f70944c696c5f41819dcbc9d744e16e 100644 (file)
--- a/tests/test_integration.c
+++ b/tests/test_integration.c
@@ -144,7 +144,7 @@ static PyObject* set_time(PyObject *self, PyObject *args)
                return NULL;
        }
 
-       g_mock_time.tv_sec  = arg_time;
+       g_mock_time.tv_sec  += arg_time;
        g_mock_time.tv_usec = 0;
 
        return Py_BuildValue("");

diff --git a/tests/testdata/iter_cname_double.rpl b/tests/testdata/iter_cname_double.rpl
index 2e640fd114fe9d280f3cf27bea66371690471ce9..6e1cd2055936463410e02f69ab64734b88e64ed9 100644 (file)
--- a/tests/testdata/iter_cname_double.rpl
+++ b/tests/testdata/iter_cname_double.rpl
@@ -37,6 +37,19 @@ com. IN NS   a.gtld-servers.net.
 SECTION ADDITIONAL
 a.gtld-servers.net.    IN      A       192.5.6.30
 ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+www.next.com. IN A
+SECTION AUTHORITY
+com.   IN NS   a.gtld-servers.net.
+SECTION ADDITIONAL
+a.gtld-servers.net.    IN      A       192.5.6.30
+ENTRY_END
+
 RANGE_END
 
 ; a.gtld-servers.net.

diff --git a/tests/testdata/iter_cname_qnamecopy.rpl b/tests/testdata/iter_cname_qnamecopy.rpl
index 12019816ac16d2e2095b586cd9e3e40c2bf620bb..6e0613b2ecdb23ef4292727746a9e939a814fd85 100644 (file)
--- a/tests/testdata/iter_cname_qnamecopy.rpl
+++ b/tests/testdata/iter_cname_qnamecopy.rpl
@@ -24,6 +24,18 @@ SECTION ADDITIONAL
 K.ROOT-SERVERS.NET.    IN      A       193.0.14.129
 ENTRY_END
 
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+www.next.com. IN A
+SECTION AUTHORITY
+com.   IN NS   a.gtld-servers.net.
+SECTION ADDITIONAL
+a.gtld-servers.net.    IN      A       192.5.6.30
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id
@@ -35,6 +47,7 @@ com.  IN NS   a.gtld-servers.net.
 SECTION ADDITIONAL
 a.gtld-servers.net.    IN      A       192.5.6.30
 ENTRY_END
+
 RANGE_END
 
 ; a.gtld-servers.net.

diff --git a/tests/testdata_notimpl/iter_domain_sale.rpl b/tests/testdata/iter_domain_sale.rpl
similarity index 99%
rename from tests/testdata_notimpl/iter_domain_sale.rpl
rename to tests/testdata/iter_domain_sale.rpl
index 9f3ba756660abd16f9436d01e3b47c7a5e255d5c..06e25b6457bf1cb544eddd2bfe876eddeaf1d66c 100644 (file)
--- a/tests/testdata_notimpl/iter_domain_sale.rpl
+++ b/tests/testdata/iter_domain_sale.rpl
@@ -239,7 +239,7 @@ nx1.example.com. IN A
 SECTION ANSWER
 SECTION AUTHORITY
 example.com.   3600 IN SOA     a. b. 1 2 3 4 5
-;example.com.  1800 IN NS      ns.example.com.
+example.com.   3600 IN NS      ns.example.com.
 ;SECTION ADDITIONAL
 ;ns.example.com.       1800    IN      A       1.2.3.4
 ENTRY_END

diff --git a/tests/testdata_notimpl/iter_domain_sale_nschange.rpl b/tests/testdata/iter_domain_sale_nschange.rpl
similarity index 98%
rename from tests/testdata_notimpl/iter_domain_sale_nschange.rpl
rename to tests/testdata/iter_domain_sale_nschange.rpl
index d59cb717ff81060f563261a54a89f407b53356b4..7edc924e5c965897db10c618df2935f33b3699c7 100644 (file)
--- a/tests/testdata_notimpl/iter_domain_sale_nschange.rpl
+++ b/tests/testdata/iter_domain_sale_nschange.rpl
@@ -286,7 +286,7 @@ nx1.example.com. IN A
 SECTION ANSWER
 SECTION AUTHORITY
 example.com.   3600 IN SOA     a. b. 1 2 3 4 5
-;example.com.  3600 IN NS      nsb.example.com.
+example.com.   3600 IN NS      nsb.example.com.
 ;SECTION ADDITIONAL
 ;nsb.example.com.      3600    IN      A       1.2.3.4
 ENTRY_END
@@ -307,7 +307,7 @@ nx1.example.com. IN A
 SECTION ANSWER
 SECTION AUTHORITY
 example.com.   3600 IN SOA     a. b. 1 2 3 4 5
-;example.com.  1800 IN NS      nsb.example.com.
+example.com.   3600 IN NS      nsb.example.com.
 ;SECTION ADDITIONAL
 ;nsb.example.com.      3600    IN      A       1.2.3.4
 ENTRY_END

diff --git a/tests/tests.mk b/tests/tests.mk
index 40545d2b1e39178bca9af23e238c6cc51ef0585a..7b0d94851c15dae4e4940bbb6e544af93b610a45 100644 (file)
--- a/tests/tests.mk
+++ b/tests/tests.mk
@@ -1,7 +1,9 @@
 # Preload libraries
 preload_PATH := tests
 ifeq ($(PLATFORM),Darwin)
-       preload_LIBS := @DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_LIBRARY_PATH="$(preload_PATH):${DYLD_LIBRARY_PATH}"
+       preload_LIBS := @DYLD_FORCE_FLAT_NAMESPACE=1 \
+                       DYLD_INSERT_LIBRARIES=tests/libmock_calls.dylib \
+                       DYLD_LIBRARY_PATH="$(preload_PATH):${DYLD_LIBRARY_PATH}"
 else
        preload_LIBS := @LD_LIBRARY_PATH="$(preload_PATH):${LD_LIBRARY_PATH}"
 endif