clean up temporary dirs in tearDown to force cleanup even if tests fail

tests/test_pelican.py

@@ -5,11 +5,11 @@ except ImportError:
 
 import os
 from filecmp import dircmp
+from tempfile import mkdtemp
+from shutil import rmtree
 
 from mock import patch
 
-from .support import temporary_folder
-
 from pelican import Pelican
 from pelican.settings import read_settings
 
@@ -25,46 +25,23 @@ class TestPelican(unittest.TestCase):
     # general functional testing for pelican. Basically, this test case tries
     # to run pelican in different situations and see how it behaves
 
+    def setUp(self):
+        self.temp_path = mkdtemp()
+
+    def tearDown(self):
+        rmtree(self.temp_path)
+
     def test_basic_generation_works(self):
         # when running pelican without settings, it should pick up the default
         # ones and generate the output without raising any exception / issuing
         # any warning.
-        with temporary_folder() as temp_path:
-            with patch("pelican.contents.getenv") as mock_getenv:
-                # force getenv('USER') to always return the same value
-                mock_getenv.return_value = "Dummy Author"
-                pelican = Pelican(path=INPUT_PATH, output_path=temp_path)
-                pelican.run()
-                diff = dircmp(temp_path, os.sep.join((OUTPUT_PATH, "basic")))
-                self.assertEqual(diff.left_only, [], msg="some generated " \
-                        "files are absent from the expected functional " \
-                        "tests output.\n" \
-                        "This is probably because the HTML generated files " \
-                        "changed. If these changes are normal, please refer " \
-                        "to docs/contribute.rst to update the expected " \
-                        "output of the functional tests.")
-                self.assertEqual(diff.right_only, [], msg="some files from " \
-                        "the expected functional tests output are absent " \
-                        "from the current output.\n" \
-                        "This is probably because the HTML generated files " \
-                        "changed. If these changes are normal, please refer " \
-                        "to docs/contribute.rst to update the expected " \
-                        "output of the functional tests.")
-                self.assertEqual(diff.diff_files, [], msg="some generated " \
-                        "files differ from the expected functional tests " \
-                        "output.\n" \
-                        "This is probably because the HTML generated files " \
-                        "changed. If these changes are normal, please refer " \
-                        "to docs/contribute.rst to update the expected " \
-                        "output of the functional tests.")
-
-    def test_custom_generation_works(self):
-        # the same thing with a specified set of settings should work
-        with temporary_folder() as temp_path:
-            pelican = Pelican(path=INPUT_PATH, output_path=temp_path,
-                              settings=read_settings(SAMPLE_CONFIG))
+        with patch("pelican.contents.getenv") as mock_getenv:
+            # force getenv('USER') to always return the same value
+            mock_getenv.return_value = "Dummy Author"
+            pelican = Pelican(path=INPUT_PATH, output_path=self.temp_path)
             pelican.run()
-            diff = dircmp(temp_path, os.sep.join((OUTPUT_PATH, "custom")))
+            diff = dircmp(
+                    self.temp_path, os.sep.join((OUTPUT_PATH, "basic")))
             self.assertEqual(diff.left_only, [], msg="some generated " \
                     "files are absent from the expected functional " \
                     "tests output.\n" \
@@ -86,3 +63,31 @@ class TestPelican(unittest.TestCase):
                     "changed. If these changes are normal, please refer " \
                     "to docs/contribute.rst to update the expected " \
                     "output of the functional tests.")
+
+    def test_custom_generation_works(self):
+        # the same thing with a specified set of settings should work
+        pelican = Pelican(path=INPUT_PATH, output_path=self.temp_path,
+                            settings=read_settings(SAMPLE_CONFIG))
+        pelican.run()
+        diff = dircmp(self.temp_path, os.sep.join((OUTPUT_PATH, "custom")))
+        self.assertEqual(diff.left_only, [], msg="some generated " \
+                "files are absent from the expected functional " \
+                "tests output.\n" \
+                "This is probably because the HTML generated files " \
+                "changed. If these changes are normal, please refer " \
+                "to docs/contribute.rst to update the expected " \
+                "output of the functional tests.")
+        self.assertEqual(diff.right_only, [], msg="some files from " \
+                "the expected functional tests output are absent " \
+                "from the current output.\n" \
+                "This is probably because the HTML generated files " \
+                "changed. If these changes are normal, please refer " \
+                "to docs/contribute.rst to update the expected " \
+                "output of the functional tests.")
+        self.assertEqual(diff.diff_files, [], msg="some generated " \
+                "files differ from the expected functional tests " \
+                "output.\n" \
+                "This is probably because the HTML generated files " \
+                "changed. If these changes are normal, please refer " \
+                "to docs/contribute.rst to update the expected " \
+                "output of the functional tests.")