Merge pull request #72 from liquidweb/fix/cli-test-init

Rename CLITest::init() to CLITest::init_cli() to avoid conflicting with WP_HTTP_TestCase::init()
liquidweb · Sep 11, 2018 · 35b834a · 35b834a
2 parents f4b8db5 + 76a90ff
commit 35b834a
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 27 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -28,6 +28,16 @@
 				@link https://github.com/woocommerce/woocommerce/pull/18493
 			-->
 			<exclude>./vendor/woocommerce/woocommerce/tests/unit-tests/api/system-status.php</exclude>
+			<exclude>./vendor/woocommerce/woocommerce/tests/unit-tests/api/v2/system-status.php</exclude>
+
+			<!--
+				Combinations of PHP < 7.2 and WooCommerce < 3.4 are failing due to the
+				WC_Tests_Product_CSV_Importer::test_import() test, which relies on an external HTTP
+				request that's failing.
+
+				@link https://github.com/woocommerce/woocommerce/commit/0e785d46146c04f05d4ed5bc06e9ea2d575553b0
+			-->
+			<exclude>./vendor/woocommerce/woocommerce/tests/unit-tests/importer/product.php</exclude>
 		</testsuite>
 	</testsuites>
 	<filter>

diff --git a/tests/test-cli.php b/tests/test-cli.php
@@ -18,7 +18,7 @@ class CLITest extends TestCase {
 	/**
 	 * @before
 	 */
-	public function init() {
+	public function init_cli() {
 		$this->cli = new WooCommerce_Custom_Orders_Table_CLI();
 	}