CDRIVER-497 fix test failures with mongos

Author: ajdavis

tests/TestSuite.c

@@ -524,6 +524,7 @@ TestSuite_PrintJsonHeader (TestSuite *suite, /* IN */
    fprintf (stream,
             "{\n"
             "  \"uri\": \"%s\",\n"
+            "  \"is_mongos\": \"%s\",\n"
             "  \"host\": {\n"
             "    \"sysname\": \"Windows\",\n"
             "    \"release\": \"%ld.%ld (%ld)\",\n"
@@ -539,6 +540,7 @@ TestSuite_PrintJsonHeader (TestSuite *suite, /* IN */
             "  },\n"
             "  \"tests\": [\n",
             test_framework_get_uri_str (),
+            test_framework_is_mongos () ? "true" : "false",
             major_version, minor_version, build,
             si.dwProcessorType,
             si.dwPageSize,
@@ -566,6 +568,7 @@ TestSuite_PrintJsonHeader (TestSuite *suite, /* IN */
    fprintf (stream,
             "{\n"
             "  \"uri\": \"%s\",\n"
+            "  \"is_mongos\": \"%s\",\n"
             "  \"host\": {\n"
             "    \"sysname\": \"%s\",\n"
             "    \"release\": \"%s\",\n"
@@ -581,6 +584,7 @@ TestSuite_PrintJsonHeader (TestSuite *suite, /* IN */
             "  },\n"
             "  \"tests\": [\n",
             test_framework_get_uri_str (),
+            test_framework_is_mongos () ? "true" : "false",
             u.sysname,
             u.release,
             u.machine,

tests/test-libmongoc.c

@@ -849,6 +849,25 @@ test_framework_global_ssl_opts_cleanup (void)
 }
 #endif
 
+
+bool
+test_framework_is_mongos (void)
+{
+   bson_t reply;
+   bson_iter_t iter;
+   bool is_mongos;
+
+   call_ismaster (&reply);
+
+   is_mongos = (bson_iter_init_find (&iter, &reply, "msg")
+                && BSON_ITER_HOLDS_UTF8 (&iter)
+                && !strcasecmp (bson_iter_utf8 (&iter, NULL), "isdbgrid"));
+
+   bson_destroy (&reply);
+
+   return is_mongos;
+}
+
 int
 main (int   argc,
       char *argv[])

tests/test-libmongoc.h

@@ -35,4 +35,5 @@ char *test_framework_get_uri_str (void);
 mongoc_uri_t *test_framework_get_uri (void);
 mongoc_client_t *test_framework_client_new (void);
 mongoc_client_pool_t *test_framework_client_pool_new (void);
+bool test_framework_is_mongos (void);
 #endif

tests/test-mongoc-client.c

@@ -155,6 +155,12 @@ int should_run_auth_tests (void)
 }
 
 
+int skip_if_mongos (void)
+{
+   return test_framework_is_mongos () ? 0 : 1;
+}
+
+
 static void
 test_mongoc_client_authenticate_failure (void *context)
 {
@@ -652,7 +658,7 @@ test_recovering (void)
 
 
 static void
-test_exhaust_cursor (void)
+test_exhaust_cursor (void *context)
 {
    mongoc_stream_t *stream;
    mongoc_write_concern_t *wr;
@@ -955,7 +961,7 @@ test_client_install (TestSuite *suite)
    TestSuite_Add (suite, "/Client/mongos_seeds_reconnect", test_mongos_seeds_reconnect);
    TestSuite_Add (suite, "/Client/recovering", test_recovering);
 #endif
-   TestSuite_Add (suite, "/Client/exhaust_cursor", test_exhaust_cursor);
+   TestSuite_AddFull (suite, "/Client/exhaust_cursor", test_exhaust_cursor, NULL, NULL, skip_if_mongos);
    TestSuite_Add (suite, "/Client/server_status", test_server_status);
    TestSuite_Add (suite, "/Client/database_names", test_get_database_names);
 

tests/test-mongoc-collection.c

@@ -1338,7 +1338,6 @@ test_validate (void)
    r = mongoc_collection_validate (collection, &opts, &reply, &error);
    assert (r);
 
-   assert (bson_iter_init_find (&iter, &reply, "ns"));
    assert (bson_iter_init_find (&iter, &reply, "valid"));
 
    bson_destroy (&reply);