From 67bc1f44ec5be1564d549ff69a571a33f3cbdb99 Mon Sep 17 00:00:00 2001 From: Jonathan Abrahams Date: Wed, 16 May 2018 16:12:59 -0400 Subject: SERVER-34865 Test archival fails when temporary files are removed (cherry picked from commit 0a03faba456a3acbbaabd6ad5694f98acfdf50bd) --- buildscripts/resmokelib/utils/archival.py | 7 ++----- 1 file 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 -- cgit v1.2.1