Changeset 1051 for trunk/t/DNSTest.pm

Timestamp:

03/06/26 11:33:19 (3 days ago)

Author:

Kris Deugau

Message:

/trunk

Reintegrate /branches/cname-collision
See #72

Location:

trunk

Files:

• . (modified) (1 prop)
• t/DNSTest.pm (modified) (5 diffs)

trunk/t/DNSTest.pm

@@ -5 +5 @@
 ##
 # $Id$
-# Copyright 2025 Kris Deugau <kdeugau@deepnet.cx>
+# Copyright 2025,2026 Kris Deugau <kdeugau@deepnet.cx>
 # 
 #    This program is free software: you can redistribute it and/or modify
@@ -48 +48 @@
         dbuser => 'dnstest',
         dbpass => 'dnstestpwd',
+
+        # This exercises more branches of the CNAME collision check with more fine-grained results.
+        coerce_cname_timestamp => 'adjust',
   );
   ok( defined $dnsdb );
@@ -61 +64 @@
 
   my ($dcount) = $dbh->selectrow_array("SELECT count(*) FROM domains WHERE NOT domain IN ".
-        "('example.com','example.net','example.org','expiry1.test','expiry2.test')");
+        "('example.com','example.net','example.org','expiry1.test','expiry2.test','expiry3.test','cname-blocks1.test')");
   BAIL_OUT("# DB looks like it may not be a test DB, found $dcount > 0 non-test domains!\n")
         if $dcount > 0;
@@ -68 +71 @@
   my ($rcount) = $dbh->selectrow_array(qq{SELECT count(*) FROM records WHERE NOT (
         host like '%example.com' or host like '%example.net' or host like '%example.org' or
-        host like '%expiry1.test' or host like '%expiry2.test' or inetlazy(val) << '192.168.2.0/27'
+        host like '%expiry_.test' or host like '%cname-blocks_.test' or
+        inetlazy(val) << '192.168.2.0/27'
         )});
   my $maxrecs = 0;
-  BAIL_OUT("# DB looks like it may not be a test DB, found $rcount > $maxrecs records!\n")
+  BAIL_OUT("# DB looks like it may not be a test DB, found $rcount > $maxrecs non-test records!\n")
         if $rcount > $maxrecs;
   cmp_ok( $rcount, '<=', $maxrecs, "non-test record ($rcount): looks like a test DB" );
@@ -83 +87 @@
   my $reload = qx( psql -h $dnsdb->{dbhost} -U $dnsdb->{dbuser} $dnsdb->{dbname} 2>&1 < t/dns-unitbase.sql );
   diag( $reload ) if $debug;
+  # Set timestamps to a sliding window
+  my $stampwindow = qx( psql -h $dnsdb->{dbhost} -U $dnsdb->{dbuser} $dnsdb->{dbname} 2>&1 < t/test-cname-timestamps.sql );
+  diag( $stampwindow ) if $debug;
   undef $ENV{PGPASSWORD};
 } # new()