SERVER-17450 Standardize on a single way to start mongod in tests

1 files changed, 9 insertions, 5 deletions

diff --git a/jstests/noPassthroughWithMongod/temp_namespace.js b/jstests/noPassthroughWithMongod/temp_namespace.js
index 123ad07270b..108c5871c7a 100644
--- a/jstests/noPassthroughWithMongod/temp_namespace.js
+++ b/jstests/noPassthroughWithMongod/temp_namespace.js
@@ -1,9 +1,8 @@
 // this is to make sure that temp collections get cleaned up on restart
 
 testname = 'temp_namespace_sw'
-path = MongoRunner.dataPath+testname
 
-conn = startMongodEmpty("--port", 30000, "--dbpath", path, "--smallfiles", "--noprealloc", "--nopreallocj");
+var conn = MongoRunner.runMongod({smallfiles: "", noprealloc: "", nopreallocj: ""});
 d = conn.getDB('test')
 d.runCommand({create: testname+'temp1', temp: true});
 d[testname+'temp1'].ensureIndex({x:1});
@@ -21,10 +20,15 @@ function countCollectionNames( theDB, regex ) {
 
 assert.eq(countCollectionNames( d, /temp\d$/) , 2)
 assert.eq(countCollectionNames( d, /keep\d$/) , 4)
-stopMongod(30000);
+MongoRunner.stopMongod(conn);
 
-conn = startMongodNoReset("--port", 30000, "--dbpath", path, "--smallfiles", "--noprealloc", "--nopreallocj");
+conn = MongoRunner.runMongod({restart:true,
+                              cleanData: false,
+                              dbpath: conn.dbpath,
+                              smallfiles: "",
+                              noprealloc: "",
+                              nopreallocj: ""});
 d = conn.getDB('test')
 assert.eq(countCollectionNames( d, /temp\d$/) , 0)
 assert.eq(countCollectionNames( d, /keep\d$/) , 4)
-stopMongod(30000);
+MongoRunner.stopMongod(conn);