BIND 10 trac2853, updated. 92ebcb9a94e233362660b3d3f29df319da919286 [2853] Add some more assertions

[BIND 10 source code commits]

The branch, trac2853 has been updated
       via  92ebcb9a94e233362660b3d3f29df319da919286 (commit)
       via  3a6139c33b7db517e76723d631ee49d47dc691dd (commit)
      from  a555e12ddf75657f9ba417f1bc9366c8ba094854 (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 92ebcb9a94e233362660b3d3f29df319da919286
Author: Mukund Sivaraman <muks at isc.org>
Date:   Tue Jun 11 00:15:04 2013 +0530

    [2853] Add some more assertions

commit 3a6139c33b7db517e76723d631ee49d47dc691dd
Author: Mukund Sivaraman <muks at isc.org>
Date:   Tue Jun 11 00:11:52 2013 +0530

    [2853] Return empty list instead of None for empty get_status() result

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

Summary of changes:
 .../isc/datasrc/configurableclientlist_python.cc   |    3 ---
 .../python/isc/datasrc/tests/clientlist_test.py    |    7 ++++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/datasrc/configurableclientlist_python.cc b/src/lib/python/isc/datasrc/configurableclientlist_python.cc
index b33d043..4900964 100644
--- a/src/lib/python/isc/datasrc/configurableclientlist_python.cc
+++ b/src/lib/python/isc/datasrc/configurableclientlist_python.cc
@@ -201,9 +201,6 @@ ConfigurableClientList_getStatus(PyObject* po_self, PyObject*) {
         static_cast<s_ConfigurableClientList*>(po_self);
     try {
         const std::vector<DataSourceStatus> status = self->cppobj->getStatus();
-        if (status.empty()) {
-            Py_RETURN_NONE;
-        }
 
         PyObject *slist = PyList_New(status.size());
         if (!slist) {
diff --git a/src/lib/python/isc/datasrc/tests/clientlist_test.py b/src/lib/python/isc/datasrc/tests/clientlist_test.py
index c24a10b..c3bcc4a 100644
--- a/src/lib/python/isc/datasrc/tests/clientlist_test.py
+++ b/src/lib/python/isc/datasrc/tests/clientlist_test.py
@@ -213,7 +213,9 @@ class ClientListTest(unittest.TestCase):
         self.clist = isc.datasrc.ConfigurableClientList(isc.dns.RRClass.IN)
 
         status = self.clist.get_status()
-        self.assertIsNone(status)
+        self.assertIsNotNone(status)
+        self.assertIsInstance(status, list)
+        self.assertEqual(0, len(status))
 
         self.clist.configure('''[{
             "type": "MasterFiles",
@@ -224,7 +226,10 @@ class ClientListTest(unittest.TestCase):
         }]''', True)
 
         status = self.clist.get_status()
+        self.assertIsNotNone(status)
+        self.assertIsInstance(status, list)
         self.assertEqual(1, len(status))
+        self.assertIsInstance(status[0], tuple)
         self.assertTupleEqual(('MasterFiles', 'local', isc.datasrc.ConfigurableClientList.SEGMENT_INUSE),
                               status[0])