Get shield integ tests working. Watcher still has assembly issues

Original commit: elastic/x-pack-elasticsearch@68d221d776
This commit is contained in:
Robert Muir 2015-07-14 09:45:06 -04:00
parent cef77541a4
commit 3b63e22dce
2 changed files with 3 additions and 1 deletions

View File

@ -18,6 +18,8 @@
<properties>
<xplugins.basedir>${project.parent.basedir}</xplugins.basedir>
<tests.rest.blacklist>indices.get/10_basic/*allow_no_indices*,cat.count/10_basic/Test cat count output,cat.aliases/10_basic/Empty cluster,indices.segments/10_basic/no segments test,indices.clear_cache/10_basic/clear_cache test,indices.status/10_basic/Indices status test,cat.indices/10_basic/Test cat indices output,cat.recovery/10_basic/Test cat recovery output,cat.shards/10_basic/Test cat shards output,termvector/20_issue7121/*,index/10_with_id/Index with ID,indices.get_alias/20_emtpy/*,cat.segments/10_basic/Test cat segments output,indices.put_settings/10_basic/Test indices settings allow_no_indices,indices.put_settings/10_basic/Test indices settings ignore_unavailable,indices.refresh/10_basic/Indices refresh test no-match wildcard,indices.stats/10_index/Index - star*,indices.recovery/10_basic/Indices recovery test*,template/30_render_search_template/*</tests.rest.blacklist>
<!-- TODO: refactor -->
<elasticsearch.integ.antfile>${basedir}/dev-tools/integration-tests.xml</elasticsearch.integ.antfile>
</properties>
<dependencies>

View File

@ -17,7 +17,7 @@
<properties>
<xplugins.basedir>${project.parent.basedir}</xplugins.basedir>
<!--<elasticsearch.integ.antfile>dev-tools/integration-tests.xml</elasticsearch.integ.antfile>-->
<elasticsearch.integ.antfile>dev-tools/integration-tests.xml</elasticsearch.integ.antfile>
<tests.rest.load_packaged>false</tests.rest.load_packaged>
<tests.timewarp>true</tests.timewarp>
</properties>