BIND 10 trac2421, updated. e650a0f7e51fc4158d001d04e30ffc239875d9f8 [2421] Put code inside EXPECT_NO_THROW

[BIND 10 source code commits]

The branch, trac2421 has been updated
       via  e650a0f7e51fc4158d001d04e30ffc239875d9f8 (commit)
       via  744d1be57ae311af05de0ee9572feee0c8b157e7 (commit)
      from  b37e972c6c6a7b9eeb09addab58516a1df74c15b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e650a0f7e51fc4158d001d04e30ffc239875d9f8
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Nov 16 02:04:03 2012 +0530

    [2421] Put code inside EXPECT_NO_THROW

commit 744d1be57ae311af05de0ee9572feee0c8b157e7
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Nov 16 02:01:42 2012 +0530

    [2421] Update comments about test data

-----------------------------------------------------------------------

Summary of changes:
 src/lib/datasrc/tests/client_list_unittest.cc |   27 ++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/tests/client_list_unittest.cc b/src/lib/datasrc/tests/client_list_unittest.cc
index 31e27af..6769e9b 100644
--- a/src/lib/datasrc/tests/client_list_unittest.cc
+++ b/src/lib/datasrc/tests/client_list_unittest.cc
@@ -827,27 +827,40 @@ TEST_F(ListTest, masterFiles) {
 }
 
 TEST_F(ListTest, BadMasterFile) {
-    // Configure two zone correctly, and one with the wrong origin
-    // (resulting in an out-of-zone data error)
-    // Configuration should succeed, and the correct zones should
-    // be loaded. Neither the 'bad' origin or the zone it used
-    // should be loaded
+    // Configuration should succeed, and the good zones in the list
+    // below should be loaded. No bad zones should be loaded.
     const ConstElementPtr elem(Element::fromJSON("["
         "{"
         "   \"type\": \"MasterFiles\","
         "   \"cache-enable\": true,"
         "   \"params\": {"
+
+        // good zone
         "       \"example.com.\": \"" TEST_DATA_DIR "/example.com.flattened\","
+
+        // bad zone (empty file)
         "       \"example.net.\": \"" TEST_DATA_DIR "/example.net-empty\","
+
+        // bad zone (data doesn't validate: see the file for details)
         "       \"example.edu.\": \"" TEST_DATA_DIR "/example.edu-broken\","
+
+        // bad zone (file doesn't exist)
         "       \"example.info.\": \"" TEST_DATA_DIR "/example.info-nonexist\","
+
+        // bad zone (data doesn't match the zone name)
         "       \"foo.bar.\": \"" TEST_DATA_DIR "/example.org.nsec3-signed\","
+
+        // good zone
         "       \".\": \"" TEST_DATA_DIR "/root.zone\""
+
         "   }"
         "}]"));
 
-    // this should not throw even if there are any zone loading errors.
-    list_->configure(elem, true);
+    EXPECT_NO_THROW({
+        // This should not throw even if there are any zone loading
+        // errors.
+        list_->configure(elem, true);
+    });
 
     positiveResult(list_->find(Name("example.com."), true), ds_[0],
                    Name("example.com."), true, "example.com", true);