BIND 10 trac2853, updated. 358984aecfd6a7944624577f931e09c3fd53febb [2853] Update comment

[BIND 10 source code commits]

The branch, trac2853 has been updated
       via  358984aecfd6a7944624577f931e09c3fd53febb (commit)
       via  86d1383a1a5998ce4fa7cac17b9f15bde7d19712 (commit)
       via  38beb040c82df7d6502f3f25b52773aeecad6041 (commit)
      from  c5352f69e7fe7b9071066b4ce40d47c2d7948a1f (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 358984aecfd6a7944624577f931e09c3fd53febb
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Jun 7 05:06:51 2013 +0530

    [2853] Update comment

commit 86d1383a1a5998ce4fa7cac17b9f15bde7d19712
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Jun 7 05:04:01 2013 +0530

    [2853] Make sure the ZoneWriter object is cleared before the mapfile is removed

commit 38beb040c82df7d6502f3f25b52773aeecad6041
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Jun 7 05:04:17 2013 +0530

    Revert "[2853] Add another unittest (that crashes currently)"
    
    This reverts commit c5352f69e7fe7b9071066b4ce40d47c2d7948a1f.

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

Summary of changes:
 .../python/isc/datasrc/tests/clientlist_test.py    |   44 +++++++-------------
 1 file changed, 14 insertions(+), 30 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/datasrc/tests/clientlist_test.py b/src/lib/python/isc/datasrc/tests/clientlist_test.py
index e948a89..a88e19c 100644
--- a/src/lib/python/isc/datasrc/tests/clientlist_test.py
+++ b/src/lib/python/isc/datasrc/tests/clientlist_test.py
@@ -37,6 +37,13 @@ class ClientListTest(unittest.TestCase):
         # last.
         self.dsrc = None
         self.finder = None
+
+        # If a test created a ZoneWriter with a mapped memory segment,
+        # the writer will hold a reference to the client list which will
+        # need the mapfile to exist until it's destroyed.  So we'll make
+        # sure to destroy the writer (by resetting it) before removing
+        # the mapfile below.
+        self.__zone_writer = None
         self.clist = None
 
         if os.path.exists(MAPFILE_PATH):
@@ -177,46 +184,23 @@ class ClientListTest(unittest.TestCase):
         self.clist.reset_memory_segment("MasterFiles",
                                         isc.datasrc.ConfigurableClientList.CREATE,
                                         map_params)
-        result = self.clist.get_cached_zone_writer(isc.dns.Name("example.org"))
+        result, self.__zone_writer = self.clist.get_cached_zone_writer(isc.dns.Name("example.org"))
         self.assertEqual(isc.datasrc.ConfigurableClientList.CACHE_STATUS_ZONE_SUCCESS,
-                         result[0])
-        result[1].load()
-        result[1].install()
-        result[1].cleanup()
+                         result)
+        self.__zone_writer.load()
+        self.__zone_writer.install()
+        self.__zone_writer.cleanup()
 
         self.clist.reset_memory_segment("MasterFiles",
                                         isc.datasrc.ConfigurableClientList.READ_ONLY,
                                         map_params)
-        result = self.clist.get_cached_zone_writer(isc.dns.Name("example.org"))
+        result, self.__zone_writer = self.clist.get_cached_zone_writer(isc.dns.Name("example.org"))
         self.assertEqual(isc.datasrc.ConfigurableClientList.CACHE_STATUS_CACHE_NOT_WRITABLE,
-                         result[0])
+                         result)
 
         # The segment is still in READ_ONLY mode.
         self.find_helper()
 
-    def test_find_mapped2(self):
-        """
-        Test find on a mapped segment.
-        """
-        self.clist = isc.datasrc.ConfigurableClientList(isc.dns.RRClass.IN)
-        self.clist.configure('''[{
-            "type": "MasterFiles",
-            "params": {
-                "example.org": "''' + TESTDATA_PATH + '''no-example.org.zone"
-            },
-            "cache-enable": true,
-            "cache-type": "mapped"
-        }]''', True)
-
-        map_params = '{"mapped-file": "' + MAPFILE_PATH + '"}'
-        self.clist.reset_memory_segment("MasterFiles",
-                                        isc.datasrc.ConfigurableClientList.CREATE,
-                                        map_params)
-        result = self.clist.get_cached_zone_writer(isc.dns.Name("example.org"))
-        self.assertEqual(isc.datasrc.ConfigurableClientList.CACHE_STATUS_ZONE_SUCCESS,
-                         result[0])
-        result[1].load()
-
 if __name__ == "__main__":
     isc.log.init("bind10")
     isc.log.resetUnitTestRootLogger()