diff options
author | Julien Cristau <julien.cristau@logilab.fr> | 2013-02-22 09:46:41 +0100 |
---|---|---|
committer | Julien Cristau <julien.cristau@logilab.fr> | 2013-02-22 09:46:41 +0100 |
commit | f3fbd3b38a8624c83e6f13616947c2775f194cac (patch) | |
tree | a16c08a331cc065931d6715ea6a60aafc58d14dd | |
parent | 6d1c386f313a6c88d3ea4e5ba612266dbac2c362 (diff) | |
download | logilab-common-f3fbd3b38a8624c83e6f13616947c2775f194cac.tar.gz |
[testlib] check for generators in with_tempdir
If the decorated callable is a generator, we shouldn't reset tempfile.tempdir
until the end of the iteration. Hopefully nobody uses this with nested/chained
generators, or they'd stomp all over each other's tempdirs.
Closes #117533
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | test/unittest_testlib.py | 11 | ||||
-rw-r--r-- | testlib.py | 15 |
3 files changed, 28 insertions, 0 deletions
@@ -1,6 +1,8 @@ ChangeLog for logilab.common ============================ +-- + * testlib: check for generators in with_tempdir (closes #117533) 2013-01-21 -- 0.59.0 diff --git a/test/unittest_testlib.py b/test/unittest_testlib.py index 4ea8242..f83e1f2 100644 --- a/test/unittest_testlib.py +++ b/test/unittest_testlib.py @@ -628,6 +628,17 @@ class DecoratorTC(TestCase): self.assertListEqual(list(os.walk(tempdir)), [(tempdir, [], [])]) + def test_tmpdir_generator(self): + orig_tempdir = tempfile.gettempdir() + + @with_tempdir + def gen(): + yield tempfile.gettempdir() + + for tempdir in gen(): + self.assertNotEqual(orig_tempdir, tempdir) + self.assertEqual(orig_tempdir, tempfile.gettempdir()) + def setUp(self): self.pyversion = sys.version_info @@ -124,6 +124,21 @@ __unittest = 1 def with_tempdir(callable): """A decorator ensuring no temporary file left when the function return Work only for temporary file create with the tempfile module""" + if is_generator(callable): + def proxy(*args, **kwargs): + old_tmpdir = tempfile.gettempdir() + new_tmpdir = tempfile.mkdtemp(prefix="temp-lgc-") + tempfile.tempdir = new_tmpdir + try: + for x in callable(*args, **kwargs): + yield x + finally: + try: + rmtree(new_tmpdir, ignore_errors=True) + finally: + tempfile.tempdir = old_tmpdir + return proxy + @wraps(callable) def proxy(*args, **kargs): |