HSEARCH-2434 Make the tests work with the new behavior of ES with res…

…pect to cluster status "yellow" is now the color of a fully-started cluster with no replica, so we'd better use that in test (where we don't have replicas).
hibernate · Mar 21, 2017 · d3339e7 · d3339e7
1 parent d1f5d38
commit d3339e7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/backends/jgroups/src/test/resources/hibernate.properties b/backends/jgroups/src/test/resources/hibernate.properties
@@ -21,6 +21,6 @@ hibernate.max_fetch_depth 5
 hibernate.cache.region_prefix hibernate.test
 hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider
 
-hibernate.search.default.elasticsearch.host http://127.0.0.1:9200
+hibernate.search.default.elasticsearch.required_index_status YELLOW
 hibernate.search.default.elasticsearch.index_schema_management_strategy RECREATE_DELETE
 hibernate.search.default.elasticsearch.refresh_after_write true
diff --git a/elasticsearch/src/test/resources/hibernate.properties b/elasticsearch/src/test/resources/hibernate.properties
@@ -29,5 +29,6 @@ hibernate.cache.region_prefix hibernate.test
 hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider
 
 hibernate.search.default.indexmanager elasticsearch
+hibernate.search.default.elasticsearch.required_index_status YELLOW
 hibernate.search.default.elasticsearch.index_schema_management_strategy RECREATE_DELETE
 hibernate.search.default.elasticsearch.refresh_after_write true
diff --git a/elasticsearch/src/test/resources/test-defaults.properties b/elasticsearch/src/test/resources/test-defaults.properties
@@ -12,5 +12,6 @@
 # tests.
 
 hibernate.search.default.indexmanager elasticsearch
+hibernate.search.default.elasticsearch.required_index_status YELLOW
 hibernate.search.default.elasticsearch.index_schema_management_strategy RECREATE_DELETE
 hibernate.search.default.elasticsearch.refresh_after_write true
diff --git a/...ernate/search/test/integration/elasticsearch/ElasticsearchModuleMemberRegistrationIT.java b/...ernate/search/test/integration/elasticsearch/ElasticsearchModuleMemberRegistrationIT.java
@@ -86,6 +86,7 @@ private static Asset persistenceXml() {
 					.createProperty().name( "hibernate.search.default." + ElasticsearchEnvironment.INDEX_SCHEMA_MANAGEMENT_STRATEGY )
 						.value( IndexSchemaManagementStrategy.RECREATE_DELETE.name() ).up()
 					.createProperty().name( "jboss.as.jpa.providerModule" ).value( getHibernateORMModuleName() ).up()
+					.createProperty().name( "hibernate.search.default.elasticsearch.required_index_status" ).value( "YELLOW" ).up()
 					.createProperty().name( "hibernate.search.default.elasticsearch.refresh_after_write" ).value( "true" ).up()
 				.up().up()
 			.exportAsString();