diff options
| author | vrachev <vlad.rachev@mongodb.com> | 2020-05-06 09:55:15 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-05-08 19:33:35 +0000 |
| commit | 3e45e8b645a1b58d331dae9fb6d8623282ff072b (patch) | |
| tree | 8b3a226531447a3860af3115998201ff7a07819a | |
| parent | 2ffaa9d4efefffc7045b6b47d9380299b28dfd7a (diff) | |
| download | mongo-3e45e8b645a1b58d331dae9fb6d8623282ff072b.tar.gz | |
SERVER-47919 remove --suites arg from find-suites
| -rw-r--r-- | buildscripts/resmokelib/config.py | 2 | ||||
| -rw-r--r-- | buildscripts/resmokelib/parser.py | 14 | ||||
| -rw-r--r-- | buildscripts/tests/resmokelib/test_parser.py | 2 |
3 files changed, 5 insertions, 13 deletions
diff --git a/buildscripts/resmokelib/config.py b/buildscripts/resmokelib/config.py index 371b87da34d..6fdb3140243 100644 --- a/buildscripts/resmokelib/config.py +++ b/buildscripts/resmokelib/config.py @@ -90,7 +90,7 @@ DEFAULTS = { "majority_read_concern": None, # Default is set on the commandline. "storage_engine": None, "storage_engine_cache_size_gb": None, - "suite_files": None, + "suite_files": "with_server", "tag_file": None, "test_files": None, "transport_layer": None, diff --git a/buildscripts/resmokelib/parser.py b/buildscripts/resmokelib/parser.py index bd52089105c..94504d2f6e1 100644 --- a/buildscripts/resmokelib/parser.py +++ b/buildscripts/resmokelib/parser.py @@ -32,7 +32,7 @@ def _add_run(subparsers): # pylint: disable=too-many-statements parser = subparsers.add_parser("run", help="Runs the specified tests.") parser.set_defaults(dry_run="off", shuffle="auto", stagger_jobs="off", - suite_files="with_server", majority_read_concern="on") + majority_read_concern="on") parser.add_argument("test_files", metavar="TEST_FILES", nargs="*", help="Explicit test files to run") @@ -420,6 +420,8 @@ def _add_find_suites(subparsers): parser = subparsers.add_parser( "find-suites", help="Lists the names of the suites that will execute the specified tests.") + parser.set_defaults(logger_file="console") + parser.add_argument("test_files", metavar="TEST_FILES", nargs="*", help="Explicit test files to run") @@ -428,16 +430,6 @@ def _add_find_suites(subparsers): help=("A YAML file that specifies the logging configuration. If the file is" " located in the resmokeconfig/suites/ directory, then the basename" " without the .yml extension can be specified, e.g. 'console'.")) - parser.set_defaults(logger_file="console") - - parser.add_argument( - "--suites", dest="suite_files", metavar="SUITE1,SUITE2", required=True, - help=("Comma separated list of YAML files that each specify the configuration" - " of a suite. If the file is located in the resmokeconfig/suites/" - " directory, then the basename without the .yml extension can be" - " specified, e.g. 'core'. If a list of files is passed in as" - " positional arguments, they will be run using the suites'" - " configurations.")) def _add_hang_analyzer(subparsers): diff --git a/buildscripts/tests/resmokelib/test_parser.py b/buildscripts/tests/resmokelib/test_parser.py index 0a95b38409a..148a1c5bb7e 100644 --- a/buildscripts/tests/resmokelib/test_parser.py +++ b/buildscripts/tests/resmokelib/test_parser.py @@ -289,7 +289,7 @@ class TestParseCommandLine(unittest.TestCase): """Unit tests for the parse_command_line() function.""" def test_find_suites(self): - subcommand_obj = _parser.parse_command_line(['find-suites', '--suites=my_suite']) + subcommand_obj = _parser.parse_command_line(['find-suites']) self.assertTrue(hasattr(subcommand_obj, 'execute')) def test_list_suites(self): |