remove nocommits

Original commit: elastic/x-pack-elasticsearch@8e0f99ea0e
This commit is contained in:
Simon Willnauer 2015-06-17 15:53:19 +02:00
parent b0986aec1c
commit d5c94148a5
3 changed files with 2 additions and 4 deletions

View File

@ -32,7 +32,7 @@ import static org.mockito.Mockito.when;
public class CompareConditionSearchTests extends AbstractWatcherIntegrationTests {
@Test
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/11692") //nocommit
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/11692")
public void testExecute_withAggs() throws Exception {
client().admin().indices().prepareCreate("my-index")

View File

@ -49,7 +49,7 @@ public class ScriptConditionSearchTests extends AbstractWatcherIntegrationTests
}
@Test
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/11692") //nocommit
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/11692")
public void testExecute_withAggs() throws Exception {
client().admin().indices().prepareCreate("my-index")

View File

@ -60,7 +60,6 @@ public class WatcherDateTimeUtilsTests extends ElasticsearchTestCase {
.put(value + "s", TimeValue.timeValueSeconds(value))
.put(value + "m", TimeValue.timeValueMinutes(value))
.put(value + "h", TimeValue.timeValueHours(value))
// .put(value + "", TimeValue.timeValueMillis(value)) nocommit this is not allowed in 2.0 anymore - we need to upgrade those settings?
.build();
String key = randomFrom(values.keySet().toArray(new String[values.size()]));
@ -82,7 +81,6 @@ public class WatcherDateTimeUtilsTests extends ElasticsearchTestCase {
.put(value + "s", TimeValue.timeValueSeconds(value))
.put(value + "m", TimeValue.timeValueMinutes(value))
.put(value + "h", TimeValue.timeValueHours(value))
//.put(value + "", TimeValue.timeValueMillis(value)) nocommit this is not allowed in 2.0 anymore - we need to upgrade those settings?
.build();
String key = randomFrom(values.keySet().toArray(new String[values.size()]));