Merge "Create temp file in setUp() to avoid warning"

1 files changed, 5 insertions, 3 deletions

diff --git a/neutron/tests/unit/agent/linux/test_daemon.py b/neutron/tests/unit/agent/linux/test_daemon.py
index e4a06cf368..049b8c649f 100644
--- a/neutron/tests/unit/agent/linux/test_daemon.py
+++ b/neutron/tests/unit/agent/linux/test_daemon.py
@@ -35,13 +35,15 @@ class FakeEntry(object):
 
 
 class TestUnwatchLog(base.BaseTestCase):
+    def setUp(self):
+        super(TestUnwatchLog, self).setUp()
+        self.temp_file = self.get_temp_file_path('unwatch_log_temp_file')
 
     def test_unwatch_log(self):
-        temp_file_name = self.get_temp_file_path('unwatch_log_temp_file_name')
         stream_handler = logging.StreamHandler()
         logger = logging.Logger('fake')
         logger.addHandler(stream_handler)
-        logger.addHandler(handlers.WatchedFileHandler(temp_file_name))
+        logger.addHandler(handlers.WatchedFileHandler(self.temp_file))
 
         with mock.patch('logging.getLogger', return_value=logger):
             daemon.unwatch_log()
@@ -49,7 +51,7 @@ class TestUnwatchLog(base.BaseTestCase):
             logger.handlers.remove(stream_handler)
             observed = logger.handlers[0]
             self.assertEqual(logging.FileHandler, type(observed))
-            self.assertEqual(temp_file_name, observed.baseFilename)
+            self.assertEqual(self.temp_file, observed.baseFilename)
 
 
 class TestPrivileges(base.BaseTestCase):