minor #13144 No global state for isolated tests and other fixes (nicolas-grekas)

fabpot · fabpot · commit 459b8b6f92ba · 2014-12-29T11:01:53.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- No global state for isolated tests and other fixes | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - By default, phpunit preserves global state for isolated processes. This made the tests break on my laptop. Other tweaks included. In branch 2.5, `src/Symfony/Component/Security/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php` also misses the `@preserveGlobalState disabled` annotation. Please add it when merging Commits ------- 750f3a6 No global state for isolated tests and other fixes
diff --git a/.travis.yml b/.travis.yml
@@ -38,7 +38,7 @@ install:
     - if [ "$components" = "no" ]; then COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install; fi;
 
 script:
-    - if [ "$components" = "no" ]; then ls -d src/Symfony/*/* | parallel --gnu --keep-order 'echo "Running {} tests"; phpunit --exclude-group tty,benchmark,intl-data {};'; fi;
-    - if [ "$components" = "no" ]; then echo "Running tests requiring tty"; phpunit --group tty; fi;
-    - if [ "$components" = "high" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order 'echo "Running {} tests"; cd {}; COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install; phpunit --exclude-group tty,benchmark,intl-data;'; fi;
-    - if [ "$components" = "low" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j50% 'echo "Running {} tests"; cd {}; COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev --prefer-lowest --prefer-stable update; phpunit --exclude-group tty,benchmark,intl-data;'; fi;
+    - if [ "$components" = "no" ]; then ls -d src/Symfony/*/* | parallel --gnu --keep-order 'echo -e "\\nRunning {} tests"; phpunit --exclude-group tty,benchmark,intl-data {} || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
+    - if [ "$components" = "no" ]; then echo -e "\\nRunning tests requiring tty"; phpunit --group tty || (echo -e "\\e[41mKO\\e[0m tty group" && $(exit 1)); fi;
+    - if [ "$components" = "high" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
+    - if [ "$components" = "low" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev --prefer-lowest --prefer-stable update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
diff --git a/composer.json b/composer.json
@@ -17,8 +17,8 @@
     ],
     "require": {
         "php": ">=5.3.3",
-        "doctrine/common": "~2.2",
-        "twig/twig": "~1.12",
+        "doctrine/common": "~2.3",
+        "twig/twig": "~1.12,>=1.12.3",
         "psr/log": "~1.0"
     },
     "replace": {
diff --git a/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/DefaultCsrfProviderTest.php b/src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/DefaultCsrfProviderTest.php
@@ -15,6 +15,7 @@
 
 /**
  * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
  */
 class DefaultCsrfProviderTest extends \PHPUnit_Framework_TestCase
 {
@@ -24,6 +25,7 @@ public static function setUpBeforeClass()
     {
         ini_set('session.save_handler', 'files');
         ini_set('session.save_path', sys_get_temp_dir());
+        ini_set('error_reporting', -1 & ~E_USER_DEPRECATED);
     }
 
     protected function setUp()
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
@@ -20,6 +20,7 @@
  * @author Drak <drak@zikula.org>
  *
  * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
  */
 class NativeFileSessionHandlerTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeSessionHandlerTest.php
@@ -19,6 +19,7 @@
  * @author Drak <drak@zikula.org>
  *
  * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
  */
 class NativeSessionHandlerTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NullSessionHandlerTest.php
@@ -21,6 +21,7 @@
  * @author Drak <drak@zikula.org>
  *
  * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
  */
 class NullSessionHandlerTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
@@ -27,6 +27,7 @@
  * These tests require separate processes.
  *
  * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
  */
 class NativeSessionStorageTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
@@ -22,6 +22,7 @@
  * These tests require separate processes.
  *
  * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
  */
 class PhpBridgeSessionStorageTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
@@ -96,6 +96,7 @@ public function testIsActivePhp53()
 
     /**
      * @runInSeparateProcess
+     * @preserveGlobalState disabled
      */
     public function testIsActivePhp54()
     {
@@ -122,6 +123,7 @@ public function testSetActivePhp53()
 
     /**
      * @runInSeparateProcess
+     * @preserveGlobalState disabled
      * @expectedException \LogicException
      */
     public function testSetActivePhp54()
@@ -135,6 +137,7 @@ public function testSetActivePhp54()
 
     /**
      * @runInSeparateProcess
+     * @preserveGlobalState disabled
      */
     public function testName()
     {
@@ -159,6 +162,7 @@ public function testNameExceptionPhp53()
 
     /**
      * @runInSeparateProcess
+     * @preserveGlobalState disabled
      * @expectedException \LogicException
      */
     public function testNameExceptionPhp54()
@@ -173,6 +177,7 @@ public function testNameExceptionPhp54()
 
     /**
      * @runInSeparateProcess
+     * @preserveGlobalState disabled
      */
     public function testId()
     {
@@ -197,6 +202,7 @@ public function testIdExceptionPhp53()
 
     /**
      * @runInSeparateProcess
+     * @preserveGlobalState disabled
      * @expectedException \LogicException
      */
     public function testIdExceptionPhp54()
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
@@ -19,6 +19,7 @@
  * @author Drak <drak@zikula.org>
  *
  * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
  */
 class SessionHandlerProxyTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/src/Symfony/Component/Intl/Tests/DateFormatter/Verification/IntlDateFormatterTest.php b/src/Symfony/Component/Intl/Tests/DateFormatter/Verification/IntlDateFormatterTest.php
@@ -36,6 +36,7 @@ protected function setUp()
      * time zone, this test would use it too if not running in a separated process.
      *
      * @runInSeparateProcess
+     * @preserveGlobalState disabled
      */
     public function testFormatWithTimezoneFromEnvironmentVariable()
     {
diff --git a/src/Symfony/Component/Locale/composer.json b/src/Symfony/Component/Locale/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=5.3.3",
-        "symfony/intl": ">=2.3"
+        "symfony/intl": "~2.3"
     },
     "autoload": {
         "psr-0": { "Symfony\\Component\\Locale\\": "" }

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`
`16`	`16`	`/**`
`17`	`17`	`* @runTestsInSeparateProcesses`
	`18`	`+ * @preserveGlobalState disabled`
`18`	`19`	`*/`
`19`	`20`	`class DefaultCsrfProviderTest extends \PHPUnit_Framework_TestCase`
`20`	`21`	`{`
`@@ -24,6 +25,7 @@ public static function setUpBeforeClass()`
`24`	`25`	`{`
`25`	`26`	`ini_set('session.save_handler', 'files');`
`26`	`27`	`ini_set('session.save_path', sys_get_temp_dir());`
	`28`	`+ ini_set('error_reporting', -1 & ~E_USER_DEPRECATED);`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`protected function setUp()`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`* @author Drak <drak@zikula.org>`
`21`	`21`	`*`
`22`	`22`	`* @runTestsInSeparateProcesses`
	`23`	`+ * @preserveGlobalState disabled`
`23`	`24`	`*/`
`24`	`25`	`class NativeFileSessionHandlerTest extends \PHPUnit_Framework_TestCase`
`25`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`* @author Drak <drak@zikula.org>`
`20`	`20`	`*`
`21`	`21`	`* @runTestsInSeparateProcesses`
	`22`	`+ * @preserveGlobalState disabled`
`22`	`23`	`*/`
`23`	`24`	`class NativeSessionHandlerTest extends \PHPUnit_Framework_TestCase`
`24`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`* @author Drak <drak@zikula.org>`
`22`	`22`	`*`
`23`	`23`	`* @runTestsInSeparateProcesses`
	`24`	`+ * @preserveGlobalState disabled`
`24`	`25`	`*/`
`25`	`26`	`class NullSessionHandlerTest extends \PHPUnit_Framework_TestCase`
`26`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`* These tests require separate processes.`
`28`	`28`	`*`
`29`	`29`	`* @runTestsInSeparateProcesses`
	`30`	`+ * @preserveGlobalState disabled`
`30`	`31`	`*/`
`31`	`32`	`class NativeSessionStorageTest extends \PHPUnit_Framework_TestCase`
`32`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`* These tests require separate processes.`
`23`	`23`	`*`
`24`	`24`	`* @runTestsInSeparateProcesses`
	`25`	`+ * @preserveGlobalState disabled`
`25`	`26`	`*/`
`26`	`27`	`class PhpBridgeSessionStorageTest extends \PHPUnit_Framework_TestCase`
`27`	`28`	`{`