enable IPv6 test in Evergreen

ajdavis · ajdavis · commit be13b52b4673 · 2017-01-31T21:48:57.000-05:00
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -232,7 +232,7 @@ functions:
         working_dir: "mongoc"
         script: |
           set -o errexit
-          CC="${CC}" AUTH=${AUTH} SSL=${SSL} URI=${URI} sh .evergreen/run-tests.sh
+          CC="${CC}" AUTH=${AUTH} SSL=${SSL} URI=${URI} IPV4_ONLY=${IPV4_ONLY} sh .evergreen/run-tests.sh
 
   "run auth tests":
     - command: shell.exec
@@ -5112,6 +5112,7 @@ tasks:
           vars:
             AUTH: "noauth"
             SSL: "nossl"
+            IPV4_ONLY: "on"
             URI: ""
 
 
diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
@@ -26,6 +26,10 @@ export MONGOC_TEST_FUTURE_TIMEOUT_MS=30000
 export MONGOC_TEST_URI="$URI"
 export MONGOC_TEST_SERVER_LOG="json"
 
+if [ "$IPV4_ONLY" != "on" ]; then
+   export MONGOC_CHECK_IPV6="on"
+fi
+
 if [ "$CC" = "mingw" ]; then
    chmod +x test-libmongoc.exe
    cmd.exe /c .evergreen\\run-tests-mingw.bat
diff --git a/orchestration_configs/replica_sets/auth-ssl.json b/orchestration_configs/replica_sets/auth-ssl.json
@@ -7,6 +7,7 @@
     {
       "procParams": {
         "ipv6": true,
+        "bind_ip": "",
         "nohttpinterface": true,
         "journal": true,
         "noprealloc": true,
@@ -24,6 +25,7 @@
     {
       "procParams": {
         "ipv6": true,
+        "bind_ip": "",
         "nohttpinterface": true,
         "journal": true,
         "noprealloc": true,
@@ -41,6 +43,7 @@
     {
       "procParams": {
         "ipv6": true,
+        "bind_ip": "",
         "nohttpinterface": true,
         "journal": true,
         "noprealloc": true,
diff --git a/orchestration_configs/replica_sets/auth.json b/orchestration_configs/replica_sets/auth.json
@@ -6,6 +6,7 @@
     {
       "procParams": {
         "ipv6": true,
+        "bind_ip": "",
         "nohttpinterface": true,
         "journal": true,
         "noprealloc": true,
@@ -23,6 +24,7 @@
     {
       "procParams": {
         "ipv6": true,
+        "bind_ip": "",
         "nohttpinterface": true,
         "journal": true,
         "noprealloc": true,
@@ -40,6 +42,7 @@
     {
       "procParams": {
         "ipv6": true,
+        "bind_ip": "",
         "nohttpinterface": true,
         "journal": true,
         "noprealloc": true,
diff --git a/orchestration_configs/replica_sets/basic-ssl.json b/orchestration_configs/replica_sets/basic-ssl.json
@@ -4,6 +4,7 @@
     {
       "procParams": {
         "ipv6": true,
+        "bind_ip": "",
         "nohttpinterface": true,
         "journal": true,
         "noprealloc": true,
@@ -21,6 +22,7 @@
     {
       "procParams": {
         "ipv6": true,
+        "bind_ip": "",
         "nohttpinterface": true,
         "journal": true,
         "noprealloc": true,
@@ -38,6 +40,7 @@
     {
       "procParams": {
         "ipv6": true,
+        "bind_ip": "",
         "nohttpinterface": true,
         "journal": true,
         "noprealloc": true,
diff --git a/orchestration_configs/replica_sets/basic.json b/orchestration_configs/replica_sets/basic.json
@@ -4,6 +4,7 @@
     {
       "procParams": {
         "ipv6": true,
+        "bind_ip": "",
         "nohttpinterface": true,
         "journal": true,
         "noprealloc": true,
@@ -21,6 +22,7 @@
     {
       "procParams": {
         "ipv6": true,
+        "bind_ip": "",
         "nohttpinterface": true,
         "journal": true,
         "noprealloc": true,
@@ -38,6 +40,7 @@
     {
       "procParams": {
         "ipv6": true,
+        "bind_ip": "",
         "nohttpinterface": true,
         "journal": true,
         "noprealloc": true,
diff --git a/orchestration_configs/servers/auth-ssl.json b/orchestration_configs/servers/auth-ssl.json
@@ -5,6 +5,7 @@
     "password": "pwd123",
     "procParams": {
         "ipv6": true,
+        "bind_ip": "",
         "logappend": true,
         "journal": true,
         "port": 27017
diff --git a/orchestration_configs/servers/auth.json b/orchestration_configs/servers/auth.json
@@ -6,6 +6,7 @@
   "password": "pwd123",
   "procParams": {
     "ipv6": true,
+    "bind_ip": "",
     "logappend": true,
     "journal": true,
     "port": 27017
diff --git a/orchestration_configs/servers/basic-ssl.json b/orchestration_configs/servers/basic-ssl.json
@@ -3,6 +3,7 @@
    "name": "mongod",
    "procParams": {
       "ipv6": true,
+      "bind_ip": "",
       "logappend": true,
       "journal": true,
       "port": 27017
diff --git a/orchestration_configs/servers/basic.json b/orchestration_configs/servers/basic.json
@@ -2,6 +2,7 @@
   "name": "mongod",
   "procParams": {
     "ipv6": true,
+    "bind_ip": "",
     "logappend": true,
     "journal": true,
     "port": 27017
diff --git a/orchestration_configs/servers/mmapv1.json b/orchestration_configs/servers/mmapv1.json
@@ -2,6 +2,7 @@
     "name": "mongod",
     "procParams": {
         "ipv6": true,
+        "bind_ip": "",
         "logappend": true,
         "journal": true,
         "storageEngine": "mmapv1",
diff --git a/orchestration_configs/servers/wiredtiger.json b/orchestration_configs/servers/wiredtiger.json
@@ -2,6 +2,7 @@
     "name": "mongod",
     "procParams": {
         "ipv6": true,
+        "bind_ip": "",
         "logappend": true,
         "journal": true,
         "storageEngine": "wiredTiger",
diff --git a/orchestration_configs/sharded_clusters/auth-ssl.json b/orchestration_configs/sharded_clusters/auth-ssl.json
@@ -28,11 +28,15 @@
   "routers": [
     {
       "setParameter" : { "enableTestCommands": 1 },
-      "port": 27017
+      "port": 27017,
+      "ipv6": true,
+      "bind_ip": ""
     },
     {
       "setParameter" : { "enableTestCommands": 1 },
-      "port": 27018
+      "port": 27018,
+      "ipv6": true,
+      "bind_ip": ""
     }
   ],
   "sslParams": {
diff --git a/orchestration_configs/sharded_clusters/auth.json b/orchestration_configs/sharded_clusters/auth.json
@@ -25,10 +25,14 @@
   ],
   "routers": [
     {
-      "port": 27017
+      "port": 27017,
+      "ipv6": true,
+      "bind_ip": ""
     },
     {
-      "port": 27018
+      "port": 27018,
+      "ipv6": true,
+      "bind_ip": ""
     }
   ]
 }
diff --git a/orchestration_configs/sharded_clusters/basic-ssl.json b/orchestration_configs/sharded_clusters/basic-ssl.json
@@ -22,10 +22,14 @@
   ],
   "routers": [
     {
-      "port": 27017
+      "port": 27017,
+      "ipv6": true,
+      "bind_ip": ""
     },
     {
-      "port": 27018
+      "port": 27018,
+      "ipv6": true,
+      "bind_ip": ""
     }
   ],
   "sslParams": {
diff --git a/orchestration_configs/sharded_clusters/basic.json b/orchestration_configs/sharded_clusters/basic.json
@@ -22,10 +22,14 @@
   ],
   "routers": [
     {
-      "port": 27017
+      "port": 27017,
+      "ipv6": true,
+      "bind_ip": ""
     },
     {
-      "port": 27018
+      "port": 27018,
+      "ipv6": true,
+      "bind_ip": ""
     }
   ]
 }
diff --git a/tests/test-mongoc-client.c b/tests/test-mongoc-client.c
@@ -1624,13 +1624,16 @@ test_get_database_names (void)
 static void
 test_mongoc_client_ipv6 (void)
 {
+   char *uri_str;
    mongoc_client_t *client;
    bson_error_t error;
    bson_iter_t iter;
    bson_t reply;
 
-   client = mongoc_client_new ("mongodb://[::1]/");
+   uri_str = test_framework_add_user_password_from_env ("mongodb://[::1]/");
+   client = mongoc_client_new (uri_str);
    assert (client);
+   test_framework_set_ssl_opts (client);
 
    ASSERT_OR_PRINT (
       mongoc_client_get_server_status (client, NULL, &reply, &error), error);
@@ -1640,8 +1643,8 @@ test_mongoc_client_ipv6 (void)
    assert (bson_iter_init_find (&iter, &reply, "ok"));
 
    bson_destroy (&reply);
-
    mongoc_client_destroy (client);
+   bson_free (uri_str);
 }
 
 
@@ -2646,7 +2649,7 @@ test_client_install (TestSuite *suite)
 {
    if (getenv ("MONGOC_CHECK_IPV6")) {
       /* try to validate ipv6 too */
-      TestSuite_Add (suite, "/Client/ipv6", test_mongoc_client_ipv6);
+      TestSuite_AddLive (suite, "/Client/ipv6", test_mongoc_client_ipv6);
    }
 
    TestSuite_AddFull (suite,
