Skip to content

Clean up SKIPIFs for session tests #886

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 1 commit into from
Jul 20, 2018
Merged

Clean up SKIPIFs for session tests #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion tests/session/session-003.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ MongoDB\Driver\Session spec test: session cannot be used for different clients
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_live(); ?>
<?php skip_if_not_clean(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
--FILE--
<?php
Expand Down
1 change: 1 addition & 0 deletions tests/session/session-endSession-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
MongoDB\Driver\Session::endSession() Calling methods after session has been ended
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '4.0'); ?>
--FILE--
Expand Down
1 change: 1 addition & 0 deletions tests/session/session-startTransaction-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ MongoDB\Driver\Session::startTransaction() ensure that methods can be called
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto() ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '4.0'); ?>
--FILE--
<?php
Expand Down
2 changes: 2 additions & 0 deletions tests/session/session-startTransaction_error-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
MongoDB\Driver\Session::startTransaction() twice
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto() ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '4.0'); ?>
--FILE--
<?php
Expand Down
2 changes: 2 additions & 0 deletions tests/session/session-startTransaction_error-002.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
MongoDB\Driver\Session::startTransaction() with wrong values in options array
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto() ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '4.0'); ?>
--FILE--
<?php
Expand Down
2 changes: 2 additions & 0 deletions tests/session/session-startTransaction_error-003.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
MongoDB\Driver\Session::startTransaction() with wrong argument for options array
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto() ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '4.0'); ?>
--FILE--
<?php
Expand Down
4 changes: 1 addition & 3 deletions tests/session/session_error-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
--TEST--
MongoDB\Driver\Session with wrong defaultTransactionOptions
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";

$manager = new MongoDB\Driver\Manager(URI);
$manager = new MongoDB\Driver\Manager();

$options = [
[ 'readConcern' => 42 ],
Expand Down
5 changes: 3 additions & 2 deletions tests/session/transaction-integration-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
MongoDB\Driver\Session::startTransaction() Committing a transaction with example for how to handle failures
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_clean(DATABASE_NAME, COLLECTION_NAME . '_employees'); ?>
<?php skip_if_not_clean(DATABASE_NAME, COLLECTION_NAME . '_events'); ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '4.0'); ?>
<?php skip_if_not_clean(DATABASE_NAME, COLLECTION_NAME . '_employees'); ?>
<?php skip_if_not_clean(DATABASE_NAME, COLLECTION_NAME . '_events'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/session/transaction-integration-002.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
MongoDB\Driver\Session::startTransaction() Transient Error Test
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_clean(DATABASE_NAME, COLLECTION_NAME); ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '4.0'); ?>
<?php skip_if_not_clean(); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down