BIND 10 trac698, updated. e1e592789ebc8806b9a8767af95c41c1ec2d5a14 Author: Naoki Kambe <kambe at jprs.co.jp> --- log message follows this line --- [trac698] added a test case "test___del__", which tests __del__ function in cases that fake_session is still opened and that it has been already closed.

[BIND 10 source code commits]

The branch, trac698 has been updated
       via  e1e592789ebc8806b9a8767af95c41c1ec2d5a14 (commit)
       via  4f42307f123f7ed147b537430e0f2e9a1c665e8e (commit)
       via  afa5624c2c3503df1f152f82278f1b9dba19b533 (commit)
      from  d6c0273c617498a8bee3a813e013837e7c16b7e6 (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 e1e592789ebc8806b9a8767af95c41c1ec2d5a14
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Mon Apr 4 04:38:30 2011 +0000

    Author: Naoki Kambe <kambe at jprs.co.jp>
    --- log message follows this line ---
    [trac698] added a test case "test___del__",
    which tests __del__ function in cases that fake_session is still opened and that it has been already closed.

commit 4f42307f123f7ed147b537430e0f2e9a1c665e8e
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Mon Apr 4 04:23:27 2011 +0000

    [trac698] changed group_unsubscribe
    it raises SessionError if the session has been already closed.

commit afa5624c2c3503df1f152f82278f1b9dba19b533
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Mon Apr 4 04:16:16 2011 +0000

    [trac698] "None" is set to "_socket" parameter when the session object is closed,
    in order to distinguish from the other parameter "_closed".

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

Summary of changes:
 src/lib/python/isc/config/tests/ccsession_test.py  |    9 ++++++++-
 .../isc/config/tests/unittest_fakesession.py       |    7 ++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/config/tests/ccsession_test.py b/src/lib/python/isc/config/tests/ccsession_test.py
index 2ae37f5..6e1cd3e 100644
--- a/src/lib/python/isc/config/tests/ccsession_test.py
+++ b/src/lib/python/isc/config/tests/ccsession_test.py
@@ -234,7 +234,14 @@ class TestModuleCCSession(unittest.TestCase):
         fake_session = FakeModuleCCSession()
         mccs = self.create_session("spec1.spec", None, None, fake_session)
         mccs.close()
-        self.assertEqual("closed", fake_session._socket)
+        self.assertEqual(None, fake_session._socket)
+
+    def test___del__(self):
+        fake_session = FakeModuleCCSession()
+        mccs = self.create_session("spec1.spec", None, None, fake_session)
+        mccs.__del__() # with opened fake_session
+        fake_session.close()
+        mccs.__del__() # with closed fake_session
 
     def my_config_handler_ok(self, new_config):
         return isc.config.ccsession.create_answer(0)
diff --git a/src/lib/python/isc/config/tests/unittest_fakesession.py b/src/lib/python/isc/config/tests/unittest_fakesession.py
index e45bde6..1641ec0 100644
--- a/src/lib/python/isc/config/tests/unittest_fakesession.py
+++ b/src/lib/python/isc/config/tests/unittest_fakesession.py
@@ -44,6 +44,11 @@ class FakeModuleCCSession:
             self.subscriptions[group_name].append(instance_name)
             
     def group_unsubscribe(self, group_name, instance_name = None):
+
+        # raises SessionError if the session has been already closed.
+        if self._closed:
+            raise isc.cc.SessionError("Session has been closed.")        
+
         if group_name in self.subscriptions:
             if instance_name:
                 if len(self.subscriptions[group_name]) > 1:
@@ -95,7 +100,7 @@ class FakeModuleCCSession:
 
     def close(self):
         # need to pass along somehow that this function has been called,
-        self._socket = "closed"
+        self._socket = None
         self._closed = True
 
     def set_timeout(self, timeout):