Skip to content

Commit d1398a2

Browse files
committed
MAGETWO-38216: Reduce Execution Time of Integration Tests on Travis CI
- CR comments
1 parent b95fe74 commit d1398a2

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

.travis.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ php:
44
- 5.6
55
env:
66
- TEST_SUITE=unit
7-
- TEST_SUITE=integrationPart1
8-
- TEST_SUITE=integrationPart2
7+
- TEST_SUITE=integration_part_1
8+
- TEST_SUITE=integration_part_2
99
- TEST_SUITE=integration_integrity
1010
- TEST_SUITE=static_phpcs
1111
- TEST_SUITE=static_annotation
@@ -33,7 +33,7 @@ before_script:
3333
- echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
3434
# Install MySQL 5.6, create DB for integration tests
3535
- >
36-
sh -c "if [ '$TEST_SUITE' = 'integrationPart1' ] || [ '$TEST_SUITE' = 'integrationPart2' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then
36+
sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then
3737
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;
3838
sudo apt-get autoremove;
3939
sudo apt-get autoclean;
@@ -47,14 +47,13 @@ before_script:
4747
- echo 'memory_limit = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
4848
- phpenv rehash;
4949
- composer install --no-interaction --dev
50-
- chmod +x dev/tests/integration/IntegationTestsForTravis.sh
5150
script:
5251
# Unit tests
5352
- sh -c "if [ '$TEST_SUITE' = 'unit' ]; then ./vendor/bin/phpunit -c dev/tests/unit/phpunit.xml.dist; fi"
5453
# Integration tests
55-
- sh -c "if [ '$TEST_SUITE' = 'integrationPart1' ] || [ '$TEST_SUITE' = 'integrationPart2' ]; then cd dev/tests/integration/; bash IntegationTestsForTravis.sh 2; fi"
56-
- sh -c "if [ '$TEST_SUITE' = 'integrationPart1' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis1; fi"
57-
- sh -c "if [ '$TEST_SUITE' = 'integrationPart2' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis2; fi"
54+
- sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ]; then cd dev/tests/integration/; bash IntegationTestsForTravis.sh 2; fi"
55+
- sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis1; fi"
56+
- sh -c "if [ '$TEST_SUITE' = 'integration_part_2' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis2; fi"
5857
# Integration integrity tests
5958
- sh -c "if [ '$TEST_SUITE' = 'integration_integrity' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.dist testsuite/Magento/Test/Integrity; fi"
6059
# Static tests [Code Style]

0 commit comments

Comments
 (0)