From: Jelte Jansen Date: Sun, 30 Sep 2012 11:22:17 +0000 (+0200) Subject: [2254] cleanup and a few more comments X-Git-Tag: trac2402_base~83^2~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=362430efc09897c1e7d7bdf2bf7b4cffd9fd2e3b;p=thirdparty%2Fkea.git [2254] cleanup and a few more comments --- diff --git a/src/lib/python/isc/config/config_data.py b/src/lib/python/isc/config/config_data.py index 3a5a631b1e..7fde0ea5d2 100644 --- a/src/lib/python/isc/config/config_data.py +++ b/src/lib/python/isc/config/config_data.py @@ -847,7 +847,7 @@ class MultiConfigData: """ spec_part = self.find_spec_part(item_name) if spec_part_is_named_set(spec_part): - values, status = self.get_value(item_name) + values, _ = self.get_value(item_name) if values is not None and len(values) > 0: subslash = "" if spec_part['named_set_item_spec']['item_type'] == 'map' or\ @@ -860,7 +860,7 @@ class MultiConfigData: else: return [ item_name ] elif spec_part_is_list(spec_part): - values, status = self.get_value(item_name) + values, _ = self.get_value(item_name) if values is not None and len(values) > 0: result = [] for i in range(len(values)): diff --git a/src/lib/python/isc/config/tests/config_data_test.py b/src/lib/python/isc/config/tests/config_data_test.py index 444c2520b5..e8a77affc2 100644 --- a/src/lib/python/isc/config/tests/config_data_test.py +++ b/src/lib/python/isc/config/tests/config_data_test.py @@ -389,10 +389,13 @@ class TestMultiConfigData(unittest.TestCase): self.assertEqual(None, spec_part) spec_part = self.mcd.find_spec_part("/Spec2/item1") self.assertEqual(None, spec_part) - module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec2.spec") + module_spec = isc.config.module_spec_from_file(self.data_path + + os.sep + "spec2.spec") self.mcd.set_specification(module_spec) spec_part = self.mcd.find_spec_part("Spec2/item1") - self.assertEqual({'item_name': 'item1', 'item_type': 'integer', 'item_optional': False, 'item_default': 1, }, spec_part) + self.assertEqual({'item_name': 'item1', 'item_type': 'integer', + 'item_optional': False, 'item_default': 1, }, + spec_part) # For lists, either the spec of the list itself, or the # spec for the list contents should be returned (the @@ -416,6 +419,7 @@ class TestMultiConfigData(unittest.TestCase): def test_find_spec_part_nested(self): + # Check that find_spec_part works for nested lists module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec30.spec") self.mcd.set_specification(module_spec) spec_part = self.mcd.find_spec_part("/lists/first_list_items[0]/second_list_items[1]/final_element") @@ -424,6 +428,7 @@ class TestMultiConfigData(unittest.TestCase): self.assertEqual(None, spec_part) def test_find_spec_part_nested2(self): + # Check that find_spec_part works for nested lists and maps module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec31.spec") self.mcd.set_specification(module_spec) spec_part = self.mcd.find_spec_part("/lists/first_list_items[0]/second_list_items[1]/map_element/list1[1]/list2[2]") @@ -671,7 +676,7 @@ class TestMultiConfigData(unittest.TestCase): self.assertEqual(expected, maps) # A slash at the end should not produce different output with - # indices too + # indices either expected2 = [{'default': True, 'type': 'integer', 'name': 'Spec22/value5[1]', @@ -753,6 +758,8 @@ class TestMultiConfigData(unittest.TestCase): self.assertRaises(isc.cc.data.DataNotFoundError, self.mcd.unset, "Spec2/doesnotexist") def test_get_config_item_list(self): + # Test get_config_item_list(), which returns a list of the config + # items in a specification. config_items = self.mcd.get_config_item_list() self.assertEqual([], config_items) module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec2.spec") @@ -762,20 +769,34 @@ class TestMultiConfigData(unittest.TestCase): config_items = self.mcd.get_config_item_list(None, False) self.assertEqual(['Spec2'], config_items) config_items = self.mcd.get_config_item_list(None, True) - self.assertEqual(['Spec2/item1', 'Spec2/item2', 'Spec2/item3', 'Spec2/item4', 'Spec2/item5', 'Spec2/item6/value1', 'Spec2/item6/value2'], config_items) + self.assertEqual(['Spec2/item1', 'Spec2/item2', 'Spec2/item3', + 'Spec2/item4', 'Spec2/item5', 'Spec2/item6/value1', + 'Spec2/item6/value2'], config_items) config_items = self.mcd.get_config_item_list("Spec2", True) - self.assertEqual(['Spec2/item1', 'Spec2/item2', 'Spec2/item3', 'Spec2/item4', 'Spec2/item5[0]', 'Spec2/item5[1]', 'Spec2/item6/value1', 'Spec2/item6/value2'], config_items) + self.assertEqual(['Spec2/item1', 'Spec2/item2', 'Spec2/item3', + 'Spec2/item4', 'Spec2/item5[0]', 'Spec2/item5[1]', + 'Spec2/item6/value1', 'Spec2/item6/value2'], + config_items) config_items = self.mcd.get_config_item_list("Spec2") - self.assertEqual(['Spec2/item1', 'Spec2/item2', 'Spec2/item3', 'Spec2/item4', 'Spec2/item5[0]', 'Spec2/item5[1]', 'Spec2/item6'], config_items) + self.assertEqual(['Spec2/item1', 'Spec2/item2', 'Spec2/item3', + 'Spec2/item4', 'Spec2/item5[0]', 'Spec2/item5[1]', + 'Spec2/item6'], config_items) config_items = self.mcd.get_config_item_list("/Spec2") - self.assertEqual(['Spec2/item1', 'Spec2/item2', 'Spec2/item3', 'Spec2/item4', 'Spec2/item5[0]', 'Spec2/item5[1]', 'Spec2/item6'], config_items) + self.assertEqual(['Spec2/item1', 'Spec2/item2', 'Spec2/item3', + 'Spec2/item4', 'Spec2/item5[0]', 'Spec2/item5[1]', + 'Spec2/item6'], config_items) config_items = self.mcd.get_config_item_list("Spec2", True) - self.assertEqual(['Spec2/item1', 'Spec2/item2', 'Spec2/item3', 'Spec2/item4', 'Spec2/item5[0]', 'Spec2/item5[1]', 'Spec2/item6/value1', 'Spec2/item6/value2'], config_items) + self.assertEqual(['Spec2/item1', 'Spec2/item2', 'Spec2/item3', + 'Spec2/item4', 'Spec2/item5[0]', 'Spec2/item5[1]', + 'Spec2/item6/value1', 'Spec2/item6/value2'], + config_items) # When lists are empty, it should only show the name self.mcd.set_value('Spec2/item5', []) config_items = self.mcd.get_config_item_list("Spec2", True) - self.assertEqual(['Spec2/item1', 'Spec2/item2', 'Spec2/item3', 'Spec2/item4', 'Spec2/item5', 'Spec2/item6/value1', 'Spec2/item6/value2'], config_items) + self.assertEqual(['Spec2/item1', 'Spec2/item2', 'Spec2/item3', + 'Spec2/item4', 'Spec2/item5', 'Spec2/item6/value1', + 'Spec2/item6/value2'], config_items) def test_is_named_set(self): module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec32.spec")