Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-11072: Make the new test more robust to side-effects from other tests in the suite.

This commit is contained in:
Andrzej Bialecki 2017-11-02 17:34:05 +01:00
parent 6008b186a2
commit dc6119b85d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
solr/core/src/test/org/apache/solr/cloud/autoscaling/TriggerIntegrationTest.java
View File

@ -123,6 +123,7 @@ public class TriggerIntegrationTest extends SolrCloudTestCase {
actionInterrupted = new CountDownLatch(1); actionInterrupted = new CountDownLatch(1);
actionCompleted = new CountDownLatch(1); actionCompleted = new CountDownLatch(1);
events.clear(); events.clear();
listenerEvents.clear();
// clear any persisted auto scaling configuration // clear any persisted auto scaling configuration
Stat stat = zkClient().setData(SOLR_AUTOSCALING_CONF_PATH, Utils.toJSON(new ZkNodeProps()), true); Stat stat = zkClient().setData(SOLR_AUTOSCALING_CONF_PATH, Utils.toJSON(new ZkNodeProps()), true);
log.info(SOLR_AUTOSCALING_CONF_PATH + " reset, new znode version {}", stat.getVersion()); log.info(SOLR_AUTOSCALING_CONF_PATH + " reset, new znode version {}", stat.getVersion());
@ -1256,9 +1257,9 @@ public class TriggerIntegrationTest extends SolrCloudTestCase {
String setListenerCommand1 = "{" + String setListenerCommand1 = "{" +
"'set-listener' : " + "'set-listener' : " +
"{" + "{" +
"'name' : 'foo'," + "'name' : 'srt'," +
"'trigger' : 'search_rate_trigger'," + "'trigger' : 'search_rate_trigger'," +
"'stage' : ['FAILED','SUCCEEDED', 'IGNORED']," + "'stage' : ['FAILED','SUCCEEDED']," +
"'class' : '" + TestTriggerListener.class.getName() + "'" + "'class' : '" + TestTriggerListener.class.getName() + "'" +
"}" + "}" +
"}"; "}";
@ -1273,8 +1274,8 @@ public class TriggerIntegrationTest extends SolrCloudTestCase {
assertTrue("The trigger did not fire at all", await); assertTrue("The trigger did not fire at all", await);
// wait for listener to capture the SUCCEEDED stage // wait for listener to capture the SUCCEEDED stage
Thread.sleep(2000); Thread.sleep(2000);
assertEquals(listenerEvents.toString(), 1, listenerEvents.get("foo").size()); assertEquals(listenerEvents.toString(), 1, listenerEvents.get("srt").size());
TestEvent ev = listenerEvents.get("foo").get(0); TestEvent ev = listenerEvents.get("srt").get(0);
long now = timeSource.getTime(); long now = timeSource.getTime();
// verify waitFor // verify waitFor
assertTrue(TimeUnit.SECONDS.convert(waitForSeconds, TimeUnit.NANOSECONDS) < now - ev.event.getEventTime()); assertTrue(TimeUnit.SECONDS.convert(waitForSeconds, TimeUnit.NANOSECONDS) < now - ev.event.getEventTime());