Changeset 1050 for branches/stable/t/DNSTest.pm

Timestamp:

03/05/26 18:20:36 (17 hours ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge baseline test suite changes

Location:

branches/stable

Files:

• . (modified) (1 prop)
• t (copied) (copied from trunk/t )
• t/DNSTest.pm (modified) (3 diffs, 1 prop)

branches/stable/t/DNSTest.pm

@@ -21 +21 @@
 ##
 
-package DNSDB::DNSTest;
+package DNSTest;
 use strict;
 use warnings;
+use Exporter;
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
+@ISA            = qw(Exporter);
+@EXPORT         = qw($dnsdb $dbh);
 
 use Test::More;
@@ -32 +36 @@
 our $dnsdb;
 our $dbh;
+our $debug;
 
 sub new {
+  my $this = shift;
+  my $class = ref($this) || $this;
+  my %args = @_;
+
   $dnsdb = new DNSDB(
         dbhost => 'localhost',
@@ -43 +52 @@
   ok( $dnsdb->isa('DNSDB') );
 
+  $debug = 1 if $args{debug};
+
   ## Prepare the DB
   # Check that we aren't in an obviously production DB before blowing it away.
-  # A DB instantiated for these tests should NEVER have more than a handful of domains and maybe 20-30 records.
-
-  my ($dcount) = $dbh->selectrow_array("SELECT count(*) FROM domains");
-  BAIL_OUT("# DB looks like it may not be a test DB, found $dcount > 10 domains!\n")
-        if $dcount > 10;
-  cmp_ok( $dcount, '<=', 10, "domain count: looks like a test DB" );
-
-  my ($rcount) = $dbh->selectrow_array("SELECT count(*) FROM records");
-  BAIL_OUT("# DB looks like it may not be a test DB, found $rcount > 30 records!\n")
-        if $rcount > 30;
-  cmp_ok( $rcount, '<=', 30, "record count: looks like a test DB" );
+  # A DB instantiated for these tests should have a known set of domains and records.
 
   $dbh = $dnsdb->{dbh};
-}
+
+  my ($dcount) = $dbh->selectrow_array("SELECT count(*) FROM domains WHERE NOT domain IN ".
+        "('example.com','example.net','example.org','expiry1.test','expiry2.test')");
+  BAIL_OUT("# DB looks like it may not be a test DB, found $dcount > 0 non-test domains!\n")
+        if $dcount > 0;
+  cmp_ok( $dcount, '==', 0, "non-test domain count ($dcount): looks like a test DB" );
+
+  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'
+        )});
+  my $maxrecs = 0;
+  BAIL_OUT("# DB looks like it may not be a test DB, found $rcount > $maxrecs records!\n")
+        if $rcount > $maxrecs;
+  cmp_ok( $rcount, '<=', $maxrecs, "non-test record ($rcount): looks like a test DB" );
+
+  # drop all tables etc
+  $ENV{PGPASSWORD} = $dnsdb->{dbpass};
+# neither diag or note seem to suppress output from qx
+  my $dropdata = qx( psql -h $dnsdb->{dbhost} -U $dnsdb->{dbuser} $dnsdb->{dbname} 2>&1 < t/dropall.sql );
+  diag( $dropdata ) if $debug;
+  # load some standard test data
+  my $reload = qx( psql -h $dnsdb->{dbhost} -U $dnsdb->{dbuser} $dnsdb->{dbname} 2>&1 < t/dns-unitbase.sql );
+  diag( $reload ) if $debug;
+  undef $ENV{PGPASSWORD};
+} # new()
 
 sub DESTROY {