4 files changed, 46 insertions, 6 deletions

diff --git a/src/tests/common/acl_tests.c b/src/tests/common/acl_tests.c
index f8ab106..e115dc4 100644
--- a/src/tests/common/acl_tests.c
+++ b/src/tests/common/acl_tests.c
@@ -145,7 +145,7 @@ static int acl_tests_run(int argc, char *argv[])
 	acl_create(acl, &match_pf4, ACL_ACCEPT, 0, 0); /* Make decoy. */
 	acl_key_t *rval = NULL;
 	ret = acl_match(acl, &test_pf4, &rval);
-	ok(rval->val == sval, "acl: search for preferred node");
+	ok(rval && rval->val == sval, "acl: search for preferred node");
 
 	// 19. Scenario after truncating
 	ok(acl_truncate(acl) == ACL_ACCEPT, "acl: truncate");
diff --git a/src/tests/common/descriptor_tests.c b/src/tests/common/descriptor_tests.c
index 9d752f5..4f1fb6c 100644
--- a/src/tests/common/descriptor_tests.c
+++ b/src/tests/common/descriptor_tests.c
@@ -36,7 +36,7 @@ unit_api descriptor_tests_api = {
 
 static int descriptor_tests_count(int argc, char *argv[])
 {
-	return 68;
+	return 81;
 }
 
 static int descriptor_tests_run(int argc, char *argv[])
@@ -230,5 +230,40 @@ static int descriptor_tests_run(int argc, char *argv[])
 	ret = knot_rrclass_from_string("CLASS65536", &num);
 	cmp_ok(ret, "==", -1, "get CLASS65536 num ret");
 
+	// Get obsolete descriptor:
+	// 30. TYPE0
+	descr = get_obsolete_rdata_descriptor(0);
+	ok(descr->type_name == 0, "get TYPE0 descriptor name");
+	cmp_ok(descr->block_types[0], "==", KNOT_RDATA_WF_REMAINDER,
+	       "get TYPE0 descriptor 1. item type");
+	cmp_ok(descr->block_types[1], "==", KNOT_RDATA_WF_END,
+	       "get TYPE0 descriptor 2. item type");
+
+	// 31. MD
+	descr = get_obsolete_rdata_descriptor(3);
+	ok(strcmp(descr->type_name, "MD") == 0, "get MD descriptor name");
+	cmp_ok(descr->block_types[0], "==", KNOT_RDATA_WF_COMPRESSED_DNAME,
+	       "get A descriptor 1. item type");
+	cmp_ok(descr->block_types[1], "==", KNOT_RDATA_WF_END,
+	       "get A descriptor 2. item type");
+
+	// 32. NXT
+	descr = get_obsolete_rdata_descriptor(30);
+	ok(strcmp(descr->type_name, "NXT") == 0, "get NXT descriptor name");
+	cmp_ok(descr->block_types[0], "==", KNOT_RDATA_WF_COMPRESSED_DNAME,
+	       "get CNAME descriptor 1. item type");
+	cmp_ok(descr->block_types[1], "==", KNOT_RDATA_WF_REMAINDER,
+	       "get CNAME descriptor 2. item type");
+	cmp_ok(descr->block_types[2], "==", KNOT_RDATA_WF_END,
+	       "get CNAME descriptor 3. item type");
+
+	// 33. TYPE38 (A6)
+	descr = get_obsolete_rdata_descriptor(38);
+	ok(descr->type_name == 0, "get TYPE38 descriptor name");
+	cmp_ok(descr->block_types[0], "==", KNOT_RDATA_WF_REMAINDER,
+	       "get TYPE38 descriptor 1. item type");
+	cmp_ok(descr->block_types[1], "==", KNOT_RDATA_WF_END,
+	       "get TYPE38 descriptor 2. item type");
+
 	return 0;
 }
diff --git a/src/tests/common/events_tests.c b/src/tests/common/events_tests.c
index 713bb5a..6ceb17a 100644
--- a/src/tests/common/events_tests.c
+++ b/src/tests/common/events_tests.c
@@ -51,7 +51,11 @@ void* term_thr(void *arg)
 
 static int events_tests_count(int argc, char *argv[])
 {
-	return 9 + 11;
+	int count = 9 + 10;
+#ifdef ENABLE_TIMED_TESTS
+	count += 1;
+#endif
+	return count;
 }
 
 static int events_tests_run(int argc, char *argv[])
@@ -137,6 +141,7 @@ static int events_tests_run(int argc, char *argv[])
 	gettimeofday(&rt, 0);
 	ok(e != 0, "evsched: received valid event");
 
+#ifdef ENABLE_TIMED_TESTS
 	// 4. Check receive time
 	double passed = (rt.tv_sec - st.tv_sec) * 1000;
 	passed += (rt.tv_usec - st.tv_usec) / 1000;
@@ -145,6 +150,7 @@ static int events_tests_run(int argc, char *argv[])
 	int in_bounds = (passed >= lb) && (passed <= ub);
 	ok(in_bounds, "evsched: receive time %.1lfms is in <%.1lf,%.1lf>",
 	   passed, lb, ub);
+#endif
 
 	// 5. Check data
 	ok(e->data == (void*)0xcafe, "evsched: received data is valid");
diff --git a/src/tests/common/fdset_tests.c b/src/tests/common/fdset_tests.c
index e8b9d73..f5d351c 100644
--- a/src/tests/common/fdset_tests.c
+++ b/src/tests/common/fdset_tests.c
@@ -121,12 +121,11 @@ static int fdset_tests_run(int argc, char *argv[])
 	pthread_create(&t, 0, thr_action, &fds[1]);
 
 	/* 4. Watch fdset. */
-	int nfds = poll(set.pfd, set.n, 2000);
+	int nfds = poll(set.pfd, set.n, 60 * 1000);
 	gettimeofday(&te, 0);
 	size_t diff = timeval_diff(&ts, &te);
 
-	ok(nfds > 0 && diff > 99 && diff < 10000,
-	   "fdset: poll returned %d events in %zu ms", nfds, diff);
+	ok(nfds > 0, "fdset: poll returned %d events in %zu ms", nfds, diff);
 
 	/* 5. Prepare event set. */
 	ok(set.pfd[0].revents & POLLIN, "fdset: pipe is active");