From e2ee5d493050071f7d853838a62be3e14ec6e4d6 Mon Sep 17 00:00:00 2001
From: "steven.bethard" <devnull@localhost>
Date: Sun, 12 Jul 2009 22:56:24 +0000
Subject: Fix tests to write files to temp directory. Fix bug where some files
 weren't being closed.

---
 test/test_argparse.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'test')

diff --git a/test/test_argparse.py b/test/test_argparse.py
index e7ee189..33bec2d 100644
--- a/test/test_argparse.py
+++ b/test/test_argparse.py
@@ -16,6 +16,7 @@
 
 import codecs
 import os
+import shutil
 import sys
 import textwrap
 import tempfile
@@ -65,9 +66,13 @@ class TempDirMixin(object):
 
     def tearDown(self):
         os.chdir(self.old_dir)
-        for filename in os.listdir(self.temp_dir):
-            os.remove(os.path.join(self.temp_dir, filename))
-        os.rmdir(self.temp_dir)
+        while True:
+            try:
+                shutil.rmtree(self.temp_dir)
+            except WindowsError:
+                continue
+            else:
+                break
 
 
 class Sig(object):
@@ -1227,7 +1232,7 @@ class TestParserDefault42(ParserTestCase):
     ]
 
 
-class TestArgumentsFromFile(ParserTestCase, TempDirMixin):
+class TestArgumentsFromFile(TempDirMixin, ParserTestCase):
     """Test reading arguments from a file"""
 
     def setUp(self):
-- 
cgit v1.2.1