CDRIVER-2670 fix header order; skip fn

Author: kevinAlbs

src/libmongoc/src/mongoc/mongoc-change-stream.c

@@ -43,7 +43,7 @@
 static bool
 _is_resumable_error (const bson_t *reply)
 {
-   bson_error_t error;
+   bson_error_t error = {0};
 
    /* Change Streams Spec resumable criteria: "any error encountered which is
     * not a server error (e.g. a timeout error or network error)" */

src/libmongoc/src/mongoc/mongoc-client.c

@@ -54,6 +54,7 @@
 #include "mongoc-read-concern-private.h"
 #include "mongoc-host-list-private.h"
 #include "mongoc-read-prefs-private.h"
+#include "mongoc-change-stream-private.h"
 #include "mongoc-client-session-private.h"
 #include "mongoc-cursor-private.h"
 
@@ -62,8 +63,6 @@
 #include "mongoc-ssl-private.h"
 #include "mongoc-cmd-private.h"
 #include "mongoc-opts-private.h"
-#include "mongoc-change-stream-private.h"
-
 #endif
 
 

src/libmongoc/tests/test-mongoc-change-stream.c

@@ -1380,7 +1380,8 @@ test_change_stream_install (TestSuite *suite)
                       test_change_stream_start_at_operation_time,
                       NULL,
                       NULL,
-                      test_framework_skip_if_not_rs_version_7);
+                      test_framework_skip_if_not_rs_version_7,
+                      test_framework_skip_if_no_sessions);
    TestSuite_AddFull (suite,
                       "/change_stream/database",
                       test_change_stream_database_watch,