Commit 5df784ab authored by Karen Tracey's avatar Karen Tracey
Browse files

Fixed deletion of the runtests temp tree to work on Windows even when the tree... 

Fixed deletion of the runtests temp tree to work on Windows even when the tree contains non-ASCII filenames.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17275 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent db2b1458

tests/runtests.py

+5 −2
Original line number Diff line number Diff line
@@ -130,8 +130,11 @@ def setup(verbosity, test_labels): 


def teardown(state):

    from django.conf import settings

    # Removing the temporary TEMP_DIR

    shutil.rmtree(TEMP_DIR)

    # Removing the temporary TEMP_DIR. Ensure we pass in unicode

    # so that it will successfully remove temp trees containing

    # non-ASCII filenames on Windows. (We're assuming the temp dir

    # name itself does not contain non-ASCII characters.)

    shutil.rmtree(unicode(TEMP_DIR))

    # Restore the old settings.

    for key, value in state.items():

        setattr(settings, key, value)