PHPC-1177: Add skip clauses to tests that must run with simple auth

Author: derickr

.travis.scripts/setup_mo.sh

@@ -2,6 +2,10 @@
 
 echo Loading MO for $DEPLOYMENT
 
+if [[ -z $TRAVIS_BUILD_DIR ]]; then
+    TRAVIS_BUILD_DIR=`pwd`;
+fi
+
 case $DEPLOYMENT in
   SHARDED_CLUSTER)
     ${TRAVIS_BUILD_DIR}/.travis.scripts/mo.sh ${TRAVIS_BUILD_DIR}/scripts/presets/travis/sharded_clusters/cluster.json start > /tmp/mo-result.json

tests/connect/standalone-auth-0001.phpt renamed to tests/connect/standalone-auth-001.phpt

@@ -3,6 +3,7 @@ Connect to MongoDB with using default auth mechanism
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_auth(); ?>
+<?php skip_if_not_auth_mechanism(null); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php

tests/connect/standalone-auth-0002.phpt renamed to tests/connect/standalone-auth_error-001.phpt

@@ -1,17 +1,16 @@
 --TEST--
-Connect to MongoDB with using default auth mechanism #002
---XFAIL--
-parse_url() tests must be reimplemented (PHPC-1177)
+Connect to MongoDB with using default auth mechanism and wrong password
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_auth(); ?>
+<?php skip_if_not_auth_mechanism(null); ?>
 <?php skip_if_not_clean(); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
 
 $username = "root";
-$password = "tooring";
+$password = "the-wrong-password";
 $database = "admin";
 
 $parsed = parse_url(URI);

tests/server/server-executeBulkWrite-005.phpt

@@ -24,11 +24,9 @@ foreach ($writeConcerns as $wc) {
     var_dump($result->getInsertedCount());
 }
 
-$command = new MongoDB\Driver\Command([
-    'delete' => COLLECTION_NAME,
-    'deletes' => [ [ 'q' => (object) [], 'limit' => 0 ] ]
-]);
-$server->executeCommand('local', $command);
+$bulk = new MongoDB\Driver\BulkWrite();
+$bulk->delete( (object) [] );
+$server->executeBulkWrite('local.' . COLLECTION_NAME, $bulk);
 
 ?>
 ===DONE===

tests/utils/skipif.php

@@ -97,7 +97,7 @@ function skip_if_not_auth_mechanism($authMechanism)
 {
     $uriAuthMechanism = get_uri_option(URI, 'authMechanism');
 
-    if ($uriAuthMechanism === null) {
+    if ($uriAuthMechanism === null && $authMechanism !== null) {
         exit('skip URI is not using authMechanism');
     }