Changeset 984 for branches/cname-collision/t

Timestamp:

01/15/26 11:29:54 (2 weeks ago)

Author:

Kris Deugau

Message:

/branches/cname-collision

Added specific test for CNAME colliding with a record that has a valid-after
timestamp in the past.

• additional test record
• adjusted timestamp-retrieval SQL
• extend logic tree for this case

See #72, #88

Location:

branches/cname-collision/t

Files:

• cname.t (modified) (2 diffs)
• dns-unitbase.sql (modified) (5 diffs)
• test-cname-timestamps.sql (modified) (1 diff)

branches/cname-collision/t/cname.t

@@ -226 +226 @@
       }
     };
-    subtest '  - collision with active-after record' => sub {
+    subtest '  - collision with pending active-after record' => sub {
       $newname = 'active-after1.expiry1.test';
       ($code, $msg) = $dnsdb->addRec('n', 'n', 4, \$newname, \$rectype, \$newval, 900);
@@ -243 +243 @@
       }
     };
+    subtest '  - collision with active active-after record' => sub {
+      $newname = 'active-after2.expiry1.test';
+      ($code, $msg) = $dnsdb->addRec('n', 'n', 4, \$newname, \$rectype, \$newval, 900);
+      ok( $code eq 'FAIL', "addRec() claimed failure" );
+      if ($code eq 'FAIL') {
+        ($rcount) = $dbh->selectrow_array("SELECT count(*) FROM records WHERE domain_id = 4 AND host = '$newname' AND type <> 5");
+        ok( $rcount == 1, " ... [$rcount] record(s) with $newname already exist" );
+        like( $msg, qr/record with a valid-after time in the past/, " ... returned matching error" );
+      }
+    };
   }; # add non-timestamp CNAME
 

branches/cname-collision/t/dns-unitbase.sql

@@ -657 +657 @@
 2       example.org     1               1       2025121800      D       f       ac
 3       example.net     1               1       2025121800      D       f       ab
-4       expiry1.test    1               1       2026010702      D       t       
+4       expiry1.test    1               1       2026011400      D       t       
 \.
 
@@ -764 +764 @@
 57      4       1       1       admin   Initial User    Added record 'expired2.expiry1.test TXT imma expire soon', TTL 5400, expires at 2026-01-10 07:00        2026-01-07 17:57:07.015962-05   0       0
 58      4       1       1       admin   Initial User    Added record 'active-after1.expiry1.test TXT not active yet', TTL 5400, valid after 2026-01-11 11:30    2026-01-07 18:12:57.491476-05   0       0
+59      4       1       1       admin   Initial User    Added record 'active-after2.expiry1.test TXT I'm done waiting', TTL 5400, expires at 2025-12-31 14:00   2026-01-14 18:02:13.876839-05   0       0
 \.
 
@@ -771 +772 @@
 --
 
-SELECT pg_catalog.setval('public.log_log_id_seq', 58, true);
+SELECT pg_catalog.setval('public.log_log_id_seq', 59, true);
 
 
@@ -861 +862 @@
 4       48      expired2.expiry1.test   16      imma expire soon        0       0       0       5400    \N      0               2026-01-10 07:00:00-05  t       t       \N
 4       49      active-after1.expiry1.test      16      not active yet  0       0       0       5400    \N      0               2026-01-11 11:30:00-05  f       t       \N
+4       50      active-after2.expiry1.test      16      I'm done waiting        0       0       0       5400    \N      0               2025-12-31 14:00:00-05  f       t       \N
 \.
 
@@ -868 +870 @@
 --
 
-SELECT pg_catalog.setval('public.records_record_id_seq', 49, true);
+SELECT pg_catalog.setval('public.records_record_id_seq', 50, true);
 
 

branches/cname-collision/t/test-cname-timestamps.sql

@@ -6 +6 @@
 UPDATE records SET stamp = date_trunc('day', now() + interval '3 day') + '07:00' WHERE record_id = 48;
 UPDATE records SET stamp = date_trunc('day', now() + interval '5 day') + '11:30' WHERE record_id = 49;
+UPDATE records SET stamp = date_trunc('day', now() - interval '3 day') + '14:00' WHERE record_id = 50;