Merge branch '1.2.0-dev'

* 1.2.0-dev: (557 commits)
  CDRIVER-696 fix test when server isn't on 27017
  Ignore stray files/changes in submodules
  CDRIVER-901 document bulk write error domains
  CDRIVER-901 update bson_error_t from write concern err
  CDRIVER-907 crash retrieving invalid server description
  MONGOC_TEST_FUTURE_TIMEOUT_MS environment variable
  Update documentation for wtimeout_msec write concern params
  Fix parameter indentation for mongoc_write_concern_set_wtimeout()
  CDRIVER-851: Negative wtimeout values are invalid
  Skip test on mongos (mongos returns indiviaul shards status)
  CDRIVER-902: Bump libbson to 1.2.0-dev so Solaris build work again
  CDRIVER-888: inprog, killop & unlock are commands now, not queries
  CDRIVER-822 clean generated HTML docs/man pages
  Fix expectations on windows
  CDRIVER-900: Print debug error messaging to stderr
  post-release bump
  1.2.0-rc0 Release
  CDRIVER-697 no bson_return calls in tests
  merge 1.1.11 release notes
  NEWS file layout
  ...

Author: ajdavis

.gitignore

@@ -7,6 +7,7 @@ autom4te.cache
 bulk1
 bulk2
 bulk3
+bulk4
 ChangeLog
 cluster1
 *.cmake
@@ -69,6 +70,7 @@ test-mongoc-client-pool
 test-mongoc-collection
 test-mongoc-cursor
 test-mongoc-database
+test-mongoc-exhaust
 test-mongoc-event
 test-mongoc-gridfs
 test-mongoc-gridfs-file-page

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "src/libbson"]
 	path = src/libbson
 	url = https://github.com/mongodb/libbson.git
+	ignore = dirty

.mci.yml

@@ -100,7 +100,7 @@ c_driver_variables:
     mongo_orchestration:
       windows: &mongo_orchestration_windows
         start_mongo_orchestration: |
-          trap 'set +o errexit; mongo-orchestration stop;' EXIT
+          trap 'set +o errexit; cat server.log; mongo-orchestration stop;' EXIT
           taskkill.exe /FI "IMAGENAME eq python.exe" /F
           taskkill.exe /FI "IMAGENAME eq mongod.exe" /F
           fsutil volume diskfree c:
@@ -111,7 +111,7 @@ c_driver_variables:
           curl -s http://localhost:8889/
       unix: &mongo_orchestration_unix
         start_mongo_orchestration: |
-          trap 'set +o errexit; mongo-orchestration stop;' EXIT
+          trap 'set +o errexit; cat server.log; mongo-orchestration stop;' EXIT
           df -h
           echo "Starting Mongo Orchestration..."
           echo "{ \"releases\": { \"default\": \"`pwd`/mongodb/bin\" } }" > orchestration.config
@@ -408,6 +408,7 @@ post:
       params:
         working_dir: "mongo-c-driver"
         script: |
+            cat server.log
             mongo-orchestration stop
     - command: shell.cleanup
 

CMakeLists.txt

@@ -2,35 +2,45 @@ cmake_minimum_required(VERSION 2.8)
 
 project (libmongoc)
 
+option(SEARCH_OPEN_SSL "SEARCH_OPEN_SSL" ON)
+
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/build/cmake)
 
 include(InstallRequiredSystemLibraries)
-include(FindOpenSSL)
+
+if (SEARCH_OPEN_SSL)
+    include(FindOpenSSL)
+endif ()
 
 include(FindBSON REQUIRED)
+include(FindSASL2)
 
 set (SOURCE_DIR "${PROJECT_SOURCE_DIR}/")
 
 set (MONGOC_MAJOR_VERSION 1)
-set (MONGOC_MINOR_VERSION 1)
-set (MONGOC_MICRO_VERSION 11)
-set (MONGOC_PRERELEASE_VERSION )
+set (MONGOC_MINOR_VERSION 2)
+set (MONGOC_MICRO_VERSION 0)
+set (MONGOC_PRERELEASE_VERSION dev)
 set (MONGOC_API_VERSION 1.0)
-set (MONGOC_VERSION 1.1.11)
+set (MONGOC_VERSION 1.2.0-dev)
 
 set (CPACK_RESOURCE_FILE_LICENSE "${SOURCE_DIR}/COPYING")
 set (CPACK_PACKAGE_VERSION_MAJOR ${MONGOC_MAJOR_VERSION})
 set (CPACK_PACKAGE_VERSION_MINOR ${MONGOC_MINOR_VERSION})
 
 include (CPack)
 
-if (OPENSSL_FOUND)
+if (SEARCH_OPEN_SSL AND OPENSSL_FOUND)
    set (MONGOC_ENABLE_SSL 1)
 else()
    set (MONGOC_ENABLE_SSL 0)
 endif ()
 
-set (MONGOC_ENABLE_SASL 0)
+if (SASL2_FOUND)
+   set (MONGOC_ENABLE_SASL 1)
+else()
+   set (MONGOC_ENABLE_SASL 0)
+endif ()
 set (MONGOC_HAVE_SASL_CLIENT_DONE 0)
 
 configure_file (
@@ -60,9 +70,17 @@ endif()
 add_definitions(-D_GNU_SOURCE)
 add_definitions(-D_BSD_SOURCE)
 add_definitions("-DBINARY_DIR=\"${SOURCE_DIR}/tests/binary\"")
+if (APPLE)
+   # Until CDRIVER-520.
+   add_definitions(-Wno-deprecated-declarations)
+endif()
 
 set (SOURCES
    ${SOURCE_DIR}/src/mongoc/mongoc-array.c
+   ${SOURCE_DIR}/src/mongoc/mongoc-async.c
+   ${SOURCE_DIR}/src/mongoc/mongoc-async-cmd.c
+   ${SOURCE_DIR}/src/mongoc/mongoc-b64.c
+   ${SOURCE_DIR}/src/mongoc/mongoc-buffer.c
    ${SOURCE_DIR}/src/mongoc/mongoc-bulk-operation.c
    ${SOURCE_DIR}/src/mongoc/mongoc-buffer.c
    ${SOURCE_DIR}/src/mongoc/mongoc-b64.c
@@ -71,6 +89,7 @@ set (SOURCES
    ${SOURCE_DIR}/src/mongoc/mongoc-cluster.c
    ${SOURCE_DIR}/src/mongoc/mongoc-collection.c
    ${SOURCE_DIR}/src/mongoc/mongoc-counters.c
+   ${SOURCE_DIR}/src/mongoc/mongoc-cursor-array.c
    ${SOURCE_DIR}/src/mongoc/mongoc-cursor.c
    ${SOURCE_DIR}/src/mongoc/mongoc-cursor-array.c
    ${SOURCE_DIR}/src/mongoc/mongoc-cursor-cursorid.c
@@ -79,24 +98,35 @@ set (SOURCES
    ${SOURCE_DIR}/src/mongoc/mongoc-init.c
    ${SOURCE_DIR}/src/mongoc/mongoc-gridfs.c
    ${SOURCE_DIR}/src/mongoc/mongoc-gridfs-file.c
+   ${SOURCE_DIR}/src/mongoc/mongoc-gridfs-file-list.c
    ${SOURCE_DIR}/src/mongoc/mongoc-gridfs-file-page.c
    ${SOURCE_DIR}/src/mongoc/mongoc-gridfs-file-list.c
+   ${SOURCE_DIR}/src/mongoc/mongoc-host-list.c
    ${SOURCE_DIR}/src/mongoc/mongoc-index.c
+   ${SOURCE_DIR}/src/mongoc/mongoc-init.c
    ${SOURCE_DIR}/src/mongoc/mongoc-list.c
    ${SOURCE_DIR}/src/mongoc/mongoc-log.c
    ${SOURCE_DIR}/src/mongoc/mongoc-matcher.c
    ${SOURCE_DIR}/src/mongoc/mongoc-matcher-op.c
+   ${SOURCE_DIR}/src/mongoc/mongoc-opcode.c
    ${SOURCE_DIR}/src/mongoc/mongoc-queue.c
    ${SOURCE_DIR}/src/mongoc/mongoc-read-prefs.c
    ${SOURCE_DIR}/src/mongoc/mongoc-rpc.c
+   ${SOURCE_DIR}/src/mongoc/mongoc-server-description.c
+   ${SOURCE_DIR}/src/mongoc/mongoc-set.c
    ${SOURCE_DIR}/src/mongoc/mongoc-socket.c
+   ${SOURCE_DIR}/src/mongoc/mongoc-stream-buffered.c
    ${SOURCE_DIR}/src/mongoc/mongoc-stream.c
    ${SOURCE_DIR}/src/mongoc/mongoc-stream-buffered.c
    ${SOURCE_DIR}/src/mongoc/mongoc-stream-file.c
    ${SOURCE_DIR}/src/mongoc/mongoc-stream-gridfs.c
    ${SOURCE_DIR}/src/mongoc/mongoc-stream-socket.c
+   ${SOURCE_DIR}/src/mongoc/mongoc-topology.c
+   ${SOURCE_DIR}/src/mongoc/mongoc-topology-description.c
+   ${SOURCE_DIR}/src/mongoc/mongoc-topology-scanner.c
    ${SOURCE_DIR}/src/mongoc/mongoc-uri.c
    ${SOURCE_DIR}/src/mongoc/mongoc-util.c
+   ${SOURCE_DIR}/src/mongoc/mongoc-version-functions.c
    ${SOURCE_DIR}/src/mongoc/mongoc-write-command.c
    ${SOURCE_DIR}/src/mongoc/mongoc-write-concern.c
 )
@@ -124,7 +154,9 @@ set (HEADERS
    ${SOURCE_DIR}/src/mongoc/mongoc-log.h
    ${SOURCE_DIR}/src/mongoc/mongoc-matcher.h
    ${SOURCE_DIR}/src/mongoc/mongoc-opcode.h
+   ${SOURCE_DIR}/src/mongoc/mongoc-opcode-private.h
    ${SOURCE_DIR}/src/mongoc/mongoc-read-prefs.h
+   ${SOURCE_DIR}/src/mongoc/mongoc-server-description.h
    ${SOURCE_DIR}/src/mongoc/mongoc-socket.h
    ${SOURCE_DIR}/src/mongoc/mongoc-socket-private.h
    ${SOURCE_DIR}/src/mongoc/mongoc-stream.h
@@ -133,6 +165,7 @@ set (HEADERS
    ${SOURCE_DIR}/src/mongoc/mongoc-stream-gridfs.h
    ${SOURCE_DIR}/src/mongoc/mongoc-stream-socket.h
    ${SOURCE_DIR}/src/mongoc/mongoc-uri.h
+   ${SOURCE_DIR}/src/mongoc/mongoc-version-functions.h
    ${SOURCE_DIR}/src/mongoc/mongoc-write-concern.h
 )
 
@@ -151,6 +184,13 @@ if (OPENSSL_FOUND)
    include_directories(${OPENSSL_INCLUDE_DIR})
 endif()
 
+if (SASL2_FOUND)
+   set (HEADERS ${HEADERS} ${SOURCE_DIR}/src/mongoc/mongoc-sasl-private.h)
+   set (SOURCES ${SOURCES} ${SOURCE_DIR}/src/mongoc/mongoc-sasl.c)
+   set(LIBS ${LIBS} ${SASL2_LIBRARY})
+   include_directories(${SASL2_INCLUDE_DIR})
+endif()
+
 if (MSVC)
    if (OPENSSL_FOUND)
       set(MONGOC_SHARED_SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/build/cmake/libmongoc-ssl.def)
@@ -205,35 +245,58 @@ function(mongoc_add_example example use_shared)
 endfunction()
 
 set(test-libmongoc-sources
+   ${SOURCE_DIR}/tests/debug-stream.c
    ${SOURCE_DIR}/tests/ha-test.c
+   ${SOURCE_DIR}/tests/json-test.c
+   ${SOURCE_DIR}/tests/mock_server/future.c
+   ${SOURCE_DIR}/tests/mock_server/future-functions.c
+   ${SOURCE_DIR}/tests/mock_server/future-value.c
+   ${SOURCE_DIR}/tests/mock_server/sync-queue.c
+   ${SOURCE_DIR}/tests/mock_server/mock-rs.c
+   ${SOURCE_DIR}/tests/mock_server/mock-server.c
+   ${SOURCE_DIR}/tests/mock_server/request.c
+   ${SOURCE_DIR}/tests/test-conveniences.c
+   ${SOURCE_DIR}/tests/test-bulk.c
    ${SOURCE_DIR}/tests/test-libmongoc.c
    ${SOURCE_DIR}/tests/test-mongoc-array.c
+   ${SOURCE_DIR}/tests/test-mongoc-async.c
    ${SOURCE_DIR}/tests/test-mongoc-buffer.c
    ${SOURCE_DIR}/tests/test-mongoc-client.c
-   ${SOURCE_DIR}/tests/mock-server.c
    ${SOURCE_DIR}/tests/test-bulk.c
    ${SOURCE_DIR}/tests/test-mongoc-client-pool.c
    ${SOURCE_DIR}/tests/test-mongoc-cluster.c
    ${SOURCE_DIR}/tests/test-mongoc-collection.c
    ${SOURCE_DIR}/tests/test-mongoc-cursor.c
    ${SOURCE_DIR}/tests/test-mongoc-database.c
+   ${SOURCE_DIR}/tests/test-mongoc-exhaust.c
    ${SOURCE_DIR}/tests/test-mongoc-gridfs.c
    ${SOURCE_DIR}/tests/test-mongoc-gridfs-file-page.c
    ${SOURCE_DIR}/tests/test-mongoc-list.c
+   ${SOURCE_DIR}/tests/test-mongoc-log.c
    ${SOURCE_DIR}/tests/test-mongoc-matcher.c
    ${SOURCE_DIR}/tests/test-mongoc-queue.c
    ${SOURCE_DIR}/tests/test-mongoc-read-prefs.c
    ${SOURCE_DIR}/tests/test-mongoc-rpc.c
+   ${SOURCE_DIR}/tests/test-mongoc-sdam.c
+   ${SOURCE_DIR}/tests/test-mongoc-server-selection.c
+   ${SOURCE_DIR}/tests/test-mongoc-server-selection-errors.c
+   ${SOURCE_DIR}/tests/test-mongoc-set.c
    ${SOURCE_DIR}/tests/test-mongoc-socket.c
    ${SOURCE_DIR}/tests/test-mongoc-stream.c
+   ${SOURCE_DIR}/tests/test-mongoc-thread.c
+   ${SOURCE_DIR}/tests/test-mongoc-topology.c
+   ${SOURCE_DIR}/tests/test-mongoc-topology-reconcile.c
+   ${SOURCE_DIR}/tests/test-mongoc-topology-scanner.c
    ${SOURCE_DIR}/tests/test-mongoc-uri.c
+   ${SOURCE_DIR}/tests/test-mongoc-version.c
+   ${SOURCE_DIR}/tests/test-mongoc-usleep.c
    ${SOURCE_DIR}/tests/test-mongoc-write-concern.c
    ${SOURCE_DIR}/tests/test-sasl.c
    ${SOURCE_DIR}/tests/test-write-commands.c
    ${SOURCE_DIR}/tests/TestSuite.c
 )
 
-if (OPENSSL_FOUND)
+if (SEARCH_OPEN_SSL AND OPENSSL_FOUND)
    set(test-libmongoc-sources ${test-libmongoc-sources}
       ${SOURCE_DIR}/tests/test-x509.c
       ${SOURCE_DIR}/tests/ssl-test.c

CONTRIBUTING.md

@@ -115,21 +115,62 @@ generate man pages and HTML for it.
 
 ### Testing
 
-You should always run `make test` before submitting a patch. Just make sure you
-have a locally running `mongod` instance available on `127.0.0.1:27017`. All
-tests should pass. Alternatively, you can specify `MONGOC_TEST_HOST`
-environment variable to specify a non-localhost hostname or ip address.
-
-To test with auth, create a "root" user on the "admin" database and set the
-`MONGOC_TEST_USER` and `MONGOC_TEST_PASSWORD` environment variables to its
-username and password.
-
-Set the `MONGOC_TEST_SSL` environment variable `on` to connect to the server via
-SSL with default options. Configure SSL options with paths
-`MONGOC_TEST_SSL_PEM_FILE`, `MONGOC_TEST_SSL_PEM_PWD`,
-`MONGOC_TEST_SSL_CA_FILE`, `MONGOC_TEST_SSL_CA_DIR`, and
-`MONGOC_TEST_SSL_CRL_FILE`. Set the `MONGOC_TEST_SSL_WEAK_CERT_VALIDATION`
-environment variable `on` to relax server certificate validation.
+To run the entire test suite, including authentication tests,
+start `mongod` with auth enabled:
+
+```
+$ mongod --auth
+```
+
+In another terminal, use the `mongo` shell to create a user:
+
+```
+$ mongo --eval "db.createUser({user: 'admin', pwd: 'pass', roles: ['root']})" admin
+```
+
+To authenticate against MongoDB 3.0+ requires SCRAM-SHA-1, which in turn
+requires a driver built with OpenSSL:
+
+```
+$ ./configure --enable-ssl`
+```
+
+Set the user and password environment variables, then build and run the tests:
+
+```
+$ export MONGOC_TEST_USER=admin
+$ export MONGOC_TEST_PASSWORD=pass
+$ make test
+```
+
+Additional environment variables:
+
+* `MONGOC_TEST_HOST`: default `localhost`, the host running MongoDB.
+* `MONGOC_TEST_PORT`: default 27017, MongoDB's listening port.
+* `MONGOC_TEST_SERVER_VERBOSE`: set to `on` for wire protocol logging from 
+  tests that use `mock_server_t`. 
+
+If you start `mongod` with SSL, set these variables to configure how
+`make test` connects to it:
+
+* `MONGOC_TEST_SSL`: set to `on` to connect to the server with SSL.
+* `MONGOC_TEST_SSL_PEM_FILE`: path to a client PEM file.
+* `MONGOC_TEST_SSL_PEM_PWD`: the PEM file's password.
+* `MONGOC_TEST_SSL_CA_FILE`: path to a certificate authority file.
+* `MONGOC_TEST_SSL_CA_DIR`: path to a certificate authority directory.
+* `MONGOC_TEST_SSL_CRL_FILE`: path to a certificate revocation list.
+* `MONGOC_TEST_SSL_WEAK_CERT_VALIDATION`: set to `on` to relax the client's
+  validation of the server's certificate.
+
+The SASL / GSSAPI / Kerberos tests are skipped by default. To run them, set up a
+separate `mongod` with Kerberos and set its host and Kerberos principal name
+as environment variables:
+
+* `MONGOC_TEST_GSSAPI_HOST` 
+* `MONGOC_TEST_GSSAPI_USER` 
+
+URI-escape the username, for example write "user@realm" as "user%40realm".
+The user must be authorized to query `test.collection`.
 
 The SASL / GSSAPI / Kerberos tests are skipped by default. To run them, set up a
 separate `mongod` with Kerberos and set its host and Kerberos principal name
@@ -143,3 +184,35 @@ The user must be authorized to query `test.collection`.
 
 All tests should pass before submitting a patch.
 
+## Configuring the test runner
+
+The test runner can be configured by declaring the `TEST_ARGS` environment
+variable. The following options can be provided:
+
+```
+    -h, --help   Show this help menu.
+    -f           Do not fork() before running tests.
+    -l NAME      Run test by name, e.g. "/Client/command" or "/Client/*".
+    -p           Do not run tests in parallel.
+    -v           Be verbose with logs.
+```
+
+`TEST_ARGS` is set to "-f -p" by default.
+
+To run just a specific portion of the test suite use the -l option like so:
+
+```
+$ make test TEST_ARGS="-l /server_selection/*"
+```
+
+The full list of tests is shown in the help.
+
+## Debugging failed tests
+
+The easiest way to debug a failed tests is to use the `debug` make target:
+
+```
+$ make debug TEST_ARGS="-l /WriteConcern/bson_omits_defaults"
+```
+
+This will build all dependencies and leave you in a debugger ready to run the test.

Makefile.am

@@ -29,7 +29,7 @@ endif
 include build/cmake/Makefile.am
 
 ACLOCAL_AMFLAGS = -I build/autotools/m4 ${ACLOCAL_FLAGS}
-DISTCHECK_CONFIGURE_FLAGS = --enable-silent-rules --enable-man-pages --enable-html-doc --enable-sasl --enable-ssl --enable-maintainer-flags --enable-debug --with-libbson=bundled
+DISTCHECK_CONFIGURE_FLAGS = --enable-silent-rules --enable-man-pages --enable-html-docs --enable-sasl --enable-ssl --enable-maintainer-flags --enable-debug --with-libbson=bundled
 
 mongocdocdir = ${docdir}
 mongocdoc_DATA = \