SERVER-31562 Archival for test failures from suites not using a resmoke fixture

1 files changed, 3 insertions, 3 deletions

diff --git a/buildscripts/resmokelib/utils/archival.py b/buildscripts/resmokelib/utils/archival.py
index 5d3545159d3..221b54ecd35 100644
--- a/buildscripts/resmokelib/utils/archival.py
+++ b/buildscripts/resmokelib/utils/archival.py
@@ -52,7 +52,7 @@ def file_list_size(files):
 def directory_size(directory):
     """ Return size (in bytes) of files in 'directory' tree. """
     dir_bytes = 0
-    for root_dir, _, files in os.walk(directory):
+    for root_dir, _, files in os.walk(unicode(directory)):
         for name in files:
             full_name = os.path.join(root_dir, name)
             try:
@@ -277,10 +277,10 @@ class Archival(object):
                 for input_file in input_files:
                     try:
                         tar_handle.add(input_file)
-                    except (IOError, tarfile.TarError) as err:
+                    except (IOError, OSError, tarfile.TarError) as err:
                         message = "{}; Unable to add {} to archive file: {}".format(
                             message, input_file, err)
-        except (IOError, tarfile.TarError) as err:
+        except (IOError, OSError, tarfile.TarError) as err:
             status, message = remove_file(temp_file)
             if status:
                 self.logger.warning("Removing tarfile due to creation failure - %s", message)