Просмотр исходного кода

[TESTS]: fix complete test suite execution (even skipped tearDown() is called)

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@23534 44c647ce-9c0f-0410-b52a-842ac1e357ba
mikaelkael 15 лет назад
Родитель
Сommit
25a2c9aa6d
1 измененных файлов с 4 добавлено и 4 удалено
  1. 4 4
      tests/Zend/Loader/AutoloaderMultiVersionTest.php

+ 4 - 4
tests/Zend/Loader/AutoloaderMultiVersionTest.php

@@ -47,10 +47,6 @@ class Zend_Loader_AutoloaderMultiVersionTest extends PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        if (!constant('TESTS_ZEND_LOADER_AUTOLOADER_MULTIVERSION_ENABLED')) {
-            $this->markTestSkipped();
-        }
-
         // Store original autoloaders
         $this->loaders = spl_autoload_functions();
         if (!is_array($this->loaders)) {
@@ -62,6 +58,10 @@ class Zend_Loader_AutoloaderMultiVersionTest extends PHPUnit_Framework_TestCase
         // Store original include_path
         $this->includePath = get_include_path();
 
+        if (!constant('TESTS_ZEND_LOADER_AUTOLOADER_MULTIVERSION_ENABLED')) {
+            $this->markTestSkipped();
+        }
+
         Zend_Loader_Autoloader::resetInstance();
         $this->path        = constant('TESTS_ZEND_LOADER_AUTOLOADER_MULTIVERSION_PATH');
         $this->latest      = constant('TESTS_ZEND_LOADER_AUTOLOADER_MULTIVERSION_LATEST');