Merge pull request #271 from stanfordnmbl/filenotfounderror-retry

`FileNotFoundError` retry: don't throw at the end of retries

Author: AlbertoCasasOrtiz

mcserver/zipsession_v2.py

@@ -336,11 +336,18 @@ def rmtree_with_retry(path, max_retries=5, backoff=0.1):
             shutil.rmtree(path)
             return
 
-        except (FileNotFoundError, PermissionError, OSError) as e:
+        except (PermissionError, OSError) as e:
             if attempt == max_retries - 1:
                 raise
             time.sleep(backoff * (2**attempt))
 
+        except FileNotFoundError as e:
+            # In case we've made it here, we've made a best effort to delete
+            # and it's likely gone.
+            if attempt == max_retries - 1:
+                return
+            time.sleep(backoff * (2**attempt))
+
 def zipdir_contents_with_retry(dir_path, zip_path, max_retries=5, backoff=0.1):
     """
     Given a source dir_path and a target zip_path, zip the folder with