more info when ssl or topology tests fail

Author: ajdavis

tests/ssl-test.c

@@ -175,7 +175,11 @@ ssl_test_client (void * ptr)
    server_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
 
    r = mongoc_socket_connect (conn_sock, (struct sockaddr *)&server_addr, sizeof(server_addr), -1);
-   assert (r == 0);
+   if (r != 0) {
+      fprintf (stderr, "mongoc_socket_connect returned %zd: \"%s\"",
+               r, strerror (errno));
+      abort ();
+   }
 
    sock_stream = mongoc_stream_socket_new (conn_sock);
    assert(sock_stream);

tests/test-mongoc-topology.c

@@ -355,20 +355,20 @@ test_invalid_cluster_node (void)
    assert (cluster_node);
    assert (scanner_node);
    assert (cluster_node->stream);
-   assert (cluster_node->timestamp > scanner_node->timestamp);
+   ASSERT_CMPINT64 (cluster_node->timestamp, >, scanner_node->timestamp);
 
    /* update the scanner node's timestamp */
    _mongoc_usleep (1000 * 1000);
    scanner_node->timestamp = bson_get_monotonic_time ();
-   assert (cluster_node->timestamp < scanner_node->timestamp);
+   ASSERT_CMPINT64 (cluster_node->timestamp, <, scanner_node->timestamp);
    _mongoc_usleep (1000 * 1000);
 
    /* cluster discards node and creates new one */
    server_stream = mongoc_cluster_stream_for_server (&client->cluster,
                                                      id, true, &error);
    ASSERT_OR_PRINT (server_stream, error);
    cluster_node = (mongoc_cluster_node_t *)mongoc_set_get (cluster->nodes, id);
-   assert (cluster_node->timestamp > scanner_node->timestamp);
+   ASSERT_CMPINT64 (cluster_node->timestamp, >, scanner_node->timestamp);
 
    mongoc_server_stream_cleanup (server_stream);
    mongoc_client_pool_push (pool, client);