Merge pull request #659

Author: alcaeus

mongo-orchestration/sharded_clusters/cluster_replset.json

@@ -50,7 +50,11 @@
                         "journal": true,
                         "logappend": true,
                         "port": 4400,
-                        "bind_ip_all": true
+                        "bind_ip_all": true,
+                        "setParameter":  {
+                            "periodicNoopIntervalSecs":  1,
+                            "writePeriodicNoops":  true
+                        }
                     } },
                     { "procParams": {
                         "dbpath": "/tmp/SHARDED-RS/SHARD1/4401",
@@ -59,7 +63,11 @@
                         "journal": true,
                         "logappend": true,
                         "port": 4401,
-                        "bind_ip_all": true
+                        "bind_ip_all": true,
+                        "setParameter":  {
+                            "periodicNoopIntervalSecs":  1,
+                            "writePeriodicNoops":  true
+                        }
                     } }
                 ]
             }
@@ -76,7 +84,11 @@
                         "journal": true,
                         "logappend": true,
                         "port": 4410,
-                        "bind_ip_all": true
+                        "bind_ip_all": true,
+                        "setParameter":  {
+                            "periodicNoopIntervalSecs":  1,
+                            "writePeriodicNoops":  true
+                        }
                     } },
                     { "procParams": {
                         "dbpath": "/tmp/SHARDED-RS/SHARD2/4411",
@@ -85,7 +97,11 @@
                         "journal": true,
                         "logappend": true,
                         "port": 4411,
-                        "bind_ip_all": true
+                        "bind_ip_all": true,
+                        "setParameter":  {
+                            "periodicNoopIntervalSecs":  1,
+                            "writePeriodicNoops":  true
+                        }
                     } }
                 ]
             }

tests/DocumentationExamplesTest.php

@@ -935,6 +935,10 @@ public function testChangeStreamExample_1_4()
     {
         $this->skipIfChangeStreamIsNotSupported();
 
+        if ($this->isShardedCluster()) {
+            $this->markTestSkipped('Test does not apply on sharded clusters: need more than a single getMore call on the change stream.');
+        }
+
         $db = new Database($this->manager, $this->getDatabaseName());
         $db->dropCollection('inventory');
         $db->createCollection('inventory');

tests/FunctionalTestCase.php

@@ -336,9 +336,6 @@ protected function skipIfChangeStreamIsNotSupported()
                 if (! $this->isShardedClusterUsingReplicasets()) {
                     $this->markTestSkipped('$changeStream is only supported with replicasets');
                 }
-
-                // Temporarily skip tests because of an issue with change streams in the driver
-                $this->markTestSkipped('$changeStreams currently don\'t on replica sets');
                 break;
 
             case Server::TYPE_RS_PRIMARY: