Revert "SERVER-13741 Migrate remaining tests to use write commands"

This reverts commit 87dc3ae516e1d12a632dc604710661e38ed7b3dd.

1 files changed, 7 insertions, 4 deletions

diff --git a/buildscripts/smoke.py b/buildscripts/smoke.py
index 0573c66b936..cb9bf52f5d3 100755
--- a/buildscripts/smoke.py
+++ b/buildscripts/smoke.py
@@ -444,11 +444,14 @@ def skipTest(path):
 
     return False
 
-legacyWriteRE = re.compile(r"jstests[/\\]multiVersion")
+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)))
 def setShellWriteModeForTest(path, argv):
     swm = shell_write_mode
-    if legacyWriteRE.search(path):
-        swm = "legacy"
+    if swm == "legacy": # change when the default changes to "commands"
+        if use_write_commands or forceCommandsRE.search(path):
+            swm = "commands"
     argv += ["--writeMode", swm]
 
 def runTest(test, result):
@@ -1205,7 +1208,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="commands",
+    parser.add_option('--shell-write-mode', dest='shell_write_mode', default="legacy",
                       help='Sets the shell to use a specific write mode: commands/compatibility/legacy (default:legacy)')
 
     global tests