Changeset 10348

Timestamp:

22 Jun 2013, 21:35:05 (11 years ago)

Author:

uli

Message:

Modify tempfile.tempdir on test runs to remove really all tempdirs created during tests by mkdtemp().

File:

• main/waeup.cas/trunk/waeup/cas/tests/test_server.py (modified) (1 diff)

main/waeup.cas/trunk/waeup/cas/tests/test_server.py

@@ -11 +11 @@
 
     def setUp(self):
-        self.workdir = tempfile.mkdtemp()
+        # Create a new location where tempfiles are created.  This way
+        # also temporary dirs of local CASServers can be removed on
+        # tear-down.
+        self._new_tmpdir = tempfile.mkdtemp()
+        self._old_tmpdir = tempfile.tempdir
+        tempfile.tempdir = self._new_tmpdir
+        self.workdir = os.path.join(self._new_tmpdir, 'home')
+        self.db_path = os.path.join(self.workdir, 'mycas.db')
         self.paste_conf1 = os.path.join(
             os.path.dirname(__file__), 'sample1.ini')
 
     def tearDown(self):
-        shutil.rmtree(self.workdir)
+        # remove local tempfile and reset old tempdir setting
+        if os.path.isdir(self._new_tmpdir):
+            shutil.rmtree(self._new_tmpdir)
+        tempfile.tempdir = self._old_tmpdir
 
     def test_paste_deploy_loader(self):