From 8f7694d7a5debaba06f34f26ae41c867d22acda0 Mon Sep 17 00:00:00 2001
From: gord chung <gord@live.ca>
Date: Thu, 30 Nov 2017 14:52:30 -0500
Subject: [PATCH] remove duplicate polling.yaml setup

Change-Id: Id4640cd5054140e3f175b71a3a0339dba7b9011d
---
 ceilometer/tests/unit/polling/agentbase.py    |  4 +--
 ceilometer/tests/unit/polling/test_manager.py | 29 +++++++------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/ceilometer/tests/unit/polling/agentbase.py b/ceilometer/tests/unit/polling/agentbase.py
index 66e807c572..9454a8ec5a 100644
--- a/ceilometer/tests/unit/polling/agentbase.py
+++ b/ceilometer/tests/unit/polling/agentbase.py
@@ -171,8 +171,8 @@ class BaseAgentManagerTestCase(base.BaseTestCase):
     class DiscoveryException(TestDiscoveryException):
         params = []
 
-    def setup_polling(self):
-        name = self.cfg2file(self.polling_cfg)
+    def setup_polling(self, poll_cfg=None):
+        name = self.cfg2file(poll_cfg or self.polling_cfg)
         self.CONF.set_override('cfg_file', name, group='polling')
         self.mgr.polling_manager = poll_manager.PollingManager(self.CONF)
 
diff --git a/ceilometer/tests/unit/polling/test_manager.py b/ceilometer/tests/unit/polling/test_manager.py
index ce1fa306e1..5564388445 100644
--- a/ceilometer/tests/unit/polling/test_manager.py
+++ b/ceilometer/tests/unit/polling/test_manager.py
@@ -231,10 +231,6 @@ class TestRunTasks(agentbase.BaseAgentManagerTestCase):
                                              self.CONF), )])
         return exts
 
-    def _build_and_set_new_polling(self):
-        name = self.cfg2file(self.poll_cfg)
-        self.CONF.set_override('cfg_file', name, group='polling')
-
     def test_get_sample_resources(self):
         polling_tasks = self.mgr.setup_polling_tasks()
         self.mgr.interval_task(list(polling_tasks.values())[0])
@@ -245,7 +241,7 @@ class TestRunTasks(agentbase.BaseAgentManagerTestCase):
         self.useFixture(fixtures.MockPatch(
             'keystoneclient.v2_0.client.Client',
             side_effect=ka_exceptions.ClientException))
-        self.poll_cfg = {
+        poll_cfg = {
             'sources': [{
                 'name': "test_keystone",
                 'interval': 10,
@@ -257,8 +253,7 @@ class TestRunTasks(agentbase.BaseAgentManagerTestCase):
                 'transformers': [],
                 'publishers': ["test"]}]
         }
-        self._build_and_set_new_polling()
-        self.mgr.polling_manager = manager.PollingManager(self.CONF)
+        self.setup_polling(poll_cfg)
         polling_tasks = self.mgr.setup_polling_tasks()
         self.mgr.interval_task(list(polling_tasks.values())[0])
         self.assertFalse(self.PollsterKeystone.samples)
@@ -290,7 +285,7 @@ class TestRunTasks(agentbase.BaseAgentManagerTestCase):
         self.mgr.discoveries = (extension.ExtensionManager
                                 .make_test_instance([ext]))
 
-        self.poll_cfg = {
+        poll_cfg = {
             'sources': [{
                 'name': "test_hardware",
                 'interval': 10,
@@ -301,8 +296,7 @@ class TestRunTasks(agentbase.BaseAgentManagerTestCase):
                 'transformers': [],
                 'publishers': ["test"]}]
         }
-        self._build_and_set_new_polling()
-        self.mgr.polling_manager = manager.PollingManager(self.CONF)
+        self.setup_polling(poll_cfg)
         polling_tasks = self.mgr.setup_polling_tasks()
         self.mgr.interval_task(list(polling_tasks.values())[0])
         self.assertEqual(1, novalog.exception.call_count)
@@ -312,7 +306,7 @@ class TestRunTasks(agentbase.BaseAgentManagerTestCase):
     def test_polling_exception(self, LOG):
         source_name = 'test_pollingexception'
         res_list = ['test://']
-        self.poll_cfg = {
+        poll_cfg = {
             'sources': [{
                 'name': source_name,
                 'interval': 10,
@@ -324,8 +318,7 @@ class TestRunTasks(agentbase.BaseAgentManagerTestCase):
                 'transformers': [],
                 'publishers': ["test"]}]
         }
-        self._build_and_set_new_polling()
-        self.mgr.polling_manager = manager.PollingManager(self.CONF)
+        self.setup_polling(poll_cfg)
         polling_task = list(self.mgr.setup_polling_tasks().values())[0]
         pollster = list(polling_task.pollster_matches[source_name])[0]
 
@@ -343,7 +336,7 @@ class TestRunTasks(agentbase.BaseAgentManagerTestCase):
     @mock.patch('ceilometer.polling.manager.LOG')
     def test_polling_novalike_exception(self, LOG):
         source_name = 'test_pollingexception'
-        self.poll_cfg = {
+        poll_cfg = {
             'sources': [{
                 'name': source_name,
                 'interval': 10,
@@ -354,8 +347,7 @@ class TestRunTasks(agentbase.BaseAgentManagerTestCase):
                 'transformers': [],
                 'publishers': ["test"]}]
         }
-        self._build_and_set_new_polling()
-        self.mgr.polling_manager = manager.PollingManager(self.CONF)
+        self.setup_polling(poll_cfg)
         polling_task = list(self.mgr.setup_polling_tasks().values())[0]
         pollster = list(polling_task.pollster_matches[source_name])[0]
 
@@ -386,7 +378,7 @@ class TestRunTasks(agentbase.BaseAgentManagerTestCase):
     def _batching_samples(self, expected_samples, call_count):
         self.useFixture(fixtures.MockPatchObject(manager.utils, 'delayed',
                                                  side_effect=fakedelayed))
-        self.poll_cfg = {
+        poll_cfg = {
             'sources': [{
                 'name': 'test_pipeline',
                 'interval': 1,
@@ -398,8 +390,7 @@ class TestRunTasks(agentbase.BaseAgentManagerTestCase):
                 'transformers': [],
                 'publishers': ["test"]}]
         }
-        self._build_and_set_new_polling()
-        self.mgr.polling_manager = manager.PollingManager(self.CONF)
+        self.setup_polling(poll_cfg)
         polling_task = list(self.mgr.setup_polling_tasks().values())[0]
 
         self.mgr.interval_task(polling_task)