Index: /branches/cname-collision/t/cname.t
===================================================================
--- /branches/cname-collision/t/cname.t	(revision 1004)
+++ /branches/cname-collision/t/cname.t	(revision 1005)
@@ -337,4 +337,14 @@
       }
     };
+    subtest 'valid before expiring record' => sub {
+      $newname = 'valid-after2.expiry2.test';
+      ($code, $msg) = $dnsdb->addRec('n', 'n', 5, \$newname, \$rectype, \$newval, 900, undef, 'f', $expirystamp);
+      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" );
+        like( $msg, qr/modified valid-after time;  conflicting expiring record found/, " ... returned matching error" );
+      }
+    };
   };