Merge pull request #40 from martinb3/testing_testing

ActionRequestValidationException on deleteIndex() during beforeEach()
bsadeh · Apr 26, 2014 · 636b12f · 636b12f
2 parents e0c4703 + e5c3de4
commit 636b12f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/test/scala/org/elasticsearch/test/integration/gateway/none/RecoverAfterNodesTests.scala b/src/test/scala/org/elasticsearch/test/integration/gateway/none/RecoverAfterNodesTests.scala
@@ -19,6 +19,7 @@ import scalastic.elasticsearch._
     indexer("node2").state(local = Some(true)).getState.blocks().global(ClusterBlockLevel.METADATA) should contain(GatewayService.STATE_NOT_RECOVERED_BLOCK)
     //logger.info("--> start node (3)")
     startNode("node3", settingsBuilder.put("gateway.recover_after_nodes", 3))
+    Thread.sleep(300) // wait a sec for recovery!
     indexer("node1").state(local = Some(true)).getState.blocks().global(ClusterBlockLevel.METADATA).isEmpty should equal (true)
     indexer("node2").state(local = Some(true)).getState.blocks().global(ClusterBlockLevel.METADATA).isEmpty should equal (true)
     indexer("node3").state(local = Some(true)).getState.blocks().global(ClusterBlockLevel.METADATA).isEmpty should equal (true)
@@ -85,6 +86,7 @@ import scalastic.elasticsearch._
       .put("gateway.recover_after_data_nodes", 2)
       .put("node.data", true)
       .put("node.master", false))
+    Thread.sleep(300)
     indexer("master1").state(local = Some(true)).getState.blocks().global(ClusterBlockLevel.METADATA).isEmpty should equal (true)
     indexer("master2").state(local = Some(true)).getState.blocks().global(ClusterBlockLevel.METADATA).isEmpty should equal (true)
     indexer("data1").state(local = Some(true)).getState.blocks().global(ClusterBlockLevel.METADATA).isEmpty should equal (true)

diff --git a/src/test/scala/org/elasticsearch/test/integration/recovery/FullRollingRestartTests.scala b/src/test/scala/org/elasticsearch/test/integration/recovery/FullRollingRestartTests.scala
@@ -20,10 +20,14 @@ class FullRollingRestartTests extends MultiNodesBasedTests {
     for (i <- 0 until 10) {
       indexer("node1").count().getCount should equal (2000)
     }
+    Thread.sleep(300)
     closeNode("node1")
     indexer("node5").health_prepare().setTimeout("1m").setWaitForGreenStatus().setWaitForRelocatingShards(0).setWaitForNodes("4").execute.actionGet.isTimedOut should equal (false)
+    Thread.sleep(300)
     closeNode("node2")
+    Thread.sleep(300)
     indexer("node5").health_prepare().setTimeout("1m").setWaitForGreenStatus().setWaitForRelocatingShards(0).setWaitForNodes("3").execute.actionGet.isTimedOut should equal (false)
+    Thread.sleep(300)
     indexer("node5").refresh()
 //fixme
 ////    println("first time")