Make the test more robust in face of remaining files.

Lib/test/test_unicode_file.py

@@ -5,7 +5,7 @@ import os, glob, time, shutil
 import unicodedata
 
 import unittest
-from test.support import run_unittest, TestSkipped, TESTFN_UNICODE
+from test.support import run_unittest, TestSkipped, TESTFN_UNICODE, rmtree
 from test.support import TESTFN_ENCODING, TESTFN_UNICODE_UNENCODEABLE
 try:
     TESTFN_UNICODE.encode(TESTFN_ENCODING)
@@ -92,7 +92,7 @@ class TestUnicodeFiles(unittest.TestCase):
     def _do_directory(self, make_name, chdir_name, encoded):
         cwd = os.getcwdb()
         if os.path.isdir(make_name):
-            os.rmdir(make_name)
+            rmtree(make_name)
         os.mkdir(make_name)
         try:
             os.chdir(chdir_name)