Index: /branches/cname-collision/t/cname.t
===================================================================
--- /branches/cname-collision/t/cname.t	(revision 981)
+++ /branches/cname-collision/t/cname.t	(revision 982)
@@ -226,7 +226,24 @@
       }
     };
-  };
-
-};
+    subtest '  - collision with active-after record' => sub {
+      $newname = 'active-after1.expiry1.test';
+      ($code, $msg) = $dnsdb->addRec('n', 'n', 4, \$newname, \$rectype, \$newval, 900);
+      ok( $code eq 'WARN', "addRec() claimed success with warning" );
+      if ($code eq 'WARN') {
+        ($rcount) = $dbh->selectrow_array("SELECT count(*) FROM records WHERE domain_id = 4 AND host = '$newname'");
+        ok( $rcount == 2, " ... [$rcount] correct number of records for $newname" );
+        like( $msg, qr/added with expiry time;  conflicting valid-after record found/, " ... returned appropriate warning message" );
+        my ($newstamp) = $dbh->selectrow_array("SELECT stamp FROM records WHERE domain_id = 4 AND host = '$newname' ".
+		"AND stampactive = 't' AND expires = 't'");
+        my ($oldstamp) = $dbh->selectrow_array("SELECT stamp FROM records WHERE domain_id = 4 AND host = '$newname' ".
+		"AND stampactive = 't' AND expires = 'f'");
+        ok( $newstamp == $oldstamp, " ... coerced timestamp matches existing active-after timestamp" );
+      } else {
+        print "not ok: $msg";
+      }
+    };
+  }; # add non-timestamp CNAME
+
+}; # record expiry/valid-after