TribeIT.testOnConflictDrop test awaits fix until #16299 is resolved

Ali Beyad · Ali Beyad · commit e3816d58aeb8 · 2016-01-28T17:10:04.000-05:00
diff --git a/core/src/test/java/org/elasticsearch/tribe/TribeIT.java b/core/src/test/java/org/elasticsearch/tribe/TribeIT.java
@@ -225,6 +225,7 @@ public void testIndexWriteBlocks() throws Exception {
         }
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/16299")
     public void testOnConflictDrop() throws Exception {
         logger.info("create 2 indices, test1 on t1, and test2 on t2");
         assertAcked(cluster().client().admin().indices().prepareCreate("conflict"));

Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,7 @@ public void testIndexWriteBlocks() throws Exception {`
`225`	`225`	`}`
`226`	`226`	`}`
`227`	`227`
	`228`	`+ @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/16299")`
`228`	`229`	`public void testOnConflictDrop() throws Exception {`
`229`	`230`	`logger.info("create 2 indices, test1 on t1, and test2 on t2");`
`230`	`231`	`assertAcked(cluster().client().admin().indices().prepareCreate("conflict"));`