Skip to content

re-setup tests on elasticsearch client exception #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saimaz merged 1 commit into from
Jan 29, 2015
Merged

re-setup tests on elasticsearch client exception #159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions Test/ElasticsearchTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

namespace ONGR\ElasticsearchBundle\Test;

use Elasticsearch\Common\Exceptions\ElasticsearchException;
use ONGR\ElasticsearchBundle\Client\Connection;
use ONGR\ElasticsearchBundle\ORM\Manager;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
Expand Down Expand Up @@ -43,12 +44,15 @@ public function runTest()
foreach (range(1, $this->getNumberOfRetries()) as $try) {
try {
return parent::runTest();
} catch (\PHPUnit_Framework_SkippedTestError $e) {
throw $e;
} catch (\PHPUnit_Framework_IncompleteTestError $e) {
throw $e;
} catch (\Exception $e) {
// Try more.
if (!($e instanceof ElasticsearchException)) {
throw $e;
}
// If error was from elasticsearch re-setup tests and retry.
if ($try !== $this->getNumberOfRetries()) {
$this->tearDown();
$this->setUp();
}
}
}

Expand Down