honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reenable azure repository tests and remove some randomization in http servers (#48283) 

Relates #47948
Relates #47380
This commit is contained in:
Tanguy Leroux 2019-10-22 11:40:24 +02:00
parent c1f6aff5bb
commit 4790ee4c32
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureBlobStoreRepositoryTests.java
View File

@ -265,10 +265,4 @@ public class AzureBlobStoreRepositoryTests extends ESMockAPIBasedRepositoryInteg
+ (range != null ? " " + range : ""); + (range != null ? " " + range : "");
} }
} }
@Override
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/47948")
public void testIndicesDeletedFromRepository() throws Exception {
}
} }

2
test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java
View File

@ -157,7 +157,7 @@ public abstract class ESMockAPIBasedRepositoryIntegTestCase extends ESBlobStoreR
final boolean canFailRequest = canFailRequest(exchange); final boolean canFailRequest = canFailRequest(exchange);
final int count = requests.computeIfAbsent(requestId, req -> new AtomicInteger(0)).incrementAndGet(); final int count = requests.computeIfAbsent(requestId, req -> new AtomicInteger(0)).incrementAndGet();
if (count >= maxErrorsPerRequest || canFailRequest == false || randomBoolean()) { if (count >= maxErrorsPerRequest || canFailRequest == false) {
requests.remove(requestId); requests.remove(requestId);
delegate.handle(exchange); delegate.handle(exchange);
} else { } else {