diff options
author | auto-revert-processor <dev-prod-dag@mongodb.com> | 2021-11-25 02:48:35 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-11-25 03:11:45 +0000 |
commit | dbec38dee0fdc11f8414cd002e9fc558132c1e16 (patch) | |
tree | d1a31c8aea05ff02e09d4959558f95a9976afed3 /buildscripts | |
parent | 950116646650c31c3753561886dec4b823ca6b1a (diff) | |
download | mongo-dbec38dee0fdc11f8414cd002e9fc558132c1e16.tar.gz |
Revert "SERVER-61724 Fix resmoke.py list-tags"
This reverts commit e8b7f78feb0d5f253e79b31a3790547b15bf1f0b.
Diffstat (limited to 'buildscripts')
-rw-r--r-- | buildscripts/resmokelib/run/__init__.py | 2 | ||||
-rw-r--r-- | buildscripts/resmokelib/suitesconfig.py | 44 |
2 files changed, 17 insertions, 29 deletions
diff --git a/buildscripts/resmokelib/run/__init__.py b/buildscripts/resmokelib/run/__init__.py index 552573632ad..279185791e6 100644 --- a/buildscripts/resmokelib/run/__init__.py +++ b/buildscripts/resmokelib/run/__init__.py @@ -159,7 +159,7 @@ class TestRunner(Subcommand): # pylint: disable=too-many-instance-attributes """ tag_docs = {} out_tag_names = [] - for suite_name, suite_file in get_suite_files().items(): + for suite_name, suite_file in get_suite_files(): # Matrix suites are ignored. tags_blocks = list_tags.get_tags_blocks(suite_file) diff --git a/buildscripts/resmokelib/suitesconfig.py b/buildscripts/resmokelib/suitesconfig.py index 988b8446493..63353d56b3c 100644 --- a/buildscripts/resmokelib/suitesconfig.py +++ b/buildscripts/resmokelib/suitesconfig.py @@ -37,10 +37,9 @@ def get_named_suites() -> List[SuiteName]: return _NAMED_SUITES -def get_suite_files() -> Dict[str, str]: +def get_suite_files() -> List[str]: """Get the physical files defining these suites for parsing comments.""" - return MatrixSuiteConfig.merge_dicts(ExplicitSuiteConfig.get_suite_files(), - MatrixSuiteConfig.get_suite_files()) + return ExplicitSuiteConfig.get_suite_files() + MatrixSuiteConfig.get_suite_files() def create_test_membership_map(fail_on_missing_selector=False, test_kind=None): @@ -188,26 +187,22 @@ class MatrixSuiteConfig(SuiteConfigInterface): _all_mappings = {} _all_overrides = {} - @classmethod - def get_suite_files(cls): - """Get the suite files.""" - mappings_dir = os.path.join(cls._get_suites_dir(), "mappings") - return cls.__get_suite_files_in_dir(mappings_dir) - - @classmethod - def get_all_yamls(cls, target_dir): + @staticmethod + def get_all_yamls(target_dir): """Get all YAML files in the given directory.""" - all_yamls = {} + all_files = {} root = os.path.abspath(target_dir) - for filename in cls.__get_suite_files_in_dir(root).values(): + files = os.listdir(root) + + for filename in files: (short_name, ext) = os.path.splitext(filename) if ext in (".yml", ".yaml"): pathname = os.path.join(root, filename) if not fs.is_yaml_file(pathname) or not os.path.isfile(pathname): raise ValueError("Expected a suite YAML config, but got '%s'" % pathname) - all_yamls[short_name] = load_yaml_file(pathname) - return all_yamls + all_files[short_name] = load_yaml_file(pathname) + return all_files @staticmethod def _get_suites_dir(): @@ -281,6 +276,12 @@ class MatrixSuiteConfig(SuiteConfigInterface): return list(all_mappings.keys()) @classmethod + def get_suite_files(cls): + """Get the physical files defining these suites for parsing comments.""" + mappings_dir = os.path.join(cls._get_suites_dir(), "mappings") + return cls.get_all_yamls(mappings_dir) + + @classmethod def get_all_mappings(cls, suites_dir) -> Dict[str, str]: """Get a dictionary of all suite mapping files keyed by the suite name.""" if not cls._all_mappings: @@ -310,19 +311,6 @@ class MatrixSuiteConfig(SuiteConfigInterface): dict1[k] = dict2[k] return dict1 - @classmethod - def __get_suite_files_in_dir(cls, target_dir): - """Get the physical files defining these suites for parsing comments.""" - root = os.path.abspath(target_dir) - files = os.listdir(root) - all_files = {} - for filename in files: - (short_name, ext) = os.path.splitext(filename) - if ext in (".yml", ".yaml"): - all_files[short_name] = os.path.join(root, filename) - - return all_files - class SuiteFinder(object): """Utility/Factory class for getting polymorphic suite classes given a directory.""" |