Remove unnecessary SKIPIFs from ReadPreference tests

derickr · Sep 19, 2016 · d9b6613 · d9b6613
1 parent 236e9bd
commit d9b6613
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 18 deletions.
diff --git a/tests/readPreference/readpreference-ctor-001.phpt b/tests/readPreference/readpreference-ctor-001.phpt
@@ -1,10 +1,7 @@
 --TEST--
 MongoDB\Driver\ReadPreference construction
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
 --FILE--
 <?php
-require_once __DIR__ . "/../utils/basic.inc";
 
 var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY));
 var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, array(array("tag" => "one"))));

diff --git a/tests/readPreference/readpreference-ctor_error-001.phpt b/tests/readPreference/readpreference-ctor_error-001.phpt
@@ -1,10 +1,9 @@
 --TEST--
 MongoDB\Driver\ReadPreference construction (invalid mode)
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
 --FILE--
 <?php
-require_once __DIR__ . "/../utils/basic.inc";
+
+require_once __DIR__ . '/../utils/tools.php';
 
 echo throws(function() {
     new MongoDB\Driver\ReadPreference(42);

diff --git a/tests/readPreference/readpreference-ctor_error-002.phpt b/tests/readPreference/readpreference-ctor_error-002.phpt
@@ -1,10 +1,9 @@
 --TEST--
 MongoDB\Driver\ReadPreference construction (invalid tagSets)
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
 --FILE--
 <?php
-require_once __DIR__ . "/../utils/basic.inc";
+
+require_once __DIR__ . '/../utils/tools.php';
 
 echo throws(function() {
     new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY, [['tag' => 'one']]);

diff --git a/tests/readPreference/readpreference-getMode-001.phpt b/tests/readPreference/readpreference-getMode-001.phpt
@@ -1,10 +1,7 @@
 --TEST--
 MongoDB\Driver\ReadPreference::getMode()
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
 --FILE--
 <?php
-require_once __DIR__ . "/../utils/basic.inc";
 
 $tests = array(
     MongoDB\Driver\ReadPreference::RP_PRIMARY,

diff --git a/tests/readPreference/readpreference-getTagSets-001.phpt b/tests/readPreference/readpreference-getTagSets-001.phpt
@@ -1,10 +1,7 @@
 --TEST--
 MongoDB\Driver\ReadPreference::getTagSets()
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
 --FILE--
 <?php
-require_once __DIR__ . "/../utils/basic.inc";
 
 $tests = array(
     null,

diff --git a/tests/readPreference/readpreference_error-001.phpt b/tests/readPreference/readpreference_error-001.phpt
@@ -1,10 +1,7 @@
 --TEST--
 MongoDB\Driver\ReadPreference cannot be extended
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
 --FILE--
 <?php
-require_once __DIR__ . "/../utils/basic.inc";
 
 class MyReadPreference extends MongoDB\Driver\ReadPreference {}