ACP2E-3892: [Mainline] Unpopulated pages are cached due to search engine errors

Author: aplapana

dev/tests/integration/testsuite/Magento/Elasticsearch/ElasticAdapter/SearchAdapter/AdapterTest.php

@@ -7,6 +7,7 @@
 
 namespace Magento\Elasticsearch\ElasticAdapter\SearchAdapter;
 
+use Magento\AdvancedSearch\Model\Client\ClientException;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
@@ -90,9 +91,8 @@ public function testQuery()
         $exception = new \Exception('Test Message');
         $this->loggerMock->expects($this->once())->method('critical')->with($exception);
         $this->clientMock->expects($this->once())->method('query')->willThrowException($exception);
-        $actualResponse = $this->adapter->query($queryRequest);
-        $this->assertEmpty($actualResponse->getAggregations()->getBuckets());
-        $this->assertEquals(0, $actualResponse->count());
+        $this->expectException(ClientException::class);
+        $this->adapter->query($queryRequest);
     }
 
     /**