TestDokan: more robust subprocess teardown (including retries)

fs/expose/dokan/__init__.py

@@ -723,9 +723,11 @@ if __name__ == "__main__":
     import os, os.path
     import tempfile
     from fs.osfs import OSFS
+    from fs.memoryfs import MemoryFS
     path = tempfile.mkdtemp()
     try:
         fs = OSFS(path)
+        #fs = MemoryFS()
         fs.setcontents("test1.txt","test one")
         flags = DOKAN_OPTION_DEBUG|DOKAN_OPTION_STDERR|DOKAN_OPTION_REMOVABLE
         mount(fs, "Q", foreground=True, numthreads=1, flags=flags)

fs/tests/test_expose.py

@@ -154,8 +154,17 @@ else:
 
         def tearDown(self):
             self.mount_proc.unmount()
-            if self.mount_proc.poll() is None:
-                self.mount_proc.terminate()
+            for _ in xrange(10):
+                try:
+                    if self.mount_proc.poll() is None:
+                        self.mount_proc.terminate()
+                except EnvironmentError:
+                    time.sleep(0.1)
+                else:
+                    break
+            else:
+                if self.mount_proc.poll() is None:
+                    self.mount_proc.terminate()
             self.temp_fs.close()
 
         def check(self,p):