From 1c4fc580ce1415a28b10af7953643aa839ae16ae Mon Sep 17 00:00:00 2001 From: David Alger <david@classyllama.com> Date: Sat, 27 Feb 2016 22:17:02 -0600 Subject: [PATCH] Moves the `testsuite/Magento/Test/Integrity` tests into main integration test build --- .travis.yml | 1 - dev/tests/integration/phpunit.xml.dist | 1 - dev/travis/script.sh | 4 ---- 3 files changed, 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index cfd01103bf4..3c39ba12b46 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,6 @@ env: - TEST_SUITE=unit - TEST_SUITE=integration INTEGRATION_INDEX=1 INTEGRATION_SETS=2 - TEST_SUITE=integration INTEGRATION_INDEX=2 INTEGRATION_SETS=2 - - TEST_SUITE=integration_integrity - TEST_SUITE=static_phpcs - TEST_SUITE=static_annotation cache: diff --git a/dev/tests/integration/phpunit.xml.dist b/dev/tests/integration/phpunit.xml.dist index ef8df73676a..3934d76c6c1 100644 --- a/dev/tests/integration/phpunit.xml.dist +++ b/dev/tests/integration/phpunit.xml.dist @@ -19,7 +19,6 @@ <testsuite name="Magento Integration Tests"> <directory suffix="Test.php">testsuite</directory> <directory suffix="Test.php">../../../update/dev/tests/integration/testsuite</directory> - <exclude>testsuite/Magento/Test/Integrity</exclude> <exclude>testsuite/Magento/MemoryUsageTest.php</exclude> </testsuite> </testsuites> diff --git a/dev/travis/script.sh b/dev/travis/script.sh index fe02f24425a..7a5c5d5d9c0 100755 --- a/dev/travis/script.sh +++ b/dev/travis/script.sh @@ -15,10 +15,6 @@ case $TEST_SUITE in cd dev/tests/integration phpunit -c phpunit.xml.travis$INTEGRATION_INDEX ;; - integration_integrity) - cd dev/tests/integration - phpunit -c phpunit.xml.dist testsuite/Magento/Test/Integrity - ;; static_phpcs) cd dev/tests/static phpunit -c phpunit.xml.dist --filter 'Magento\\Test\\Php\\LiveCodeTest::testCodeStyle' -- GitLab