Merge pull request #7934 from QuLogic/test-animation-tmpdir

NelleV · web-flow · commit 03a9aaa57b94 · 2017-01-23T20:47:15.000-08:00
Run animation smoketest in a temporary directory.
diff --git a/lib/matplotlib/tests/test_animation.py b/lib/matplotlib/tests/test_animation.py
@@ -112,7 +112,7 @@ def isAvailable(self):
 # matplotlib.testing.image_comparison
 @cleanup
 @pytest.mark.parametrize('writer, extension', WRITER_OUTPUT)
-def test_save_animation_smoketest(writer, extension):
+def test_save_animation_smoketest(tmpdir, writer, extension):
     try:
         # for ImageMagick the rcparams must be patched to account for
         # 'convert' being a built in MS tool, not the imagemagick
@@ -138,20 +138,15 @@ def animate(i):
         line.set_data(x, y)
         return line,
 
-    # Use NamedTemporaryFile: will be automatically deleted
-    F = tempfile.NamedTemporaryFile(suffix='.' + extension)
-    F.close()
-    anim = animation.FuncAnimation(fig, animate, init_func=init, frames=5)
-    try:
-        anim.save(F.name, fps=30, writer=writer, bitrate=500)
-    except UnicodeDecodeError:
-        xfail("There can be errors in the numpy import stack, "
-              "see issues #1891 and #2679")
-    finally:
+    # Use temporary directory for the file-based writers, which produce a file
+    # per frame with known names.
+    with tmpdir.as_cwd():
+        anim = animation.FuncAnimation(fig, animate, init_func=init, frames=5)
         try:
-            os.remove(F.name)
-        except Exception:
-            pass
+            anim.save('movie.' + extension, fps=30, writer=writer, bitrate=500)
+        except UnicodeDecodeError:
+            xfail("There can be errors in the numpy import stack, "
+                  "see issues #1891 and #2679")
 
 
 @cleanup
