summaryrefslogtreecommitdiff
path: root/jstests/ssl
diff options
context:
space:
mode:
authormatt dannenberg <matt.dannenberg@10gen.com>2013-10-24 14:47:48 -0400
committermatt dannenberg <matt.dannenberg@10gen.com>2013-11-06 19:02:49 -0500
commit9766387567e366e167835880818369cee7f8d42d (patch)
treedd73fa4a65160b2452e38bce12fd1d6a395573bf /jstests/ssl
parentca5b94c240863d20b2eaa341d9242624c9452822 (diff)
downloadmongo-9766387567e366e167835880818369cee7f8d42d.tar.gz
SERVER-11349 fix ssl_fips.js test
Diffstat (limited to 'jstests/ssl')
-rw-r--r--jstests/ssl/ssl_fips.js12
1 files changed, 9 insertions, 3 deletions
diff --git a/jstests/ssl/ssl_fips.js b/jstests/ssl/ssl_fips.js
index 0ac12604311..11f16673bcf 100644
--- a/jstests/ssl/ssl_fips.js
+++ b/jstests/ssl/ssl_fips.js
@@ -1,5 +1,4 @@
// Test mongod start with FIPS mode enabled
-if (0) { // SERVER-11005
ports = allocatePorts(1);
port1 = ports[0];
var baseName = "jstests_ssl_ssl_fips";
@@ -15,6 +14,13 @@ var mongo = runMongoProgram("mongo", "--port", port1, "--ssl",
"--sslFIPSMode",
"--eval", ";");
-// 0 is the exit code for success
-assert(mongo==0);
+// if mongo shell didn't start/connect properly
+if (mongo != 0) {
+ print("mongod failed to start, checking for FIPS support");
+ assert(rawMongoProgramOutput().match(
+ /this version of mongodb was not compiled with FIPS support/));
+}
+else {
+ // kill mongod
+ stopMongod(port1);
}