Skip to content

Commit 1dc4195

Browse files
committed
Skip benchmark tests
1 parent f82ffd1 commit 1dc4195

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,4 @@ tmp:
184184
make elastica-image
185185
make setup
186186
mkdir -p build
187-
docker-compose run elastica phpunit -c test/ test/lib/Elastica/Test/Transport/
187+
docker-compose run elastica phpunit -c test/ test/lib/Elastica/Test/ClientTest.php

lib/Elastica/Response.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ public function getError()
8181
$message = '';
8282
$response = $this->getData();
8383

84-
if (isset($response['error']['type'])) {
85-
$message = $response['error']['type'];
84+
if (isset($response['error'])) {
85+
$message = $response['error'];
8686
}
8787

8888
// Encoding needed as much more information inside now

test/lib/Elastica/Test/Bulk/ResponseSetTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public function testGetError()
3939
$this->assertInstanceOf('Elastica\\Bulk\\ResponseSet', $responseSet);
4040

4141
$this->assertTrue($responseSet->hasError());
42-
$this->assertNotEquals('AnotherExceptionMessage', $responseSet->getError());
4342
$this->assertEquals('SomeExceptionMessage', $responseSet->getError());
43+
$this->assertNotEquals('AnotherExceptionMessage', $responseSet->getError());
4444

4545
$actionExceptions = $e->getActionExceptions();
4646
$this->assertEquals(2, count($actionExceptions));

test/lib/Elastica/Test/Transport/TransportBenchmarkTest.php

+6
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88

99
class TransportBenchmarkTest extends BaseTest
1010
{
11+
protected function setUp()
12+
{
13+
parent::setUp();
14+
$this->es20("Benchmarks currently skipped with es2.0");
15+
}
16+
1117
protected $_max = 1000;
1218

1319
protected $_maxData = 20;

0 commit comments

Comments
 (0)