Browse Source

[2884] add classname layer

Naoki Kambe 12 years ago
parent
commit
e09ae1968e
1 changed files with 8 additions and 5 deletions
  1. 8 5
      src/lib/python/isc/statistics/tests/counters_test.py

+ 8 - 5
src/lib/python/isc/statistics/tests/counters_test.py

@@ -399,8 +399,10 @@ class TestDummyNotifyOut(unittest.TestCase):
 
 
     def test_counters(self):
     def test_counters(self):
         self.assertEqual(
         self.assertEqual(
-            {'zones': {'_SERVER_': {'notifyoutv4': 1, 'notifyoutv6': 1},
-                       TEST_ZONE_NAME_STR: {'notifyoutv4': 1, 'notifyoutv6': 1}}},
+            {'zones': {TEST_ZONE_CLASS_STR: { '_SERVER_':
+                           {'notifyoutv4': 1, 'notifyoutv6': 1},
+                                              TEST_ZONE_NAME_STR:
+                           {'notifyoutv4': 1, 'notifyoutv6': 1}}}},
             self.notifier.get_counters())
             self.notifier.get_counters())
 
 
 class TestDummyXfroutServer(unittest.TestCase):
 class TestDummyXfroutServer(unittest.TestCase):
@@ -418,13 +420,14 @@ class TestDummyXfroutServer(unittest.TestCase):
         self.assertEqual(
         self.assertEqual(
             {'axfr_running': 0, 'ixfr_running': 0,
             {'axfr_running': 0, 'ixfr_running': 0,
              'socket': {'unixdomain': {'open': 1, 'close': 1}},
              'socket': {'unixdomain': {'open': 1, 'close': 1}},
-             'zones': {'_SERVER_': {'notifyoutv4': 1,
+             'zones': {TEST_ZONE_CLASS_STR: {
+                        '_SERVER_': {'notifyoutv4': 1,
                                     'notifyoutv6': 1,
                                     'notifyoutv6': 1,
                                     'xfrrej': 1, 'xfrreqdone': 1},
                                     'xfrrej': 1, 'xfrreqdone': 1},
-                       TEST_ZONE_NAME_STR: {'notifyoutv4': 1,
+                        TEST_ZONE_NAME_STR: {'notifyoutv4': 1,
                                         'notifyoutv6': 1,
                                         'notifyoutv6': 1,
                                         'xfrrej': 1,
                                         'xfrrej': 1,
-                                        'xfrreqdone': 1}}},
+                                        'xfrreqdone': 1}}}},
             self.xfrout_server.get_counters())
             self.xfrout_server.get_counters())
 
 
 if __name__== "__main__":
 if __name__== "__main__":