Index: /branches/cname-collision/t/dns-unitbase.sql
===================================================================
--- /branches/cname-collision/t/dns-unitbase.sql	(revision 997)
+++ /branches/cname-collision/t/dns-unitbase.sql	(revision 998)
@@ -658,5 +658,5 @@
 3	example.net	1		1	2025121800	D	f	ab
 4	expiry1.test	1		1	2026011400	D	t	
-5	expiry2.test	1		1	2026011600	D	t	
+5	expiry2.test	1		1	2026011901	D	t	
 \.
 
@@ -779,4 +779,9 @@
 71	5	1	1	admin	Initial User	Added record 'expires-at4.expiry2.test TXT active before pending expiry', TTL 5400, expires at 2026-01-15 18:00	2026-01-15 17:59:01.61806-05	0	0
 72	5	1	1	admin	Initial User	Added record 'expires-at5.expiry2.test TXT expired before now', TTL 5400, expires at 2026-01-15 18:00	2026-01-16 11:50:43.678446-05	0	0
+73	5	1	1	admin	Initial User	Added record 'valid-after1.expiry2.test TXT always here', TTL 5400	2026-01-16 13:36:36.066418-05	0	0
+74	5	1	1	admin	Initial User	Added record 'valid-after2.expiry2.test TXT valid soon', TTL 5400, expires at 2026-01-15 18:00	2026-01-16 13:38:57.274666-05	0	0
+75	5	1	1	admin	Initial User	Added record 'valid-after3.expiry2.test TXT valid days ago', TTL 5400, expires at 2026-01-15 18:00	2026-01-16 13:45:27.179614-05	0	0
+76	5	1	1	admin	Initial User	Added record 'valid-after4.expiry2.test TXT valid quite soon', TTL 5400, expires at 2026-01-15 18:00	2026-01-19 11:40:07.438603-05	0	0
+77	5	1	1	admin	Initial User	Added record 'valid-after5.expiry2.test TXT expires before pending valid', TTL 5400, expires at 2026-01-15 18:00	2026-01-19 11:40:55.325144-05	0	0
 \.
 
@@ -786,5 +791,5 @@
 --
 
-SELECT pg_catalog.setval('public.log_log_id_seq', 72, true);
+SELECT pg_catalog.setval('public.log_log_id_seq', 77, true);
 
 
@@ -889,4 +894,9 @@
 5	61	expires-at4.expiry2.test	16	active before pending expiry	0	0	0	5400	\N	0		2026-01-15 18:00:00-05	f	t	\N
 5	62	expires-at5.expiry2.test	16	expired before now	0	0	0	5400	\N	0		2026-01-15 18:00:00-05	t	t	\N
+5	63	valid-after1.expiry2.test	16	always here	0	0	0	5400	\N	0		1969-12-31 19:00:00-05	f	f	\N
+5	64	valid-after2.expiry2.test	16	expires soon	0	0	0	5400	\N	0		2026-01-15 18:00:00-05	t	t	\N
+5	65	valid-after3.expiry2.test	16	valid days ago	0	0	0	5400	\N	0		2026-01-15 18:00:00-05	f	t	\N
+5	66	valid-after4.expiry2.test	16	valid quite soon	0	0	0	5400	\N	0		2026-01-15 18:00:00-05	f	t	\N
+5	67	valid-after5.expiry2.test	16	expires before pending valid	0	0	0	5400	\N	0		2026-01-15 18:00:00-05	t	t	\N
 \.
 
@@ -896,5 +906,5 @@
 --
 
-SELECT pg_catalog.setval('public.records_record_id_seq', 62, true);
+SELECT pg_catalog.setval('public.records_record_id_seq', 67, true);
 
 
Index: /branches/cname-collision/t/test-cname-timestamps.sql
===================================================================
--- /branches/cname-collision/t/test-cname-timestamps.sql	(revision 997)
+++ /branches/cname-collision/t/test-cname-timestamps.sql	(revision 998)
@@ -12,2 +12,8 @@
 UPDATE records SET stamp = date_trunc('day', now() + interval '2 day') + '11:30' WHERE record_id = 61;
 UPDATE records SET stamp = date_trunc('day', now() - interval '2 day') + '11:30' WHERE record_id = 62;
+
+UPDATE records SET stamp = date_trunc('day', now() + interval '4 day') + '11:30' WHERE record_id = 64;
+UPDATE records SET stamp = date_trunc('day', now() - interval '2 day') + '11:30' WHERE record_id = 65;
+UPDATE records SET stamp = date_trunc('day', now() + interval '2 day') + '11:30' WHERE record_id = 66;
+UPDATE records SET stamp = date_trunc('day', now() + interval '1 day') + '11:30' WHERE record_id = 67;
+
