From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Sun, 10 May 2015 19:35:38 +0000 (+0200)
Subject: tests: added ncache tests, fixed ‘time elapsed’
X-Git-Tag: v1.0.0-beta1~186
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d7181235fb882e7aff2000e514aaccfdd6dc2e2;p=thirdparty%2Fknot-resolver.git

tests: added ncache tests, fixed ‘time elapsed’
---

diff --git a/tests/mock_calls.c b/tests/mock_calls.c
index fe32bd1df..23f31bdfb 100644
--- 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 e1bb42f01..4ec116332 100644
--- 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 2e640fd11..6e1cd2055 100644
--- 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 12019816a..6e0613b2e 100644
--- 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 9f3ba7566..06e25b645 100644
--- 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 d59cb717f..7edc924e5 100644
--- 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 40545d2b1..7b0d94851 100644
--- 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