PHPC-268: Update tests to declare which environments they need

bjori · bjori · commit 536ec40a9e3c · 2015-04-23T19:56:37.000-07:00
diff --git a/tests/connect/standalone-auth-0001.phpt b/tests/connect/standalone-auth-0001.phpt
@@ -1,7 +1,8 @@
 --TEST--
 Connect to MongoDB with using default auth mechanism
 --SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE_AUTH) ?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_AUTH"); ?>
+<?php CLEANUP(STANDALONE_AUTH) ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/connect/standalone-auth-0002.phpt b/tests/connect/standalone-auth-0002.phpt
@@ -1,7 +1,8 @@
 --TEST--
 Connect to MongoDB with using default auth mechanism #002
 --SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE_AUTH) ?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_AUTH"); ?>
+<?php CLEANUP(STANDALONE_AUTH) ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/connect/standalone-plain-0001.phpt b/tests/connect/standalone-plain-0001.phpt
@@ -1,7 +1,8 @@
 --TEST--
 Connect to MongoDB with using PLAIN auth mechanism
 --SKIPIF--
-<?php require __DIR__ . "/../utils/auth-plain-skipif.inc"; CLEANUP(STANDALONE_PLAIN) ?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_PLAIN"); ?>
+<?php CLEANUP(STANDALONE_PLAIN) ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/connect/standalone-plain-0002.phpt b/tests/connect/standalone-plain-0002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Connect to MongoDB with using PLAIN auth mechanism #002
 --SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_PLAIN"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/connect/standalone-ssl-0001.phpt b/tests/connect/standalone-ssl-0001.phpt
@@ -1,10 +1,10 @@
 --TEST--
 Connect to MongoDB with using SSL without verifying anything
 --SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_SSL"); ?>
 --FILE--
 <?php
-require_once __DIR__ . "/../utils/basic.inc";
+require_once __DIR__ . "/" . "../utils/basic.inc";
 
 $SSL_DIR = realpath(__DIR__ . "/" . "./../../scripts/ssl/");
 $opts = array(
diff --git a/tests/connect/standalone-ssl-0002.phpt b/tests/connect/standalone-ssl-0002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Connect to MongoDB with using SSL and verify the stream
 --SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_SSL"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/connect/standalone-ssl-0003.phpt b/tests/connect/standalone-ssl-0003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Connect to MongoDB with using SSL without verifying anything
 --SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_SSL"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/connect/standalone-ssl-0004.phpt b/tests/connect/standalone-ssl-0004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Connect to MongoDB with using SSL and verify the stream
 --SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_SSL"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/connect/standalone-x509-0001.phpt b/tests/connect/standalone-x509-0001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Connect to MongoDB with using SSL and X.509 auth
 --SKIPIF--
-<?php require __DIR__ . "/../utils/auth-x509-skipif.inc"?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_X509"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/connect/standalone-x509-0002.phpt b/tests/connect/standalone-x509-0002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Connect to MongoDB with using X509 retrieving username from certificate #002
 --SKIPIF--
-<?php require __DIR__ . "/../utils/auth-x509-skipif.inc"?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_X509"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/connect/standalone-x509-0003.phpt b/tests/connect/standalone-x509-0003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Connect to MongoDB with using SSL and X.509 auth
 --SKIPIF--
-<?php require __DIR__ . "/../utils/auth-x509-skipif.inc"?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_X509"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/connect/standalone-x509-0004.phpt b/tests/connect/standalone-x509-0004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Connect to MongoDB with using X509 retrieving username from certificate #002
 --SKIPIF--
-<?php require __DIR__ . "/../utils/auth-x509-skipif.inc"?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_X509"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/replicaset/bug0155.phpt b/tests/replicaset/bug0155.phpt
@@ -1,7 +1,7 @@
 --TEST--
 MongoDB\Driver\WriteConcern construction
 --SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("REPLICASET"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/replicaset/manager-getservers-001.phpt b/tests/replicaset/manager-getservers-001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 MongoDB\Driver\Manager: getServers()
 --SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("REPLICASET"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
@@ -27,13 +27,13 @@ foreach($servers as $server) {
 --EXPECTF--
 array(3) {
   [0]=>
-  object(MongoDB\Driver\Server)#5 (0) {
+  object(MongoDB\Driver\Server)#%d (0) {
   }
   [1]=>
-  object(MongoDB\Driver\Server)#6 (0) {
+  object(MongoDB\Driver\Server)#%d (0) {
   }
   [2]=>
-  object(MongoDB\Driver\Server)#7 (0) {
+  object(MongoDB\Driver\Server)#%d (0) {
   }
 }
 192.168.112.10:3000 - primary: 1, secondary: 0, arbiter: 0
diff --git a/tests/replicaset/manager-selectserver-001.phpt b/tests/replicaset/manager-selectserver-001.phpt
@@ -1,7 +1,8 @@
 --TEST--
 MongoDB\Driver\Manager::selectServer() select a server from SDAM based on ReadPreference
 --SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(REPLICASET); CLEANUP(REPLICASET, "local", "example"); ?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("REPLICASET"); ?>
+<?php CLEANUP(REPLICASET); CLEANUP(REPLICASET, "local", "example"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/replicaset/server-001.phpt b/tests/replicaset/server-001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 MongoDB\Driver\Server: Manager->getServer() returning correct server
 --SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("REPLICASET"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/replicaset/server-002.phpt b/tests/replicaset/server-002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 MongoDB\Driver\Server: Manager->getServer() returning correct server
 --SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("REPLICASET"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/replicaset/writeconcern-error.phpt b/tests/replicaset/writeconcern-error.phpt
@@ -1,7 +1,7 @@
 --TEST--
 WriteConcernError: Populate WriteConcernError on WriteConcern errors
 --SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("REPLICASET"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/replicaset/writeconcernerror-0001.phpt b/tests/replicaset/writeconcernerror-0001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 WriteConcernError: Access write counts and WriteConcern reason
 --SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("REPLICASET"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/replicaset/writeresult-getserver-001.phpt b/tests/replicaset/writeresult-getserver-001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 MongoDB\Driver\Server: Manager->getServer() returning correct server
 --SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("REPLICASET"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
diff --git a/tests/replicaset/writeresult-getserver-002.phpt b/tests/replicaset/writeresult-getserver-002.phpt
@@ -1,7 +1,8 @@
 --TEST--
 MongoDB\Driver\Server: Manager->getServer() returning correct server
 --SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(REPLICASET); CLEANUP(REPLICASET, "local", "example"); ?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("REPLICASET"); ?>
+<?php CLEANUP(REPLICASET); CLEANUP(REPLICASET, "local", "example"); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
