diff options
author | Randolph Tan <randolph@10gen.com> | 2014-11-24 14:08:40 -0500 |
---|---|---|
committer | Randolph Tan <randolph@10gen.com> | 2014-11-25 13:29:09 -0500 |
commit | d1152d4bc387f53d2fda7ef5ce640f9a55d0c1d8 (patch) | |
tree | 879f72969eb7791f64cc91e63d26312deb92c5bf /buildscripts/smoke.py | |
parent | e34a30fbf39b50ed86d5c9de6a97fc28ad19a466 (diff) | |
download | mongo-d1152d4bc387f53d2fda7ef5ce640f9a55d0c1d8.tar.gz |
SERVER-13741 Migrate remaining tests to use write commands
(cherry picked from commit 0dabee8227d445a18fa5e8e49b2be60ba2a0beef)
Conflicts:
buildscripts/smoke.py
jstests/dur/diskfull.js
jstests/dur/md5.js
jstests/noPassthroughWithMongod/index_multi.js
jstests/repl/master1.js
jstests/sharding/sync1.js
jstests/sharding/sync4.js
jstests/sharding/sync8.js
jstests/tool/dumprestore_auth3.js
Conflicts:
buildscripts/smoke.py
Diffstat (limited to 'buildscripts/smoke.py')
-rwxr-xr-x | buildscripts/smoke.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/buildscripts/smoke.py b/buildscripts/smoke.py index dcc7cbe08f5..1bc3af18e9f 100755 --- a/buildscripts/smoke.py +++ b/buildscripts/smoke.py @@ -447,14 +447,11 @@ def skipTest(path): return False -forceCommandsForDirs = ["aggregation", "auth", "core", "parallel", "replsets", "sharding"] -# look for jstests and one of the above suites separated by either posix or windows slashes -forceCommandsRE = re.compile(r"jstests[/\\](%s)" % ('|'.join(forceCommandsForDirs))) +legacyWriteRE = re.compile(r"jstests[/\\]multiVersion") def setShellWriteModeForTest(path, argv): swm = shell_write_mode - if swm == "legacy": # change when the default changes to "commands" - if use_write_commands or forceCommandsRE.search(path): - swm = "commands" + if legacyWriteRE.search(path): + swm = "legacy" argv += ["--writeMode", swm] def runTest(test, result): @@ -1221,7 +1218,7 @@ def main(): parser.add_option('--use-write-commands', dest='use_write_commands', default=False, action='store_true', help='Deprecated(use --shell-write-mode): Sets the shell to use write commands by default') - parser.add_option('--shell-write-mode', dest='shell_write_mode', default="legacy", + parser.add_option('--shell-write-mode', dest='shell_write_mode', default="commands", help='Sets the shell to use a specific write mode: commands/compatibility/legacy (default:legacy)') global tests |