Changeset 949

Timestamp:

12/24/25 13:17:17 (4 hours ago)

Author:

Kris Deugau

Message:

/branches/cname-collision

Merge test framework fixes

Location:

branches/cname-collision/t

Files:

• . (copied) (copied from trunk/t )
• DNSTest.pm (modified) (2 diffs)

branches/cname-collision/t/DNSTest.pm

@@ -36 +36 @@
 our $dnsdb;
 our $dbh;
+our $debug;
 
 sub new {
@@ -56 +57 @@
   BAIL_OUT("# DB looks like it may not be a test DB, found $dcount > 10 domains!\n")
         if $dcount > 10;
-  ok( $dcount, '<=', 10, "domain count ($dcount): looks like a test DB" );
+  cmp_ok( $dcount, '<=', 10, "domain count ($dcount): 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 > 50;
-  ok( $rcount, '<=', 50, "record ($rcount): looks like a test DB" );
+  cmp_ok( $rcount, '<=', 50, "record ($rcount): looks like a test DB" );
 
   # drop all tables etc
   $ENV{PGPASSWORD} = $dnsdb->{dbpass};
-  diag qx( psql -h $dnsdb->{dbhost} -U $dnsdb->{dbuser} $dnsdb->{dbname} < t/dropall.sql );
+# 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
-  diag qx( psql -h $dnsdb->{dbhost} -U $dnsdb->{dbuser} $dnsdb->{dbname} < t/dns-unitbase.sql );
-
-}
+  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 {