summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyler Kaye <tyler.kaye@mongodb.com>2018-11-14 18:40:05 -0500
committerTyler Kaye <tyler.kaye@mongodb.com>2018-11-30 13:15:18 -0500
commit5e74cc18e7165e40d209ab7de41a527d0f6f0e31 (patch)
tree48b472a9ba77519563dfea930efff4201774e244
parentc389dd54c6ead5c248b6cfe951c930fcd5bbd1e8 (diff)
downloadmongo-5e74cc18e7165e40d209ab7de41a527d0f6f0e31.tar.gz
SERVER-38303: Temporarily handle ipv6 failures due to s390x machine without ipv6 enabled
(cherry picked from commit 839d887bbb5c857c80ad50eb329c0017cb69190d)
-rw-r--r--jstests/noPassthroughWithMongod/host_connection_string_validation.js4
-rw-r--r--jstests/noPassthroughWithMongod/ipv6_connection_string_validation.js4
2 files changed, 8 insertions, 0 deletions
diff --git a/jstests/noPassthroughWithMongod/host_connection_string_validation.js b/jstests/noPassthroughWithMongod/host_connection_string_validation.js
index b4cc778b3a5..52668ac1815 100644
--- a/jstests/noPassthroughWithMongod/host_connection_string_validation.js
+++ b/jstests/noPassthroughWithMongod/host_connection_string_validation.js
@@ -10,6 +10,10 @@
// tested manually), so 127.0.0.1 is also present so the test mongo shell can connect
// with that address.
var mongod = MongoRunner.runMongod({ipv6: "", bind_ip: "::1,127.0.0.1"});
+ if (mongod == null) {
+ jsTest.log("Unable to run test because ipv6 is not on machine, see BF-10990");
+ return;
+ }
var args = [
"mongo",
"--nodb",
diff --git a/jstests/noPassthroughWithMongod/ipv6_connection_string_validation.js b/jstests/noPassthroughWithMongod/ipv6_connection_string_validation.js
index 5014ab3fc60..71e4566469c 100644
--- a/jstests/noPassthroughWithMongod/ipv6_connection_string_validation.js
+++ b/jstests/noPassthroughWithMongod/ipv6_connection_string_validation.js
@@ -13,6 +13,10 @@
// tested manually), so 127.0.0.1 is also present so the test mongo shell can connect
// with that address.
var mongod = MongoRunner.runMongod({ipv6: "", bind_ip: "::1,127.0.0.1"});
+ if (mongod == null) {
+ jsTest.log("Unable to run test because ipv6 is not on machine, see BF-10990");
+ return;
+ }
var args = [
"mongo",
"--nodb",