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

Test: Re-enable upgrade integ tests (elastic/x-pack-elasticsearch#3917) 

This commit removes awaitsfixes for upgrade tests. The fix was
previously made on a branch and did not make it to master until now.

relates elastic/x-pack-elasticsearch#3729

Original commit: elastic/x-pack-elasticsearch@3402bbe78e
This commit is contained in:
Ryan Ernst 2018-02-12 20:46:22 -08:00 committed by GitHub
parent c82fdad41d
commit 19e9afdf10
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugin/upgrade/src/test/java/org/elasticsearch/xpack/upgrade/IndexUpgradeIT.java
View File

@ -30,7 +30,6 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThro
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.core.IsEqual.equalTo;
@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/x-pack-elasticsearch/issues/3729")
public class IndexUpgradeIT extends IndexUpgradeIntegTestCase {
@Before

2
plugin/upgrade/src/test/java/org/elasticsearch/xpack/upgrade/IndexUpgradeIntegTestCase.java
View File

@ -35,7 +35,7 @@ public abstract class IndexUpgradeIntegTestCase extends AbstractLicensesIntegrat
@Override
protected Collection<Class<? extends Plugin>> transportClientPlugins() {
return Collections.singletonList(XPackClientPlugin.class);
return Arrays.asList(XPackClientPlugin.class, ReindexPlugin.class);
}
private static String randomValidLicenseType() {
return randomFrom("trial", "platinum", "gold", "standard", "basic");

1
plugin/upgrade/src/test/java/org/elasticsearch/xpack/upgrade/InternalIndexReindexerIT.java
View File

@ -50,7 +50,6 @@ import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.startsWith;
import static org.hamcrest.core.IsEqual.equalTo;
@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/x-pack-elasticsearch/issues/3729")
public class InternalIndexReindexerIT extends IndexUpgradeIntegTestCase {
@Override