Use fixtures in the tests

TempDir() makes sure all files created under it are deleted
at the end of the tests.
FakeLogger() hides logs when the test passes and displays logs
for failed tests.

part of bug 1177924
Change-Id: I07acb66daa1932d7864a5431f1b64570b747ce5a

ceilometer/tests/base.py

@@ -18,8 +18,10 @@
 # under the License.
 """Test base classes.
 """
+import fixtures
 import mox
 from oslo.config import cfg
+import os.path
 import stubout
 import testtools
 
@@ -32,6 +34,9 @@ def setUp(self):
         super(TestCase, self).setUp()
         self.mox = mox.Mox()
         self.stubs = stubout.StubOutForTesting()
+        self.tempdir = self.useFixture(fixtures.TempDir())
+        self.useFixture(fixtures.FakeLogger())
+
         # Set a default location for the pipeline config file so the
         # tests work even if ceilometer is not installed globally on
         # the system.
@@ -40,6 +45,9 @@ def setUp(self):
             '../etc/ceilometer/pipeline.yaml',
         )
 
+    def temp_config_file_path(self, name='ceilometer.conf'):
+        return os.path.join(self.tempdir.path, name)
+
     def tearDown(self):
         self.mox.UnsetStubs()
         self.stubs.UnsetAll()

tests/api/v1/test_app.py

@@ -18,7 +18,6 @@
 """Test basic ceilometer-api app
 """
 import os
-import tempfile
 
 from oslo.config import cfg
 
@@ -42,7 +41,7 @@ def test_keystone_middleware_conf(self):
         self.assertEqual(api_app.wsgi_app.auth_protocol, 'foottp')
 
     def test_keystone_middleware_parse_conffile(self):
-        tmpfile = tempfile.mktemp()
+        tmpfile = self.temp_config_file_path()
         with open(tmpfile, "w") as f:
             f.write("[%s]\nauth_protocol = barttp" % acl.OPT_GROUP_NAME)
             f.write("\nauth_version = v2.0")

tests/api/v2/test_app.py

@@ -18,7 +18,6 @@
 """Test basic ceilometer-api app
 """
 import os
-import tempfile
 
 from oslo.config import cfg
 
@@ -46,7 +45,7 @@ def test_keystone_middleware_conf(self):
         self.assertEqual(api_app.auth_protocol, 'foottp')
 
     def test_keystone_middleware_parse_conffile(self):
-        tmpfile = tempfile.mktemp()
+        tmpfile = self.temp_config_file_path()
         with open(tmpfile, "w") as f:
             f.write("[DEFAULT]\n")
             f.write("pipeline_cfg_file = ../etc/ceilometer/pipeline.yaml\n")

tests/test_bin.py

@@ -19,11 +19,9 @@
 
 import httplib2
 import json
-import os
 import random
 import socket
 import subprocess
-import tempfile
 import time
 
 from ceilometer.tests import base
@@ -32,7 +30,7 @@
 class BinDbsyncTestCase(base.TestCase):
     def setUp(self):
         super(BinDbsyncTestCase, self).setUp()
-        self.tempfile = tempfile.mktemp()
+        self.tempfile = self.temp_config_file_path()
         with open(self.tempfile, 'w') as tmp:
             tmp.write("[DEFAULT]\n")
             tmp.write("database_connection=log://localhost\n")
@@ -42,15 +40,11 @@ def test_dbsync_run(self):
                                  "--config-file=%s" % self.tempfile])
         self.assertEqual(subp.wait(), 0)
 
-    def tearDown(self):
-        super(BinDbsyncTestCase, self).tearDown()
-        os.unlink(self.tempfile)
-
 
 class BinSendCounterTestCase(base.TestCase):
     def setUp(self):
         super(BinSendCounterTestCase, self).setUp()
-        self.tempfile = tempfile.mktemp()
+        self.tempfile = self.temp_config_file_path()
         with open(self.tempfile, 'w') as tmp:
             tmp.write("[DEFAULT]\n")
             tmp.write(
@@ -65,18 +59,14 @@ def test_send_counter_run(self):
                                  "--counter-name=mycounter"])
         self.assertEqual(subp.wait(), 0)
 
-    def tearDown(self):
-        super(BinSendCounterTestCase, self).tearDown()
-        os.unlink(self.tempfile)
-
 
 class BinApiTestCase(base.TestCase):
 
     def setUp(self):
         super(BinApiTestCase, self).setUp()
         self.api_port = random.randint(10000, 11000)
         self.http = httplib2.Http()
-        self.tempfile = tempfile.mktemp()
+        self.tempfile = self.temp_config_file_path()
         with open(self.tempfile, 'w') as tmp:
             tmp.write("[DEFAULT]\n")
             tmp.write(
@@ -95,7 +85,6 @@ def setUp(self):
 
     def tearDown(self):
         super(BinApiTestCase, self).tearDown()
-        os.unlink(self.tempfile)
         self.subp.kill()
         self.subp.wait()
 

tools/test-requires

@@ -2,6 +2,7 @@ nose
 coverage
 mock
 mox
+fixtures>=0.3.12
 Babel>=0.9.6
 # NOTE(dhellmann): Ming is necessary to provide the Mongo-in-memory
 # implementation of MongoDB.