Fix for Bug 1174 zombie processes. Replaced multiprocessing with concurrent-futures

[osm/MON.git] / osm_mon / tests / unit / collector / test_collector_service.py

diff --git a/osm_mon/tests/unit/collector/test_collector_service.py b/osm_mon/tests/unit/collector/test_collector_service.py
index 9b5f002..fc2146c 100644 (file)
--- a/osm_mon/tests/unit/collector/test_collector_service.py
+++ b/osm_mon/tests/unit/collector/test_collector_service.py
@@ -41,7 +41,7 @@ class CollectorServiceTest(TestCase):
     def test_init_vim_collector_and_collect_openstack(self, _get_vim_account, collect):
         _get_vim_account.return_value = {'vim_type': 'openstack'}
         collector = CollectorService(self.config)
-        collector._collect_vim_metrics({}, 'test_vim_account_id')
+        collector._collect_vim_metrics(self.config, {}, 'test_vim_account_id')
         collect.assert_called_once_with({})
 
     @mock.patch.object(OpenstackCollector, "collect")
@@ -49,7 +49,7 @@ class CollectorServiceTest(TestCase):
     def test_init_vim_collector_and_collect_unknown(self, _get_vim_account, openstack_collect):
         _get_vim_account.return_value = {'vim_type': 'unknown'}
         collector = CollectorService(self.config)
-        collector._collect_vim_metrics({}, 'test_vim_account_id')
+        collector._collect_vim_metrics(self.config, {}, 'test_vim_account_id')
         openstack_collect.assert_not_called()
 
     @mock.patch.object(OpenstackCollector, "__init__", lambda *args, **kwargs: None)
@@ -58,7 +58,7 @@ class CollectorServiceTest(TestCase):
     def test_init_vim_collector_and_collect_vio_with_openstack_collector(self, _get_vim_account, openstack_collect):
         _get_vim_account.return_value = {'vim_type': 'openstack', 'config': {'vim_type': 'VIO'}}
         collector = CollectorService(self.config)
-        collector._collect_vim_metrics({}, 'test_vim_account_id')
+        collector._collect_vim_metrics(self.config, {}, 'test_vim_account_id')
         openstack_collect.assert_called_once_with({})
 
     @mock.patch.object(VIOCollector, "__init__", lambda *args, **kwargs: None)
@@ -68,12 +68,12 @@ class CollectorServiceTest(TestCase):
         _get_vim_account.return_value = {'vim_type': 'openstack',
                                          'config': {'vim_type': 'VIO', 'vrops_site': 'https://vrops'}}
         collector = CollectorService(self.config)
-        collector._collect_vim_metrics({}, 'test_vim_account_id')
+        collector._collect_vim_metrics(self.config, {}, 'test_vim_account_id')
         vio_collect.assert_called_once_with({})
 
     @mock.patch("osm_mon.collector.service.VCACollector", autospec=True)
     def test_collect_vca_metrics(self, vca_collector):
         collector = CollectorService(self.config)
-        collector._collect_vca_metrics({})
+        collector._collect_vca_metrics(self.config, {})
         vca_collector.assert_called_once_with(self.config)
         vca_collector.return_value.collect.assert_called_once_with({})