summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Abrahams <jonathan@mongodb.com>2018-05-16 16:12:59 -0400
committerJonathan Abrahams <jonathan@mongodb.com>2018-05-24 14:22:26 -0400
commit67bc1f44ec5be1564d549ff69a571a33f3cbdb99 (patch)
tree74e327d4c00eeedeccb8212cff2de93aa99c414b
parentf9a27ba26f168d8c5d2881e8370bb103984a11ca (diff)
downloadmongo-67bc1f44ec5be1564d549ff69a571a33f3cbdb99.tar.gz
SERVER-34865 Test archival fails when temporary files are removed
(cherry picked from commit 0a03faba456a3acbbaabd6ad5694f98acfdf50bd)
-rw-r--r--buildscripts/resmokelib/utils/archival.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/buildscripts/resmokelib/utils/archival.py b/buildscripts/resmokelib/utils/archival.py
index ea7f889f754..1002f2ce902 100644
--- a/buildscripts/resmokelib/utils/archival.py
+++ b/buildscripts/resmokelib/utils/archival.py
@@ -58,11 +58,8 @@ def directory_size(directory):
try:
dir_bytes += os.path.getsize(full_name)
except OSError:
- # Symlinks generate an error and are ignored.
- if os.path.islink(full_name):
- pass
- else:
- raise
+ # A file might be deleted while we are looping through the os.walk() result.
+ pass
return dir_bytes