Skip to content

PHPC-1180: Ensure STANDALONE_SSL tests run #963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 28, 2019
Merged

PHPC-1180: Ensure STANDALONE_SSL tests run #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb7b80e
PHPC-1180: Fix comparison operator in run-tests.sh
jmikola Feb 28, 2019
498707d
Revert "PHPC-1180: Do not require weak cert validation for STANDALONE…
jmikola Feb 28, 2019
666f2d0
PHPC-1180: Enable weak cert validation for Evergreen SSL envs
jmikola Feb 28, 2019
ecea126
Refer to libmongoc error code in wire version test
jmikola Feb 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .evergreen/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ OS=$(uname -s | tr '[:upper:]' '[:lower:]')

export REPORT_EXIT_STATUS=1

if [ "$SSL" == "yes" ]; then
MONGODB_URI="${MONGODB_URI}/?ssl=true"
if [ "$SSL" = "yes" ]; then
MONGODB_URI="${MONGODB_URI}/?ssl=true&sslallowinvalidcertificates=true"
fi

echo "Running $AUTH tests, connecting to $MONGODB_URI"
Expand Down
2 changes: 1 addition & 1 deletion .travis.scripts/setup_mo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ case $DEPLOYMENT in
;;
STANDALONE_SSL)
${TRAVIS_BUILD_DIR}/.travis.scripts/mo.sh ${TRAVIS_BUILD_DIR}/scripts/presets/travis/standalone/standalone-ssl.json start > /tmp/mo-result.json
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
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
;;
REPLICASET)
${TRAVIS_BUILD_DIR}/.travis.scripts/mo.sh ${TRAVIS_BUILD_DIR}/scripts/presets/travis/replica_sets/replicaset.json start > /tmp/mo-result.json
Expand Down
2 changes: 1 addition & 1 deletion tests/manager/manager-ctor-wireversion.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ $command = new MongoDB\Driver\Command(['ping' => 1]);
try {
$manager->executeCommand("test", $command);
} catch (\MongoDB\Driver\Exception\ConnectionException $e) {
if ($e->getCode() == 15) { // Bad Wire Version
if ($e->getCode() == 15) { // MONGOC_ERROR_PROTOCOL_BAD_WIRE_VERSION
echo "Bad wire version detected: ", $e->getMessage(), "\n";
}
}
Expand Down