diff options
author | Shaun Verch <shaun.verch@mongodb.com> | 2014-04-15 16:37:13 -0400 |
---|---|---|
committer | Shaun Verch <shaun.verch@mongodb.com> | 2014-04-22 15:15:59 -0400 |
commit | f7d78f9511d3e4fa156d6f94322f5a690a21bc20 (patch) | |
tree | afdbaf3418f7f1bc47147ae5a0c2ac475a506680 /jstests/repl | |
parent | 1be16d8968c6bf39f01c4b3e98f854571a337823 (diff) | |
download | mongo-f7d78f9511d3e4fa156d6f94322f5a690a21bc20.tar.gz |
SERVER-13603 Move option testing support code into shared test helper
Diffstat (limited to 'jstests/repl')
-rw-r--r-- | jstests/repl/repl_options.js | 40 |
1 files changed, 6 insertions, 34 deletions
diff --git a/jstests/repl/repl_options.js b/jstests/repl/repl_options.js index 42787048eb4..1d7a858a473 100644 --- a/jstests/repl/repl_options.js +++ b/jstests/repl/repl_options.js @@ -1,33 +1,6 @@ var baseName = "jstests_repl_repl_options"; -function removeOptionsAddedByFramework(getCmdLineOptsResult) { - // Remove options that we are not interested in checking, but that get set by the test - delete getCmdLineOptsResult.parsed.setParameter - delete getCmdLineOptsResult.parsed.storage - delete getCmdLineOptsResult.parsed.net - delete getCmdLineOptsResult.parsed.fastsync - delete getCmdLineOptsResult.parsed.security - return getCmdLineOptsResult; -} - -function testGetCmdLineOpts(mongoRunnerConfig, expectedResult) { - - // Start mongod with options - var mongod = MongoRunner.runMongod(mongoRunnerConfig); - - // Get the parsed options - var getCmdLineOptsResult = mongod.adminCommand("getCmdLineOpts"); - printjson(getCmdLineOptsResult); - - // Remove options added by the test framework - getCmdLineOptsResult = removeOptionsAddedByFramework(getCmdLineOptsResult); - - // Make sure the options are equal to what we expect - assert.docEq(getCmdLineOptsResult.parsed, expectedResult.parsed); - - // Cleanup - MongoRunner.stopMongod(mongod.port); -} +load('jstests/libs/command_line/test_parsed_options.js'); jsTest.log("Testing \"replSet\" command line option"); var expectedResult = { @@ -37,7 +10,7 @@ var expectedResult = { } } }; -testGetCmdLineOpts({ replSet : "mycmdlinename" }, expectedResult); +testGetCmdLineOptsMongod({ replSet : "mycmdlinename" }, expectedResult); jsTest.log("Testing \"replication.replSetName\" config file option"); expectedResult = { @@ -48,7 +21,8 @@ expectedResult = { } } }; -testGetCmdLineOpts({ config : "jstests/libs/config_files/set_replsetname.json" }, expectedResult); +testGetCmdLineOptsMongod({ config : "jstests/libs/config_files/set_replsetname.json" }, + expectedResult); jsTest.log("Testing override of \"replication.replSetName\" config file option with \"replSet\""); expectedResult = { @@ -59,9 +33,7 @@ expectedResult = { } } }; -testGetCmdLineOpts({ config : "jstests/libs/config_files/set_replsetname.json", - replSet : "mycmdlinename" }, expectedResult); - - +testGetCmdLineOptsMongod({ config : "jstests/libs/config_files/set_replsetname.json", + replSet : "mycmdlinename" }, expectedResult); print(baseName + " succeeded."); |