Merge branch 'v1.6' into v1.7

jmikola · jmikola · commit 9621848cca0d · 2020-09-08T13:20:51.000-04:00
diff --git a/tests/SpecTests/TransactionsSpecTest.php b/tests/SpecTests/TransactionsSpecTest.php
@@ -130,10 +130,6 @@ public function testTransactions(stdClass $test, array $runOn = null, array $dat
             $this->markTestIncomplete(self::$incompleteTests[$this->dataDescription()]);
         }
 
-        if (isset($test->skipReason)) {
-            $this->markTestSkipped($test->skipReason);
-        }
-
         $useMultipleMongoses = isset($test->useMultipleMongoses) && $test->useMultipleMongoses && $this->isShardedCluster();
 
         if (isset($runOn)) {

Original file line number	Diff line number	Diff line change
`@@ -130,10 +130,6 @@ public function testTransactions(stdClass $test, array $runOn = null, array $dat`
`130`	`130`	`$this->markTestIncomplete(self::$incompleteTests[$this->dataDescription()]);`
`131`	`131`	`}`
`132`	`132`
`133`		`- if (isset($test->skipReason)) {`
`134`		`- $this->markTestSkipped($test->skipReason);`
`135`		`- }`
`136`		`-`
`137`	`133`	`$useMultipleMongoses = isset($test->useMultipleMongoses) && $test->useMultipleMongoses && $this->isShardedCluster();`
`138`	`134`
`139`	`135`	`if (isset($runOn)) {`