Merge branch '2.2' into 2.3
* 2.2: Run all tests in parallel. Fixed an entity class name. Conflicts: .travis.yml src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php
This commit is contained in:
commit
453f0d25f7
|
@ -7,6 +7,13 @@ php:
|
||||||
- 5.5
|
- 5.5
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
|
- sudo apt-get install parallel
|
||||||
- echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
|
- echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
|
||||||
- sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
|
- sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
|
||||||
- COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install
|
- COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install
|
||||||
|
- php src/Symfony/Component/Locale/Resources/data/build-data.php
|
||||||
|
- export USE_INTL_ICU_DATA_VERSION=1
|
||||||
|
|
||||||
|
script:
|
||||||
|
- ls -d src/Symfony/*/* | parallel --gnu --keep-order 'echo "Running {} tests"; phpunit --exclude-group tty,benchmark {};' || exit 1
|
||||||
|
- echo "Running tests requiring tty"; phpunit --group tty
|
||||||
|
|
|
@ -11,8 +11,8 @@
|
||||||
|
|
||||||
namespace Symfony\Bridge\Doctrine\Tests\Form\Type;
|
namespace Symfony\Bridge\Doctrine\Tests\Form\Type;
|
||||||
|
|
||||||
use Symfony\Component\Form\Test\FormPerformanceTestCase;
|
use Symfony\Component\Form\Tests\FormPerformanceTestCase;
|
||||||
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIdentEntity;
|
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity;
|
||||||
use Doctrine\ORM\Tools\SchemaTool;
|
use Doctrine\ORM\Tools\SchemaTool;
|
||||||
use Symfony\Bridge\Doctrine\Tests\DoctrineOrmTestCase;
|
use Symfony\Bridge\Doctrine\Tests\DoctrineOrmTestCase;
|
||||||
use Symfony\Component\Form\Extension\Core\CoreExtension;
|
use Symfony\Component\Form\Extension\Core\CoreExtension;
|
||||||
|
@ -23,7 +23,7 @@ use Symfony\Bridge\Doctrine\Form\DoctrineOrmExtension;
|
||||||
*/
|
*/
|
||||||
class EntityTypePerformanceTest extends FormPerformanceTestCase
|
class EntityTypePerformanceTest extends FormPerformanceTestCase
|
||||||
{
|
{
|
||||||
const ENTITY_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIdentEntity';
|
const ENTITY_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var \Doctrine\ORM\EntityManager
|
* @var \Doctrine\ORM\EntityManager
|
||||||
|
|
|
@ -94,6 +94,9 @@ class DialogHelperTest extends \PHPUnit_Framework_TestCase
|
||||||
$this->assertEquals('FooBundle', $dialog->ask($this->getOutputStream(), 'Please select a bundle', 'FrameworkBundle', $bundles));
|
$this->assertEquals('FooBundle', $dialog->ask($this->getOutputStream(), 'Please select a bundle', 'FrameworkBundle', $bundles));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @group tty
|
||||||
|
*/
|
||||||
public function testAskHiddenResponse()
|
public function testAskHiddenResponse()
|
||||||
{
|
{
|
||||||
if (defined('PHP_WINDOWS_VERSION_BUILD')) {
|
if (defined('PHP_WINDOWS_VERSION_BUILD')) {
|
||||||
|
|
Reference in New Issue