Index: branches/cname-collision/t/cname.t
===================================================================
--- branches/cname-collision/t/cname.t	(revision 1011)
+++ branches/cname-collision/t/cname.t	(revision 1012)
@@ -342,7 +342,14 @@
       cmp_ok( $code, 'eq', 'WARN', "addRec() claimed failure" );
       if ($code eq 'WARN') {
-        ($rcount) = $dbh->selectrow_array("SELECT count(*) FROM records WHERE domain_id = 5 AND host = '$newname' AND type <> 5");
-        ok( $rcount == 1, " ... [$rcount] record(s) with $newname already exist" );
+        ($rcount) = $dbh->selectrow_array("SELECT count(*) FROM records WHERE domain_id = 5 AND host = '$newname'");
+        ok( $rcount == 2, " ... [$rcount] record(s) with $newname found" );
         like( $msg, qr/modified valid-after time;  conflicting expiring record found/, " ... returned matching error" );
+        my ($newstamp) = $dbh->selectrow_array("SELECT extract(epoch from stamp) FROM records WHERE domain_id = 5 ".
+		"AND host = '$newname' AND stampactive = 't' AND expires = 't'");
+        my ($oldstamp) = $dbh->selectrow_array("SELECT extract(epoch from stamp) FROM records WHERE domain_id = 5 ".
+		"AND host = '$newname' AND stampactive = 't' AND expires = 'f'");
+        cmp_ok( $newstamp, '>=', $oldstamp, " ... coerced timestamp equal or later than existing expiry timestamp" );
+      } else {
+        print "not ok: $msg";
       }
     };