Browse Source

[2823] updtaed stats-httpd mccs test using new mock class

JINMEI Tatuya 12 years ago
parent
commit
35df226d16
1 changed files with 2 additions and 5 deletions
  1. 2 5
      src/bin/stats/tests/b10-stats-httpd_test.py

+ 2 - 5
src/bin/stats/tests/b10-stats-httpd_test.py

@@ -628,7 +628,6 @@ class TestStatsHttpd(unittest.TestCase):
         # The real CfgMgr would return 'version', but our test mock omits it,
         # The real CfgMgr would return 'version', but our test mock omits it,
         # so the len(config) should be 1
         # so the len(config) should be 1
         self.assertEqual(len(self.stats_httpd.config), 1)
         self.assertEqual(len(self.stats_httpd.config), 1)
-        print(self.stats_httpd.config)
         self.assertTrue('listen_on' in self.stats_httpd.config)
         self.assertTrue('listen_on' in self.stats_httpd.config)
         self.assertEqual(len(self.stats_httpd.config['listen_on']), 1)
         self.assertEqual(len(self.stats_httpd.config['listen_on']), 1)
         self.assertTrue('address' in self.stats_httpd.config['listen_on'][0])
         self.assertTrue('address' in self.stats_httpd.config['listen_on'][0])
@@ -659,14 +658,12 @@ class TestStatsHttpd(unittest.TestCase):
         self.assertEqual(self.stats_httpd.mccs, None)
         self.assertEqual(self.stats_httpd.mccs, None)
         self.assertEqual(self.stats_httpd.close_mccs(), None)
         self.assertEqual(self.stats_httpd.close_mccs(), None)
 
 
-    @unittest.skipIf(True, 'tentatively skipped')
     def test_mccs(self):
     def test_mccs(self):
-        self.stats_httpd = MyStatsHttpd(get_availaddr())
+        self.stats_httpd = SimpleStatsHttpd(get_availaddr())
         self.assertIsNotNone(self.stats_httpd.mccs.get_socket())
         self.assertIsNotNone(self.stats_httpd.mccs.get_socket())
         self.assertTrue(
         self.assertTrue(
             isinstance(self.stats_httpd.mccs.get_socket(), socket.socket))
             isinstance(self.stats_httpd.mccs.get_socket(), socket.socket))
-        self.assertTrue(
-            isinstance(self.stats_httpd.cc_session, isc.cc.session.Session))
+        self.assertNotEqual(None, self.stats_httpd.cc_session)
         statistics_spec = self.stats_httpd.get_stats_spec()
         statistics_spec = self.stats_httpd.get_stats_spec()
         for mod in DUMMY_DATA:
         for mod in DUMMY_DATA:
             self.assertTrue(mod in statistics_spec)
             self.assertTrue(mod in statistics_spec)