|
@@ -693,33 +693,57 @@ class TestStats(unittest.TestCase):
|
|
|
self.assertEqual(self.stats.update_statistics_data(
|
|
|
'Foo', 'foo1', _test_exp6), ['unknown module name: Foo'])
|
|
|
|
|
|
- @unittest.skipIf(sys.version_info >= (3, 3), "Unsupported in Python 3.3 or higher")
|
|
|
def test_update_statistics_data_withmid(self):
|
|
|
- self.stats = stats.Stats()
|
|
|
+ self.stats = SimpleStats()
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ create_answer = isc.config.ccsession.create_answer
|
|
|
+ self.stats._answers = [\
|
|
|
+
|
|
|
+ (create_answer(0, [[1034, 'b10-auth-1', 'Auth'],
|
|
|
+ [1035, 'b10-auth-2', 'Auth']]), None),
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ (create_answer(0, self.stats._auth_sdata), {'from': 'auth1'}),
|
|
|
+ (create_answer(0, self.stats._auth_sdata), {'from': 'auth2'}),
|
|
|
+ (create_answer(0, self.stats._auth_sdata), {'from': 'auth3'})
|
|
|
+ ]
|
|
|
+
|
|
|
+
|
|
|
+ self.stats.update_modules = lambda: None
|
|
|
+
|
|
|
self.stats.do_polling()
|
|
|
+
|
|
|
|
|
|
bar1_tcp = 1001
|
|
|
bar2_tcp = 2001
|
|
|
bar3_tcp = 1002
|
|
|
bar3_udp = 1003
|
|
|
-
|
|
|
- list_auth = [ self.base.auth.server,
|
|
|
- self.base.auth2.server ]
|
|
|
- sum_qtcp = 0
|
|
|
- for a in list_auth:
|
|
|
- sum_qtcp += a.queries_tcp
|
|
|
- sum_qudp = 0
|
|
|
- for a in list_auth:
|
|
|
- sum_qudp += a.queries_udp
|
|
|
+
|
|
|
+ sum_qtcp = self.stats._queries_tcp * 2
|
|
|
+ sum_qudp = self.stats._queries_udp * 2
|
|
|
self.stats.update_statistics_data('Auth', "bar1@foo",
|
|
|
- {'queries.tcp':bar1_tcp})
|
|
|
+ {'queries.tcp': bar1_tcp})
|
|
|
self.assertTrue('Auth' in self.stats.statistics_data)
|
|
|
self.assertTrue('queries.tcp' in self.stats.statistics_data['Auth'])
|
|
|
self.assertEqual(self.stats.statistics_data['Auth']['queries.tcp'],
|
|
|
bar1_tcp + sum_qtcp)
|
|
|
self.assertTrue('Auth' in self.stats.statistics_data_bymid)
|
|
|
self.assertTrue('bar1@foo' in self.stats.statistics_data_bymid['Auth'])
|
|
|
- self.assertTrue('queries.tcp' in self.stats.statistics_data_bymid['Auth']['bar1@foo'])
|
|
|
+ self.assertTrue('queries.tcp' in self.stats.statistics_data_bymid
|
|
|
+ ['Auth']['bar1@foo'])
|
|
|
self.assertEqual(self.stats.statistics_data_bymid['Auth']['bar1@foo'],
|
|
|
{'queries.tcp': bar1_tcp})
|
|
|
|
|
@@ -745,7 +769,8 @@ class TestStats(unittest.TestCase):
|
|
|
self.assertTrue('queries.udp' in self.stats.statistics_data['Auth'])
|
|
|
self.assertEqual(self.stats.statistics_data['Auth']['queries.tcp'],
|
|
|
bar1_tcp + bar2_tcp + sum_qtcp)
|
|
|
- self.assertEqual(self.stats.statistics_data['Auth']['queries.udp'], sum_qudp)
|
|
|
+ self.assertEqual(self.stats.statistics_data['Auth']['queries.udp'],
|
|
|
+ sum_qudp)
|
|
|
self.assertTrue('Auth' in self.stats.statistics_data_bymid)
|
|
|
|
|
|
|