BIND 10 trac2856, updated. 1bbc1906476bee5320eee4acb954af7b47c2b2d6 [2856] Add basic sync_reader() and remove_reader() tests

[BIND 10 source code commits]

The branch, trac2856 has been updated
       via  1bbc1906476bee5320eee4acb954af7b47c2b2d6 (commit)
       via  af62ea00182e18f2bfa448870ca37490eb830f09 (commit)
      from  a84352bebaacb3f414e5a01b1b25a3c7d3e50bbf (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 1bbc1906476bee5320eee4acb954af7b47c2b2d6
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Jul 8 18:00:58 2013 +0530

    [2856] Add basic sync_reader() and remove_reader() tests

commit af62ea00182e18f2bfa448870ca37490eb830f09
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Jul 8 17:59:37 2013 +0530

    [2856] Test that the state doesn't change when an exception is raised

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

Summary of changes:
 .../python/isc/memmgr/tests/datasrc_info_tests.py  |   36 +++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/memmgr/tests/datasrc_info_tests.py b/src/lib/python/isc/memmgr/tests/datasrc_info_tests.py
index e81f89c..1be2c68 100644
--- a/src/lib/python/isc/memmgr/tests/datasrc_info_tests.py
+++ b/src/lib/python/isc/memmgr/tests/datasrc_info_tests.py
@@ -160,6 +160,7 @@ class TestSegmentInfo(unittest.TestCase):
         # in READY state
         self.__si_to_ready_state()
         self.assertRaises(SegmentInfoError, self.__sgmt_info.complete_update)
+        self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.READY)
 
         # in UPDATING state this is the same as calling
         # self.__si_to_synchronizing_state(), but let's try to be
@@ -181,6 +182,7 @@ class TestSegmentInfo(unittest.TestCase):
         # in SYNCHRONIZING state
         self.__si_to_synchronizing_state()
         self.assertRaises(SegmentInfoError, self.__sgmt_info.complete_update)
+        self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.SYNCHRONIZING)
 
         # in COPYING state
         self.__si_to_copying_state()
@@ -188,11 +190,37 @@ class TestSegmentInfo(unittest.TestCase):
         self.assertIsNone(e)
         self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.READY)
 
-    def test_sync_reader_when_ready(self):
-        self.assertRaises(SegmentInfoError, self.__sgmt_info.sync_reader, (None))
+    def test_sync_reader(self):
+        # in READY state, it must raise an exception
+        self.__si_to_ready_state()
+        self.assertRaises(SegmentInfoError, self.__sgmt_info.sync_reader, (0))
+        self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.READY)
+
+        # in UPDATING state, it must raise an exception
+        self.__si_to_updating_state()
+        self.assertRaises(SegmentInfoError, self.__sgmt_info.sync_reader, (0))
+        self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.UPDATING)
+
+        # in COPYING state, it must raise an exception
+        self.__si_to_copying_state()
+        self.assertRaises(SegmentInfoError, self.__sgmt_info.sync_reader, (0))
+        self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.COPYING)
+
+    def test_remove_reader(self):
+        # in READY state, it must raise an exception
+        self.__si_to_ready_state()
+        self.assertRaises(SegmentInfoError, self.__sgmt_info.remove_reader, (0))
+        self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.READY)
+
+        # in UPDATING state, it must raise an exception
+        self.__si_to_updating_state()
+        self.assertRaises(SegmentInfoError, self.__sgmt_info.remove_reader, (0))
+        self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.UPDATING)
 
-    def test_remove_reader_when_ready(self):
-        self.assertRaises(SegmentInfoError, self.__sgmt_info.remove_reader, (None))
+        # in COPYING state, it must raise an exception
+        self.__si_to_copying_state()
+        self.assertRaises(SegmentInfoError, self.__sgmt_info.remove_reader, (0))
+        self.assertEqual(self.__sgmt_info.get_state(), SegmentInfo.COPYING)
 
     def test_switch_versions(self):
         self.__sgmt_info.switch_versions()