various fixups for memory leaks and races in tests

Author: hanumantmk

tests/mock-server.c

@@ -546,14 +546,19 @@ mock_server_quit (mock_server_t *server)
          assert (0 == mongoc_stream_close (stream));  /* success */
       }
    }
-   mongoc_cond_wait (&server->stopped_condition, &server->mutex);
+   while (! server->stopped) {
+      mongoc_cond_wait (&server->stopped_condition, &server->mutex);
+   }
    mongoc_mutex_unlock (&server->mutex);
 }
 
 
 void
 mock_server_destroy (mock_server_t *server)
 {
+   /* TODO: we can't actually destroy these if workers are still around.  Make
+    * this operational again after fixing that up */
+   return;
    if (server) {
       _mongoc_array_destroy (&server->streams);
       mongoc_cond_destroy (&server->cond);

tests/test-mongoc-cluster.c

@@ -22,6 +22,8 @@ call_ismaster (bson_t *reply)
    r = mongoc_client_command_simple (client, "admin", &ismaster,
                                      NULL, reply, NULL);
 
+   mongoc_client_destroy(client);
+
    assert (r);
 }
 
@@ -72,6 +74,7 @@ uri_from_ismaster_plus_one (bson_t *ismaster_response)
    char *name;
    bson_iter_t iter;
    bson_iter_t hosts_iter;
+   mongoc_uri_t *uri;
 
    if ((name = set_name (ismaster_response))) {
       bson_iter_init_find (&iter, ismaster_response, "hosts");
@@ -98,7 +101,11 @@ uri_from_ismaster_plus_one (bson_t *ismaster_response)
       bson_free (host);
    }
 
-   return mongoc_uri_new (bson_string_free (uri_str, false));
+   uri = mongoc_uri_new (uri_str->str);
+
+   bson_string_free (uri_str, true);
+
+   return uri;
 }
 
 

valgrind.suppressions

@@ -25,15 +25,15 @@
 {
    ingore_scram_nonce_uninitialized_warning_cond
    Memcheck:Cond
-   fun:b64_ntop
+   fun:mongoc_b64_ntop
    ...
    fun:_mongoc_scram_step
    ...
 }
 {
    ingore_scram_nonce_uninitialized_warning_value8
    Memcheck:Value8
-   fun:b64_ntop
+   fun:mongoc_b64_ntop
    ...
    fun:_mongoc_scram_step
    ...