diff --git a/.travis.yml b/.travis.yml index a04714efe641b25aae9e4c3f58ea7aa4c9c68b0a..cd0718163a96c3a146e5ff00c815511774ffecea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,8 @@ php: - 5.6 env: - TEST_SUITE=unit - - TEST_SUITE=integrationPart1 - - TEST_SUITE=integrationPart2 + - TEST_SUITE=integration_part_1 + - TEST_SUITE=integration_part_2 - TEST_SUITE=integration_integrity - TEST_SUITE=static_phpcs - TEST_SUITE=static_annotation @@ -33,7 +33,7 @@ before_script: - echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini # Install MySQL 5.6, create DB for integration tests - > - sh -c "if [ '$TEST_SUITE' = 'integrationPart1' ] || [ '$TEST_SUITE' = 'integrationPart2' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then + sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then sudo apt-get remove --purge mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5; sudo apt-get autoremove; sudo apt-get autoclean; @@ -47,14 +47,13 @@ before_script: - echo 'memory_limit = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - phpenv rehash; - composer install --no-interaction --dev - - chmod +x dev/tests/integration/IntegationTestsForTravis.sh script: # Unit tests - sh -c "if [ '$TEST_SUITE' = 'unit' ]; then ./vendor/bin/phpunit -c dev/tests/unit/phpunit.xml.dist; fi" # Integration tests - - sh -c "if [ '$TEST_SUITE' = 'integrationPart1' ] || [ '$TEST_SUITE' = 'integrationPart2' ]; then cd dev/tests/integration/; bash IntegationTestsForTravis.sh 2; fi" - - sh -c "if [ '$TEST_SUITE' = 'integrationPart1' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis1; fi" - - sh -c "if [ '$TEST_SUITE' = 'integrationPart2' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis2; fi" + - sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ]; then cd dev/tests/integration/; bash IntegationTestsForTravis.sh 2; fi" + - sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis1; fi" + - sh -c "if [ '$TEST_SUITE' = 'integration_part_2' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis2; fi" # Integration integrity tests - sh -c "if [ '$TEST_SUITE' = 'integration_integrity' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.dist testsuite/Magento/Test/Integrity; fi" # Static tests [Code Style]