Index: branches/cname-collision/t/cname.t
===================================================================
--- branches/cname-collision/t/cname.t	(revision 951)
+++ branches/cname-collision/t/cname.t	(revision 952)
@@ -18,4 +18,5 @@
 
 ## Domain tests
+subtest 'Domain tests' => sub {
 
 subtest 'CNAME add - new name' => sub {
@@ -44,6 +45,20 @@
 };
 
+subtest 'CNAME add - existing/colliding CNAME' => sub {
+  $newname = 'www.example.com';
+  ($code, $msg) = $dnsdb->addRec('n', 'n', 1, \$newname, \$rectype, \$newval, 900);
+  ok( $code eq 'FAIL', "addRec() claimed failure adding duplicate CNAME" );
+  if ($code eq 'FAIL') {
+    ($rcount) = $dbh->selectrow_array("SELECT count(*) FROM records WHERE domain_id = 1 AND host = '$newname' AND type = 5");
+    ok( $rcount == 1, " ... [$rcount] CNAME already exists" );
+    like( $msg, qr/already a CNAME present/, " ... returned matching error" );
+  }
+};
+
+}; # domain tests
+
 
 ## Reverse zone
+subtest 'Reverse zone tests' => sub {
 
 subtest 'CNAME add - new reverse name' => sub {
@@ -84,3 +99,5 @@
 };
 
+}; # reverse zone tests
+
 done_testing();