Changeset 948 for trunk

Timestamp:

12/24/25 13:01:43 (4 hours ago)

Author:

Kris Deugau

Message:

/trunk/t

Patch up some fixes misplaced in patch shuffling
See #88

File:

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

trunk/t/DNSTest.pm

@@ -57 +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
@@ -70 +70 @@
   diag( $dropdata ) if $debug;
   # load some standard test data
-  my $reload = 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};