New upstream version 3.4.16

1 files changed, 10 insertions, 2 deletions

diff --git a/buildscripts/resmokelib/testing/executor.py b/buildscripts/resmokelib/testing/executor.py
index 438a06b9c8e..e88eed6bc02 100644
--- a/buildscripts/resmokelib/testing/executor.py
+++ b/buildscripts/resmokelib/testing/executor.py
@@ -8,6 +8,7 @@ import threading
 import time
 
 from . import fixtures
+from . import hook_test_archival as archival
 from . import hooks as _hooks
 from . import job as _job
 from . import report as _report
@@ -35,7 +36,9 @@ class TestGroupExecutor(object):
                  logging_config,
                  config=None,
                  fixture=None,
-                 hooks=None):
+                 hooks=None,
+                 archive_instance=None,
+                 archive=None):
         """
         Initializes the TestGroupExecutor with the test group to run.
         """
@@ -49,6 +52,11 @@ class TestGroupExecutor(object):
         self.hooks_config = utils.default_if_none(hooks, [])
         self.test_config = utils.default_if_none(config, {})
 
+        self.archival = None
+        if archive_instance:
+            self.archival = archival.HookTestArchival(test_group, self.hooks_config,
+                                                      archive_instance, archive)
+
         self._test_group = test_group
 
         self._using_buildlogger = logging.config.using_buildlogger(logging_config)
@@ -299,7 +307,7 @@ class TestGroupExecutor(object):
                                     build_id=build_id,
                                     build_config=build_config)
 
-        return _job.Job(logger, fixture, hooks, report)
+        return _job.Job(logger, fixture, hooks, report, self.archival)
 
     def _make_test_queue(self):
         """