Index: branches/cname-collision/t/cname.t
===================================================================
--- branches/cname-collision/t/cname.t	(revision 967)
+++ branches/cname-collision/t/cname.t	(revision 968)
@@ -198,3 +198,24 @@
 
 
+## Record expiry/valid-after cases
+subtest 'Record expiry/valid-after' => sub {
+
+  subtest 'CNAME add - nonexpiring' => sub {
+    subtest '  - collision with expired record' => sub {
+      $newname = 'expired1.expiry1.test';
+      $newval = 'target.example.com';
+      ($code, $msg) = $dnsdb->addRec('n', 'n', 4, \$newname, \$rectype, \$newval, 900);
+      ok( $code eq 'OK', "addRec() claimed success" );
+      if ($code eq 'OK') {
+        ($rcount) = $dbh->selectrow_array("SELECT count(*) FROM records WHERE domain_id = 4 AND host = '$newname' AND stampactive = 'f'");
+        ok( $rcount == 1, " ... [$rcount] yep, hostname only occurs once" );
+      } else {
+        print "not ok: $msg";
+      }
+    };
+  };
+
+};
+
+
 done_testing();