Commit ec7abdfb authored by alexpott's avatar alexpott

Revert "Issue #2376039 by znerol, Wim Leers, alexpott: Undefined property...

Revert "Issue #2376039 by znerol, Wim Leers, alexpott: Undefined property ContainerAwareEventDispatcherTest::results in run-tests.sh"

This reverts commit cbc449b8.
parent 633d8428
...@@ -528,7 +528,7 @@ function simpletest_script_execute_batch($test_classes) { ...@@ -528,7 +528,7 @@ function simpletest_script_execute_batch($test_classes) {
$test_class = array_shift($test_classes); $test_class = array_shift($test_classes);
// Process phpunit tests immediately since they are fast and we don't need // Process phpunit tests immediately since they are fast and we don't need
// to fork for them. // to fork for them.
if (is_subclass_of($test_class, '\PHPUnit_Framework_TestCase')) { if (is_subclass_of($test_class, 'Drupal\Tests\UnitTestCase')) {
$phpunit_status = simpletest_script_run_phpunit($test_id, $test_class); $phpunit_status = simpletest_script_run_phpunit($test_id, $test_class);
if ($phpunit_status > $total_status) { if ($phpunit_status > $total_status) {
$total_status = $phpunit_status; $total_status = $phpunit_status;
...@@ -831,7 +831,7 @@ function simpletest_script_get_test_list() { ...@@ -831,7 +831,7 @@ function simpletest_script_get_test_list() {
else { else {
foreach ($matches[1] as $class_name) { foreach ($matches[1] as $class_name) {
$namespace_class = $namespace . '\\' . $class_name; $namespace_class = $namespace . '\\' . $class_name;
if (is_subclass_of($namespace_class, '\Drupal\simpletest\TestBase') || is_subclass_of($namespace_class, '\PHPUnit_Framework_TestCase')) { if (is_subclass_of($namespace_class, '\Drupal\simpletest\TestBase') || is_subclass_of($namespace_class, '\Drupal\Tests\UnitTestCase')) {
$test_list[] = $namespace_class; $test_list[] = $namespace_class;
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment