Skip to content

Commit f1a6858

Browse files
committed
[TEST] restored testing against _all type
1 parent 1c60436 commit f1a6858

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

src/test/java/org/elasticsearch/index/query/BaseQueryTestCase.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
2626
import org.elasticsearch.cluster.ClusterService;
2727
import org.elasticsearch.cluster.metadata.IndexMetaData;
28+
import org.elasticsearch.cluster.metadata.MetaData;
2829
import org.elasticsearch.common.compress.CompressedString;
2930
import org.elasticsearch.common.inject.AbstractModule;
3031
import org.elasticsearch.common.inject.Injector;
@@ -151,14 +152,11 @@ public void beforeTest() {
151152
types[i] = randomFrom(currentTypes);
152153
}
153154
} else {
154-
/* norelease waiting for a fix on master that restores support for _all type
155155
if (randomBoolean()) {
156156
types = new String[]{MetaData.ALL};
157157
} else {
158158
types = new String[0];
159159
}
160-
*/
161-
types = new String[0];
162160
}
163161
//some query (e.g. range query) have a different behaviour depending on whether the current search context is set or not
164162
//which is why we randomly set the search context, which will internally also do QueryParseContext.setTypes(types)

0 commit comments

Comments
 (0)