Merge pull request #714

Author: jmikola

tests/causal-consistency/causal-consistency-010.phpt

@@ -2,7 +2,7 @@
 Causal consistency: unacknowledged write does not update operationTime
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
-<?php NEEDS('REPLICASET'); CLEANUP(REPLICASET);  ?>
+<?php NEEDS('REPLICASET'); CLEANUP(REPLICASET); ?>
 --FILE--
 <?php
 require_once __DIR__ . "/../utils/basic.inc";

tests/causal-consistency/causal-consistency-011.phpt

@@ -0,0 +1,34 @@
+--TEST--
+Causal consistency: $clusterTime is not sent in commands to unsupported deployments
+--SKIPIF--
+<?php if (getenv("TRAVIS")) exit("skip This currently fails on Travis because it doesn't run 3.6 yet"); ?>
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php NEEDS('STANDALONE'); ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+require_once __DIR__ . "/../utils/observer.php";
+
+(new CommandObserver)->observe(
+    function() {
+        $manager = new MongoDB\Driver\Manager(STANDALONE);
+        $session = $manager->startSession();
+
+        $query = new MongoDB\Driver\Query([]);
+        $manager->executeQuery(NS, $query, ['session' => $session]);
+        $manager->executeQuery(NS, $query, ['session' => $session]);
+    },
+    function(stdClass $command)
+    {
+        $hasClusterTime = isset($command->{'$clusterTime'});
+        printf("Command includes \$clusterTime: %s\n", ($hasClusterTime ? 'yes' : 'no'));
+    }
+);
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+Command includes $clusterTime: no
+Command includes $clusterTime: no
+===DONE===

tests/causal-consistency/causal-consistency-012.phpt

@@ -0,0 +1,33 @@
+--TEST--
+Causal consistency: $clusterTime is sent in commands to supported deployments
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php NEEDS('REPLICASET'); ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+require_once __DIR__ . "/../utils/observer.php";
+
+(new CommandObserver)->observe(
+    function() {
+        $manager = new MongoDB\Driver\Manager(REPLICASET);
+        $session = $manager->startSession();
+
+        $query = new MongoDB\Driver\Query([]);
+        $manager->executeQuery(NS, $query, ['session' => $session]);
+        $manager->executeQuery(NS, $query, ['session' => $session]);
+    },
+    function(stdClass $command)
+    {
+        $hasClusterTime = isset($command->{'$clusterTime'});
+        printf("Command includes \$clusterTime: %s\n", ($hasClusterTime ? 'yes' : 'no'));
+    }
+);
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+Command includes $clusterTime: yes
+Command includes $clusterTime: yes
+===DONE===