Changeset 992 for branches/cname-collision

Timestamp:

01/16/26 11:20:11 (8 days ago)

Author:

Kris Deugau

Message:

/branches/cname-collision

Add test and supporting record for new CNAME with expiry after an existing
record's valid-after timestamp
See #72, #88

Location:

branches/cname-collision/t

Files:

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

branches/cname-collision/t/cname.t

@@ -296 +296 @@
       }
     };
+    subtest 'expire after valid-after record' => sub {
+      $newname = 'expires-at4.expiry2.test';
+      ($code, $msg) = $dnsdb->addRec('n', 'n', 5, \$newname, \$rectype, \$newval, 900, undef, 't', $expirystamp);
+      ok( $code eq 'WARN', "addRec() claimed success with warning" );
+      if ($code eq 'WARN') {
+        ($rcount) = $dbh->selectrow_array("SELECT count(*) FROM records WHERE domain_id = 5 AND host = '$newname'");
+        ok( $rcount == 2, " ... [$rcount] correct number of records for $newname" );
+        like( $msg, qr/added with modified expiry time;  conflicting valid-after record found/, " ... returned appropriate warning message" );
+        my ($newstamp) = $dbh->selectrow_array("SELECT stamp FROM records WHERE domain_id = 5 AND host = '$newname' ".
+                "AND stampactive = 't' AND expires = 't'");
+        my ($oldstamp) = $dbh->selectrow_array("SELECT stamp FROM records WHERE domain_id = 5 AND host = '$newname' ".
+                "AND stampactive = 't' AND expires = 'f'");
+        ok( $newstamp eq $oldstamp, " ... coerced timestamp matches existing active-after timestamp" );
+      } else {
+        print "not ok: $msg";
+      }
+    };
   }; # add expiring CNAME
 

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

@@ -658 +658 @@
 3       example.net     1               1       2025121800      D       f       ab
 4       expiry1.test    1               1       2026011400      D       t       
-5       expiry2.test    1               1       2026011502      D       t       
+5       expiry2.test    1               1       2026011503      D       t       
 \.
 
@@ -777 +777 @@
 69      5       1       1       admin   Initial User    Added record 'expires-at2.expiry2.test TXT imma expire soon', TTL 5400, expires at 2026-01-15 18:00     2026-01-15 12:58:51.09629-05    0       0
 70      5       1       1       admin   Initial User    Added record 'expires-at3.expiry2.test TXT active after pending expiry', TTL 5400, expires at 2026-01-15 18:00  2026-01-15 13:21:31.833257-05   0       0
+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
 \.
 
@@ -784 +785 @@
 --
 
-SELECT pg_catalog.setval('public.log_log_id_seq', 70, true);
+SELECT pg_catalog.setval('public.log_log_id_seq', 71, true);
 
 
@@ -885 +886 @@
 5       59      expires-at2.expiry2.test        16      imma expire soon        0       0       0       5400    \N      0               2026-01-15 18:00:00-05  t       t       \N
 5       60      expires-at3.expiry2.test        16      active after pending expiry     0       0       0       5400    \N      0               2026-01-15 18:00:00-05  f       t       \N
+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
 \.
 
@@ -892 +894 @@
 --
 
-SELECT pg_catalog.setval('public.records_record_id_seq', 60, true);
+SELECT pg_catalog.setval('public.records_record_id_seq', 61, true);
 
 

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

@@ -10 +10 @@
 UPDATE records SET stamp = date_trunc('day', now() + interval '4 day') + '11:30' WHERE record_id = 59;
 UPDATE records SET stamp = date_trunc('day', now() + interval '4 day') + '11:30' WHERE record_id = 60;
+UPDATE records SET stamp = date_trunc('day', now() + interval '2 day') + '11:30' WHERE record_id = 61;