Permalink
Browse files

Revert "Changing return from `_runTestMethod()`."

This reverts commit 480a74f61eab178e95333e26f540d90f1945a3f8.

This change was interfering with the cancellation of integration test
runs thus causing existing tests to fail.
  • Loading branch information...
1 parent 5e0f613 commit 90cb2ab98b94de815915e0a6e71c167b9a0d8791 @davidpersson davidpersson committed May 20, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 test/Unit.php
View
@@ -685,7 +685,7 @@ protected function _result($type, $info, array $options = array()) {
*
* @param string $method The name of the test method to run.
* @param array $options
- * @return array Results of test runs - so far.
+ * @return mixed
* @filter
*/
protected function _runTestMethod($method, $options) {
@@ -697,7 +697,7 @@ protected function _runTestMethod($method, $options) {
}
$params = compact('options', 'method');
- $this->_filter(__CLASS__ . '::run', $params, function($self, $params, $chain) {
+ $passed = $this->_filter(__CLASS__ . '::run', $params, function($self, $params, $chain) {
try {
$method = $params['method'];
$lineFlag = __LINE__ + 1;
@@ -720,7 +720,7 @@ protected function _runTestMethod($method, $options) {
$this->_expected = array();
$this->tearDown();
- return $this->_results;
+ return $passed;
}
/**

0 comments on commit 90cb2ab

Please sign in to comment.