Merge branch 'v1.4' into v1.5

alcaeus · alcaeus · commit 5ef2240d12f3 · 2021-03-04T13:48:54.000+01:00
* v1.4:
  Rename matrix testing exclusion groups
diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
@@ -37,7 +37,7 @@ if [ "$IS_MATRIX_TESTING" == "true" ]; then
          ;;
    esac
 
-   PHPUNIT_OPTS="--dont-report-useless-tests --exclude-group matrix-testing-server-${MONGODB_VERSION_NUMBER}-driver-${DRIVER_MONGODB_VERSION},matrix-testing-server-${MONGODB_VERSION_NUMBER}-driver-${DRIVER_MONGODB_VERSION}-topology-${TOPOLOGY}"
+   PHPUNIT_OPTS="--dont-report-useless-tests --exclude-group matrix-testing-exclude-server-${MONGODB_VERSION_NUMBER}-driver-${DRIVER_MONGODB_VERSION},matrix-testing-exclude-server-${MONGODB_VERSION_NUMBER}-driver-${DRIVER_MONGODB_VERSION}-topology-${TOPOLOGY}"
 
    DIR=$(dirname $0)
    . $DIR/install-dependencies.sh
diff --git a/tests/Collection/CollectionFunctionalTest.php b/tests/Collection/CollectionFunctionalTest.php
@@ -380,10 +380,10 @@ public function testWithOptionsPassesOptions()
     }
 
     /**
-     * @group matrix-testing-server-4.4-driver-4.0
-     * @group matrix-testing-server-4.4-driver-4.2
-     * @group matrix-testing-server-5.0-driver-4.0
-     * @group matrix-testing-server-5.0-driver-4.2
+     * @group matrix-testing-exclude-server-4.4-driver-4.0
+     * @group matrix-testing-exclude-server-4.4-driver-4.2
+     * @group matrix-testing-exclude-server-5.0-driver-4.0
+     * @group matrix-testing-exclude-server-5.0-driver-4.2
      */
     public function testMapReduce()
     {
diff --git a/tests/Collection/CrudSpecFunctionalTest.php b/tests/Collection/CrudSpecFunctionalTest.php
@@ -33,7 +33,7 @@
  *
  * @see https://github.com/mongodb/specifications/tree/master/source/crud/tests
  *
- * @group matrix-testing-server-5.0-driver-4.0
+ * @group matrix-testing-exclude-server-5.0-driver-4.0
  */
 class CrudSpecFunctionalTest extends FunctionalTestCase
 {
diff --git a/tests/Database/DatabaseFunctionalTest.php b/tests/Database/DatabaseFunctionalTest.php
@@ -157,9 +157,9 @@ public function testGetSelectsCollectionAndInheritsOptions()
     }
 
     /**
-     * @group matrix-testing-server-4.2-driver-4.0-topology-sharded_cluster
-     * @group matrix-testing-server-4.4-driver-4.0-topology-sharded_cluster
-     * @group matrix-testing-server-5.0-driver-4.0-topology-sharded_cluster
+     * @group matrix-testing-exclude-server-4.2-driver-4.0-topology-sharded_cluster
+     * @group matrix-testing-exclude-server-4.4-driver-4.0-topology-sharded_cluster
+     * @group matrix-testing-exclude-server-5.0-driver-4.0-topology-sharded_cluster
      */
     public function testModifyCollection()
     {
diff --git a/tests/DocumentationExamplesTest.php b/tests/DocumentationExamplesTest.php
@@ -931,7 +931,7 @@ public function testExample_55_58()
         $this->assertInventoryCount(0);
     }
 
-    /** @group matrix-testing-server-5.0-driver-4.0-topology-sharded_cluster */
+    /** @group matrix-testing-exclude-server-5.0-driver-4.0-topology-sharded_cluster */
     public function testChangeStreamExample_1_4()
     {
         $this->skipIfChangeStreamIsNotSupported();
diff --git a/tests/Model/IndexInfoFunctionalTest.php b/tests/Model/IndexInfoFunctionalTest.php
@@ -48,8 +48,8 @@ public function testIs2dSphere()
     }
 
     /**
-     * @group matrix-testing-server-5.0-driver-4.0
-     * @group matrix-testing-server-5.0-driver-4.2
+     * @group matrix-testing-exclude-server-5.0-driver-4.0
+     * @group matrix-testing-exclude-server-5.0-driver-4.2
      */
     public function testIsGeoHaystack()
     {
diff --git a/tests/Operation/ListCollectionsFunctionalTest.php b/tests/Operation/ListCollectionsFunctionalTest.php
@@ -37,10 +37,10 @@ public function testListCollectionsForNewlyCreatedDatabase()
     }
 
     /**
-     * @group matrix-testing-server-4.4-driver-4.0
-     * @group matrix-testing-server-4.4-driver-4.2
-     * @group matrix-testing-server-5.0-driver-4.0
-     * @group matrix-testing-server-5.0-driver-4.2
+     * @group matrix-testing-exclude-server-4.4-driver-4.0
+     * @group matrix-testing-exclude-server-4.4-driver-4.2
+     * @group matrix-testing-exclude-server-5.0-driver-4.0
+     * @group matrix-testing-exclude-server-5.0-driver-4.2
      */
     public function testIdIndexAndInfo()
     {
diff --git a/tests/Operation/MapReduceFunctionalTest.php b/tests/Operation/MapReduceFunctionalTest.php
@@ -13,10 +13,10 @@
 use function version_compare;
 
 /**
- * @group matrix-testing-server-4.4-driver-4.0
- * @group matrix-testing-server-4.4-driver-4.2
- * @group matrix-testing-server-5.0-driver-4.0
- * @group matrix-testing-server-5.0-driver-4.2
+ * @group matrix-testing-exclude-server-4.4-driver-4.0
+ * @group matrix-testing-exclude-server-4.4-driver-4.2
+ * @group matrix-testing-exclude-server-5.0-driver-4.0
+ * @group matrix-testing-exclude-server-5.0-driver-4.2
  */
 class MapReduceFunctionalTest extends FunctionalTestCase
 {
diff --git a/tests/Operation/ModifyCollectionFunctionalTest.php b/tests/Operation/ModifyCollectionFunctionalTest.php
@@ -9,9 +9,9 @@
 class ModifyCollectionFunctionalTest extends FunctionalTestCase
 {
     /**
-     * @group matrix-testing-server-4.2-driver-4.0-topology-sharded_cluster
-     * @group matrix-testing-server-4.4-driver-4.0-topology-sharded_cluster
-     * @group matrix-testing-server-5.0-driver-4.0-topology-sharded_cluster
+     * @group matrix-testing-exclude-server-4.2-driver-4.0-topology-sharded_cluster
+     * @group matrix-testing-exclude-server-4.4-driver-4.0-topology-sharded_cluster
+     * @group matrix-testing-exclude-server-5.0-driver-4.0-topology-sharded_cluster
      */
     public function testCollMod()
     {
diff --git a/tests/Operation/WatchFunctionalTest.php b/tests/Operation/WatchFunctionalTest.php
@@ -31,9 +31,9 @@
 use function version_compare;
 
 /**
- * @group matrix-testing-server-4.2-driver-4.0-topology-sharded_cluster
- * @group matrix-testing-server-4.4-driver-4.0-topology-sharded_cluster
- * @group matrix-testing-server-5.0-driver-4.0-topology-sharded_cluster
+ * @group matrix-testing-exclude-server-4.2-driver-4.0-topology-sharded_cluster
+ * @group matrix-testing-exclude-server-4.4-driver-4.0-topology-sharded_cluster
+ * @group matrix-testing-exclude-server-5.0-driver-4.0-topology-sharded_cluster
  */
 class WatchFunctionalTest extends FunctionalTestCase
 {
diff --git a/tests/SpecTests/RetryableReadsSpecTest.php b/tests/SpecTests/RetryableReadsSpecTest.php
@@ -42,8 +42,8 @@ public static function assertCommandMatches(stdClass $expected, stdClass $actual
      * Execute an individual test case from the specification.
      *
      * @dataProvider provideTests
-     * @group matrix-testing-server-4.4-driver-4.2
-     * @group matrix-testing-server-5.0-driver-4.2
+     * @group matrix-testing-exclude-server-4.4-driver-4.2
+     * @group matrix-testing-exclude-server-5.0-driver-4.2
      *
      * @param stdClass     $test           Individual "tests[]" document
      * @param array        $runOn          Top-level "runOn" array with server requirements

Original file line number	Diff line number	Diff line change
`@@ -380,10 +380,10 @@ public function testWithOptionsPassesOptions()`
`380`	`380`	`}`
`381`	`381`
`382`	`382`	`/**`
`383`		`- * @group matrix-testing-server-4.4-driver-4.0`
`384`		`- * @group matrix-testing-server-4.4-driver-4.2`
`385`		`- * @group matrix-testing-server-5.0-driver-4.0`
`386`		`- * @group matrix-testing-server-5.0-driver-4.2`
	`383`	`+ * @group matrix-testing-exclude-server-4.4-driver-4.0`
	`384`	`+ * @group matrix-testing-exclude-server-4.4-driver-4.2`
	`385`	`+ * @group matrix-testing-exclude-server-5.0-driver-4.0`
	`386`	`+ * @group matrix-testing-exclude-server-5.0-driver-4.2`
`387`	`387`	`*/`
`388`	`388`	`public function testMapReduce()`
`389`	`389`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`*`
`34`	`34`	`* @see https://github.com/mongodb/specifications/tree/master/source/crud/tests`
`35`	`35`	`*`
`36`		`- * @group matrix-testing-server-5.0-driver-4.0`
	`36`	`+ * @group matrix-testing-exclude-server-5.0-driver-4.0`
`37`	`37`	`*/`
`38`	`38`	`class CrudSpecFunctionalTest extends FunctionalTestCase`
`39`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -157,9 +157,9 @@ public function testGetSelectsCollectionAndInheritsOptions()`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`/**`
`160`		`- * @group matrix-testing-server-4.2-driver-4.0-topology-sharded_cluster`
`161`		`- * @group matrix-testing-server-4.4-driver-4.0-topology-sharded_cluster`
`162`		`- * @group matrix-testing-server-5.0-driver-4.0-topology-sharded_cluster`
	`160`	`+ * @group matrix-testing-exclude-server-4.2-driver-4.0-topology-sharded_cluster`
	`161`	`+ * @group matrix-testing-exclude-server-4.4-driver-4.0-topology-sharded_cluster`
	`162`	`+ * @group matrix-testing-exclude-server-5.0-driver-4.0-topology-sharded_cluster`
`163`	`163`	`*/`
`164`	`164`	`public function testModifyCollection()`
`165`	`165`	`{`
Original file line number	Diff line number	Diff line change
`@@ -931,7 +931,7 @@ public function testExample_55_58()`
`931`	`931`	`$this->assertInventoryCount(0);`
`932`	`932`	`}`
`933`	`933`
`934`		`- /** @group matrix-testing-server-5.0-driver-4.0-topology-sharded_cluster */`
	`934`	`+ /** @group matrix-testing-exclude-server-5.0-driver-4.0-topology-sharded_cluster */`
`935`	`935`	`public function testChangeStreamExample_1_4()`
`936`	`936`	`{`
`937`	`937`	`$this->skipIfChangeStreamIsNotSupported();`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,8 @@ public function testIs2dSphere()`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/**`
`51`		`- * @group matrix-testing-server-5.0-driver-4.0`
`52`		`- * @group matrix-testing-server-5.0-driver-4.2`
	`51`	`+ * @group matrix-testing-exclude-server-5.0-driver-4.0`
	`52`	`+ * @group matrix-testing-exclude-server-5.0-driver-4.2`
`53`	`53`	`*/`
`54`	`54`	`public function testIsGeoHaystack()`
`55`	`55`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,10 @@ public function testListCollectionsForNewlyCreatedDatabase()`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`/**`
`40`		`- * @group matrix-testing-server-4.4-driver-4.0`
`41`		`- * @group matrix-testing-server-4.4-driver-4.2`
`42`		`- * @group matrix-testing-server-5.0-driver-4.0`
`43`		`- * @group matrix-testing-server-5.0-driver-4.2`
	`40`	`+ * @group matrix-testing-exclude-server-4.4-driver-4.0`
	`41`	`+ * @group matrix-testing-exclude-server-4.4-driver-4.2`
	`42`	`+ * @group matrix-testing-exclude-server-5.0-driver-4.0`
	`43`	`+ * @group matrix-testing-exclude-server-5.0-driver-4.2`
`44`	`44`	`*/`
`45`	`45`	`public function testIdIndexAndInfo()`
`46`	`46`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@`
`9`	`9`	`class ModifyCollectionFunctionalTest extends FunctionalTestCase`
`10`	`10`	`{`
`11`	`11`	`/**`
`12`		`- * @group matrix-testing-server-4.2-driver-4.0-topology-sharded_cluster`
`13`		`- * @group matrix-testing-server-4.4-driver-4.0-topology-sharded_cluster`
`14`		`- * @group matrix-testing-server-5.0-driver-4.0-topology-sharded_cluster`
	`12`	`+ * @group matrix-testing-exclude-server-4.2-driver-4.0-topology-sharded_cluster`
	`13`	`+ * @group matrix-testing-exclude-server-4.4-driver-4.0-topology-sharded_cluster`
	`14`	`+ * @group matrix-testing-exclude-server-5.0-driver-4.0-topology-sharded_cluster`
`15`	`15`	`*/`
`16`	`16`	`public function testCollMod()`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ public static function assertCommandMatches(stdClass $expected, stdClass $actual`
`42`	`42`	`* Execute an individual test case from the specification.`
`43`	`43`	`*`
`44`	`44`	`* @dataProvider provideTests`
`45`		`- * @group matrix-testing-server-4.4-driver-4.2`
`46`		`- * @group matrix-testing-server-5.0-driver-4.2`
	`45`	`+ * @group matrix-testing-exclude-server-4.4-driver-4.2`
	`46`	`+ * @group matrix-testing-exclude-server-5.0-driver-4.2`
`47`	`47`	`*`
`48`	`48`	`* @param stdClass $test Individual "tests[]" document`
`49`	`49`	`* @param array $runOn Top-level "runOn" array with server requirements`