merge master into features

1 files changed, 12 insertions, 0 deletions

diff --git a/testing/code/test_excinfo.py b/testing/code/test_excinfo.py
index d519dc01e..59756645a 100644
--- a/testing/code/test_excinfo.py
+++ b/testing/code/test_excinfo.py
@@ -1066,3 +1066,15 @@ def test_repr_traceback_with_unicode(style, encoding):
     formatter = FormattedExcinfo(style=style)
     repr_traceback = formatter.repr_traceback(e_info)
     assert repr_traceback is not None
+
+
+def test_cwd_deleted(testdir):
+    testdir.makepyfile("""
+        def test(tmpdir):
+            tmpdir.chdir()
+            tmpdir.remove()
+            assert False
+    """)
+    result = testdir.runpytest()
+    result.stdout.fnmatch_lines(['* 1 failed in *'])
+    assert 'INTERNALERROR' not in result.stdout.str() + result.stderr.str()
\ No newline at end of file