diff options
| author | Amalia Hawkins <amalia.hawkins@10gen.com> | 2014-09-25 21:53:11 -0400 |
|---|---|---|
| committer | Amalia Hawkins <amalia.hawkins@10gen.com> | 2014-09-25 21:53:11 -0400 |
| commit | e402881e004283d292dd3e483a9df1dbd2b066e2 (patch) | |
| tree | 7fe3a4f26bb3b68575fb1ca7eaf22736c521cf68 | |
| parent | 962f959a09b63aa0482d7e0c9bad89363d1e1194 (diff) | |
| download | mongo-e402881e004283d292dd3e483a9df1dbd2b066e2.tar.gz | |
SERVER-14713 Specify sslAllowInvalidCertificates flag in sslSpecial tests to pass with mongo shell changes
| -rw-r--r-- | jstests/sslSpecial/ssl_mixedmode.js | 1 | ||||
| -rw-r--r-- | jstests/sslSpecial/upgrade_to_ssl_nossl.js | 3 | ||||
| -rw-r--r-- | jstests/sslSpecial/upgrade_to_x509_ssl_nossl.js | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/jstests/sslSpecial/ssl_mixedmode.js b/jstests/sslSpecial/ssl_mixedmode.js index a86185d406c..8ed3c276b3a 100644 --- a/jstests/sslSpecial/ssl_mixedmode.js +++ b/jstests/sslSpecial/ssl_mixedmode.js @@ -26,6 +26,7 @@ function testCombination(sslMode, sslShell, shouldSucceed) { if (sslShell) { mongo = runMongoProgram("mongo", "--port", port, "--ssl", "--sslPEMKeyFile", CLIENT_CERT, + "--sslAllowInvalidCertificates", "--eval", ";"); } else { diff --git a/jstests/sslSpecial/upgrade_to_ssl_nossl.js b/jstests/sslSpecial/upgrade_to_ssl_nossl.js index 439e23e1859..1f5f0002d4e 100644 --- a/jstests/sslSpecial/upgrade_to_ssl_nossl.js +++ b/jstests/sslSpecial/upgrade_to_ssl_nossl.js @@ -29,5 +29,6 @@ var rstConn3 = rst.getMaster(); rstConn3.getDB("test").a.insert({a:3, str:"TESTTESTTEST"}); assert.eq(3, rstConn3.getDB("test").a.count(), "Error interacting with replSet"); -var canConnectSSL = runMongoProgram("mongo", "--port", rst.ports[0], "--ssl", "--eval", ";"); +var canConnectSSL = runMongoProgram("mongo", "--port", rst.ports[0], + "--ssl", "--sslAllowInvalidCertificates", "--eval", ";"); assert.eq(0, canConnectSSL, "SSL Connection attempt failed when it should succeed"); diff --git a/jstests/sslSpecial/upgrade_to_x509_ssl_nossl.js b/jstests/sslSpecial/upgrade_to_x509_ssl_nossl.js index ab70a6460f0..32b1b7ad329 100644 --- a/jstests/sslSpecial/upgrade_to_x509_ssl_nossl.js +++ b/jstests/sslSpecial/upgrade_to_x509_ssl_nossl.js @@ -53,6 +53,7 @@ rstConn3.getDB("test").a.insert({a:3, str:"PEASandCARROTS"}); assert.eq(3, rstConn3.getDB("test").a.count(), "Error interacting with replSet"); var canConnectSSL = runMongoProgram("mongo", "--port", rst.ports[0], "--ssl", + "--sslAllowInvalidCertificates", "--sslPEMKeyFile", CLIENT_CERT, "--eval", ";"); assert.eq(0, canConnectSSL, "SSL Connection attempt failed when it should succeed"); @@ -73,5 +74,6 @@ assert.eq(4, rstConn4.getDB("test").a.count(), "Error interacting with replSet") // Test that an ssl connection can still be made var canConnectSSL = runMongoProgram("mongo", "--port", rst.ports[0], "--ssl", + "--sslAllowInvalidCertificates", "--sslPEMKeyFile", CLIENT_CERT, "--eval", ";"); assert.eq(0, canConnectSSL, "SSL Connection attempt failed when it should succeed"); |