Browse Source

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

Mukund Sivaraman 12 years ago
parent
commit
3a6139c33b

+ 0 - 3
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) {

+ 3 - 1
src/lib/python/isc/datasrc/tests/clientlist_test.py

@@ -213,7 +213,8 @@ 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.assertEqual(0, len(status))
 
         self.clist.configure('''[{
             "type": "MasterFiles",
@@ -224,6 +225,7 @@ class ClientListTest(unittest.TestCase):
         }]''', True)
 
         status = self.clist.get_status()
+        self.assertIsNotNone(status)
         self.assertEqual(1, len(status))
         self.assertTupleEqual(('MasterFiles', 'local', isc.datasrc.ConfigurableClientList.SEGMENT_INUSE),
                               status[0])