[Python-3000-checkins] r66778 - python/branches/py3k/Lib/test/test_unicode_file.py

[amaury.forgeotdarc]

Author: amaury.forgeotdarc
Date: Fri Oct 3 21:34:30 2008
New Revision: 66778

Log:
Make the test more robust in face of remaining files.


Modified:
python/branches/py3k/Lib/test/test_unicode_file.py

Modified: python/branches/py3k/Lib/test/test_unicode_file.py
==============================================================================
--- python/branches/py3k/Lib/test/test_unicode_file.py (original)
+++ python/branches/py3k/Lib/test/test_unicode_file.py Fri Oct 3 21:34:30 2008
@@ -5,7 +5,7 @@
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 @@
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)