Merge branch 'v1.6' into v1.7

jmikola · jmikola · commit 79e6f2487918 · 2020-09-08T12:40:04.000-04:00
diff --git a/tests/Database/DatabaseFunctionalTest.php b/tests/Database/DatabaseFunctionalTest.php
@@ -102,7 +102,7 @@ public function testCommand()
 
     public function testCommandDoesNotInheritReadPreference()
     {
-        if ($this->isReplicaSet()) {
+        if (! $this->isReplicaSet()) {
             $this->markTestSkipped('Test only applies to replica sets');
         }
 
diff --git a/tests/FunctionalTestCase.php b/tests/FunctionalTestCase.php
@@ -303,7 +303,7 @@ protected function getServerStorageEngine(ReadPreference $readPreference = null)
 
     protected function isReplicaSet()
     {
-        return $this->getPrimaryServer()->getType() !== Server::TYPE_RS_PRIMARY;
+        return $this->getPrimaryServer()->getType() == Server::TYPE_RS_PRIMARY;
     }
 
     protected function isShardedCluster()

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public function testCommand()`
`102`	`102`
`103`	`103`	`public function testCommandDoesNotInheritReadPreference()`
`104`	`104`	`{`
`105`		`- if ($this->isReplicaSet()) {`
	`105`	`+ if (! $this->isReplicaSet()) {`
`106`	`106`	`$this->markTestSkipped('Test only applies to replica sets');`
`107`	`107`	`}`
`108`	`108`
Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ protected function getServerStorageEngine(ReadPreference $readPreference = null)`
`303`	`303`
`304`	`304`	`protected function isReplicaSet()`
`305`	`305`	`{`
`306`		`- return $this->getPrimaryServer()->getType() !== Server::TYPE_RS_PRIMARY;`
	`306`	`+ return $this->getPrimaryServer()->getType() == Server::TYPE_RS_PRIMARY;`
`307`	`307`	`}`
`308`	`308`
`309`	`309`	`protected function isShardedCluster()`