diff options
| author | Robert Guo <robert.guo@mongodb.com> | 2021-06-25 12:31:27 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-07-27 10:58:47 +0000 |
| commit | 6a10981efbef1337e4ab06e4f9c4454d1a333377 (patch) | |
| tree | aff270c16c09e3034f3c573becfad942c9427a7e | |
| parent | d6e08d395941546fbf452896aa28f53621cc09a1 (diff) | |
| download | mongo-6a10981efbef1337e4ab06e4f9c4454d1a333377.tar.gz | |
SERVER-57951 resmoke.py should archive all fixture locations for a job
(cherry picked from commit ffe55a9d08ecd09e70fb1298b3a37253a3be9cb4)
| -rw-r--r-- | buildscripts/resmokelib/testing/fixtures/interface.py | 8 | ||||
| -rw-r--r-- | buildscripts/resmokelib/testing/hook_test_archival.py | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/buildscripts/resmokelib/testing/fixtures/interface.py b/buildscripts/resmokelib/testing/fixtures/interface.py index 86def51322a..fc1979bdeb1 100644 --- a/buildscripts/resmokelib/testing/fixtures/interface.py +++ b/buildscripts/resmokelib/testing/fixtures/interface.py @@ -156,6 +156,14 @@ class Fixture(object, metaclass=registry.make_registry_metaclass(_FIXTURES)): # """Return dbpath prefix.""" return self._dbpath_prefix + def get_path_for_archival(self): + """ + Return the dbpath for archival that includes all possible directories. + + This includes directories for resmoke fixtures and fixtures spawned by the shell. + """ + return self._dbpath_prefix + def get_internal_connection_string(self): """Return the connection string for this fixture. diff --git a/buildscripts/resmokelib/testing/hook_test_archival.py b/buildscripts/resmokelib/testing/hook_test_archival.py index fd0388be157..d8944290394 100644 --- a/buildscripts/resmokelib/testing/hook_test_archival.py +++ b/buildscripts/resmokelib/testing/hook_test_archival.py @@ -93,7 +93,7 @@ class HookTestArchival(object): config.EVERGREEN_EXECUTION, self._tests_repeat[test_name]) # Retrieve root directory for all dbPaths from fixture. - input_files = test.fixture.get_dbpath_prefix() + input_files = test.fixture.get_path_for_archival() s3_bucket = config.ARCHIVE_BUCKET s3_path = "{}/{}/{}/datafiles/{}".format(config.EVERGREEN_PROJECT_NAME, config.EVERGREEN_VARIANT_NAME, |