Changeset 40564 for trunk/tests/phpunit/tests/option/networkOption.php

Timestamp:

05/01/2017 08:34:10 PM (8 years ago)

Author:

johnbillion

Message:

Build/Test Tools: Automatically skip tests in the ms-required and ms-excluded groups.

This removes the need to manually call $this->skipWithMultisite() and $this->skipWithoutMultisite() from within the test when the test only runs without Multisite or only runs on Multisite, respectively.

Props jdgrimes for the suggestion.

Fixes #40531

File:

• trunk/tests/phpunit/tests/option/networkOption.php (modified) (5 diffs)

trunk/tests/phpunit/tests/option/networkOption.php

@@ -17 +17 @@
      */
     function test_add_network_option_not_available_on_other_network() {
-        $this->skipWithoutMultisite();
-
         $id = self::factory()->network->create();
         $option = __FUNCTION__;
@@ -31 +29 @@
      */
     function test_add_network_option_available_on_same_network() {
-        $this->skipWithoutMultisite();
-
         $id = self::factory()->network->create();
         $option = __FUNCTION__;
@@ -45 +41 @@
      */
     function test_delete_network_option_on_only_one_network() {
-        $this->skipWithoutMultisite();
-
         $id = self::factory()->network->create();
         $option = __FUNCTION__;
@@ -62 +56 @@
      */
     public function test_add_network_option_is_not_stored_as_autoload_option() {
-        $this->skipWithMultisite();
-
         $key = __FUNCTION__;
 
@@ -78 +70 @@
      */
     public function test_update_network_option_is_not_stored_as_autoload_option() {
-        $this->skipWithMultisite();
-
         $key = __FUNCTION__;