diff options
author | Andrew Morrow <acm@mongodb.com> | 2016-03-22 15:27:59 -0400 |
---|---|---|
committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2016-03-22 15:27:59 -0400 |
commit | 866a3747dcd895ef932c79fe250f5967f3366034 (patch) | |
tree | e6cd11e69484ab62f3da766acb68ff9e0333b162 /src/mongo/db/server_options_test.cpp | |
parent | 0af6e7685ab00249c38c8c874eda7cb895240f94 (diff) | |
download | mongo-866a3747dcd895ef932c79fe250f5967f3366034.tar.gz |
SERVER-22525 Revert "Fixes to support building against system boost 1.59"
This reverts commit 53ce96ad0f9d410ef86dc3ad3a4bd45e0ea5eef1.
Diffstat (limited to 'src/mongo/db/server_options_test.cpp')
-rw-r--r-- | src/mongo/db/server_options_test.cpp | 37 |
1 files changed, 34 insertions, 3 deletions
diff --git a/src/mongo/db/server_options_test.cpp b/src/mongo/db/server_options_test.cpp index aa174fa23d5..fb2d3e3fa52 100644 --- a/src/mongo/db/server_options_test.cpp +++ b/src/mongo/db/server_options_test.cpp @@ -129,7 +129,8 @@ TEST(Verbosity, CommandLineString) { std::vector<std::string> argv; argv.push_back("binaryname"); - argv.push_back("--verbose=vvvv"); + argv.push_back("--verbose"); + argv.push_back("vvvv"); std::map<std::string, std::string> env_map; ASSERT_OK(parser.run(options, argv, env_map, &environment)); @@ -143,6 +144,34 @@ TEST(Verbosity, CommandLineString) { ::mongo::logger::LogSeverity::Debug(verbosity)); } +TEST(Verbosity, CommandLineEmptyString) { + OptionsParserTester parser; + moe::Environment environment; + moe::OptionSection options; + + // Reset the log level before we test + ::mongo::logger::globalLogDomain()->setMinimumLoggedSeverity( + ::mongo::logger::LogSeverity::Info()); + + ASSERT_OK(::mongo::addGeneralServerOptions(&options)); + + std::vector<std::string> argv; + argv.push_back("binaryname"); + argv.push_back("--verbose"); + argv.push_back(""); + std::map<std::string, std::string> env_map; + + ASSERT_OK(parser.run(options, argv, env_map, &environment)); + + ASSERT_OK(::mongo::validateServerOptions(environment)); + ASSERT_OK(::mongo::canonicalizeServerOptions(&environment)); + ASSERT_OK(::mongo::storeServerOptions(environment, argv)); + + int verbosity = 0; + ASSERT_EQUALS(::mongo::logger::globalLogDomain()->getMinimumLogSeverity(), + ::mongo::logger::LogSeverity::Debug(verbosity)); +} + TEST(Verbosity, CommandLineBadString) { OptionsParserTester parser; moe::Environment environment; @@ -156,7 +185,8 @@ TEST(Verbosity, CommandLineBadString) { std::vector<std::string> argv; argv.push_back("binaryname"); - argv.push_back("--verbose=beloud"); + argv.push_back("--verbose"); + argv.push_back("beloud"); std::map<std::string, std::string> env_map; ASSERT_OK(parser.run(options, argv, env_map, &environment)); @@ -293,7 +323,8 @@ TEST(Verbosity, MultipleSourcesMultipleOptions) { argv.push_back("binaryname"); argv.push_back("--config"); argv.push_back("config.json"); - argv.push_back("--verbose=vvv"); + argv.push_back("--verbose"); + argv.push_back("vvv"); std::map<std::string, std::string> env_map; parser.setConfig("config.json", "{ \"systemLog.verbosity\" : 4 }"); |