Skip to content

Commit 1432286

Browse files
committed
Merge pull request #963
2 parents 007f82b + ecea126 commit 1432286

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.evergreen/run-tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ OS=$(uname -s | tr '[:upper:]' '[:lower:]')
1616

1717
export REPORT_EXIT_STATUS=1
1818

19-
if [ "$SSL" == "yes" ]; then
20-
MONGODB_URI="${MONGODB_URI}/?ssl=true"
19+
if [ "$SSL" = "yes" ]; then
20+
MONGODB_URI="${MONGODB_URI}/?ssl=true&sslallowinvalidcertificates=true"
2121
fi
2222

2323
echo "Running $AUTH tests, connecting to $MONGODB_URI"

.travis.scripts/setup_mo.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ case $DEPLOYMENT in
2525
;;
2626
STANDALONE_SSL)
2727
${TRAVIS_BUILD_DIR}/.travis.scripts/mo.sh ${TRAVIS_BUILD_DIR}/scripts/presets/travis/standalone/standalone-ssl.json start > /tmp/mo-result.json
28-
cat /tmp/mo-result.json | tail -n 1 | php -r 'echo json_decode(file_get_contents("php://stdin"))->mongodb_uri, "/?ssl=true";' > /tmp/uri.txt
28+
cat /tmp/mo-result.json | tail -n 1 | php -r 'echo json_decode(file_get_contents("php://stdin"))->mongodb_uri, "/?ssl=true&sslallowinvalidcertificates=true";' > /tmp/uri.txt
2929
;;
3030
REPLICASET)
3131
${TRAVIS_BUILD_DIR}/.travis.scripts/mo.sh ${TRAVIS_BUILD_DIR}/scripts/presets/travis/replica_sets/replicaset.json start > /tmp/mo-result.json

tests/manager/manager-ctor-wireversion.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ $command = new MongoDB\Driver\Command(['ping' => 1]);
1010
try {
1111
$manager->executeCommand("test", $command);
1212
} catch (\MongoDB\Driver\Exception\ConnectionException $e) {
13-
if ($e->getCode() == 15) { // Bad Wire Version
13+
if ($e->getCode() == 15) { // MONGOC_ERROR_PROTOCOL_BAD_WIRE_VERSION
1414
echo "Bad wire version detected: ", $e->getMessage(), "\n";
1515
}
1616
}

0 commit comments

Comments
 (0)